From da8e52e614d3de7c947cd07438cdd4f1533053e2 Mon Sep 17 00:00:00 2001
From: andreea <nicoleta.pasare@gmail.com>
Date: Tue, 23 Jul 2024 13:44:27 +0300
Subject: [PATCH] added eInvoicing folder; updated config parameters and
 namespaces; updated xml files

---
 .github/workflows/transform_epo.yml           |     7 +-
 .../model2owl-config/config-parameters.xsl    |     4 +-
 .../eAccess/model2owl-config/namespaces.xml   |     1 +
 .../eAccess/xmi_conceptual_model/eAccess.xml  |   353 +-
 .../model2owl-config/config-parameters.xsl    |     4 +-
 .../model2owl-config/namespaces.xml           |     1 +
 .../xmi_conceptual_model/eCatalogue.xml       |  2371 +-
 .../model2owl-config/config-parameters.xsl    |     4 +-
 .../eContract/model2owl-config/namespaces.xml |     1 +
 .../xmi_conceptual_model/eContract.xml        |    90 +-
 .../model2owl-config/config-parameters.xsl    |     4 +-
 .../model2owl-config/namespaces.xml           |     1 +
 .../xmi_conceptual_model/eFulfilment.xml      |  3028 ++-
 .../model2owl-config/config-parameters.xsl    |   140 +
 .../model2owl-config/namespaces.xml           |    47 +
 .../model2owl-config/umlToXsdDataTypes.xml    |    48 +
 .../model2owl-config/xsdAndRdfDataTypes.xml   |    42 +
 .../xmi_conceptual_model/eInvoicing.xml       |  6062 +++++
 .../xmi_conceptual_model/eSubmission.xml      |  3698 +++
 .../model2owl-config/config-parameters.xsl    |     4 +-
 .../eNotice/model2owl-config/namespaces.xml   |     1 +
 .../eNotice/xmi_conceptual_model/eNotice.xml  |  5657 +++--
 .../model2owl-config/config-parameters.xsl    |     4 +-
 .../eOrdering/model2owl-config/namespaces.xml |     1 +
 .../xmi_conceptual_model/eOrdering.xml        |  1734 +-
 .../model2owl-config/config-parameters.xsl    |     4 +-
 .../ePO_core/model2owl-config/namespaces.xml  |     5 +-
 .../xmi_conceptual_model/ePO_core.xml         | 20111 +++++++++-------
 .../model2owl-config/config-parameters.xsl    |     4 +-
 .../model2owl-config/namespaces.xml           |     1 +
 .../xmi_conceptual_model/eSubmission.xml      |  1029 +-
 31 files changed, 30817 insertions(+), 13644 deletions(-)
 create mode 100644 implementation/eInvoicing/model2owl-config/config-parameters.xsl
 create mode 100644 implementation/eInvoicing/model2owl-config/namespaces.xml
 create mode 100644 implementation/eInvoicing/model2owl-config/umlToXsdDataTypes.xml
 create mode 100644 implementation/eInvoicing/model2owl-config/xsdAndRdfDataTypes.xml
 create mode 100644 implementation/eInvoicing/xmi_conceptual_model/eInvoicing.xml
 create mode 100644 implementation/eInvoicing/xmi_conceptual_model/eSubmission.xml

diff --git a/.github/workflows/transform_epo.yml b/.github/workflows/transform_epo.yml
index 5148d37d..e8436f3f 100644
--- a/.github/workflows/transform_epo.yml
+++ b/.github/workflows/transform_epo.yml
@@ -14,6 +14,7 @@ on:
       - "implementation/eContract/xmi_conceptual_model/eContract.xml"
       - "implementation/eContract/xmi_conceptual_model/eAccess.xml"
       - "implementation/eContract/xmi_conceptual_model/eSubmission.xml"
+      - "implementation/eContract/xmi_conceptual_model/eInvoicing.xml"
 jobs:
   report_and_glossary:
     runs-on: ubuntu-latest
@@ -35,7 +36,7 @@ jobs:
 
       - name: generate convention report and glossary
         run: |
-          AVAILABLE_IMPLEMENTATIONS=(eOrdering eFulfilment eCatalogue eNotice eContract eAccess eSubmission ePO_core)
+          AVAILABLE_IMPLEMENTATIONS=(eInvoicing eOrdering eFulfilment eCatalogue eNotice eContract eAccess eSubmission ePO_core)
           for implementation in "${AVAILABLE_IMPLEMENTATIONS[@]}"
           do
             echo "-------------------${implementation}---------------------------------"
@@ -68,7 +69,7 @@ jobs:
 
       - name: merge implementations xmi files into one
         run: |
-          AVAILABLE_IMPLEMENTATIONS=(eOrdering eFulfilment eCatalogue eNotice eContract eAccess eSubmission ePO_core)
+          AVAILABLE_IMPLEMENTATIONS=(eInvoicing eOrdering eFulfilment eCatalogue eNotice eContract eAccess eSubmission ePO_core)
           cd model2owl
           mkdir -p merge-xmis
           for implementation in "${AVAILABLE_IMPLEMENTATIONS[@]}"
@@ -148,7 +149,7 @@ jobs:
 
       - name: transform step
         run: |
-          AVAILABLE_IMPLEMENTATIONS=(eOrdering eFulfilment eCatalogue eNotice eContract eAccess eSubmission ePO_core)
+          AVAILABLE_IMPLEMENTATIONS=(eInvoicing eOrdering eFulfilment eCatalogue eNotice eContract eAccess eSubmission ePO_core)
           for implementation in "${AVAILABLE_IMPLEMENTATIONS[@]}"
           do
             echo "-------------------${implementation} transform---------------------------------"
diff --git a/implementation/eAccess/model2owl-config/config-parameters.xsl b/implementation/eAccess/model2owl-config/config-parameters.xsl
index 82919697..72e34344 100644
--- a/implementation/eAccess/model2owl-config/config-parameters.xsl
+++ b/implementation/eAccess/model2owl-config/config-parameters.xsl
@@ -122,11 +122,11 @@
     <!--    owl:incompatibleWith -->
     <xsl:variable name="incompatibleWith" select="'3.1.0'"/>
     <!--    owl:versionInfo -->
-    <xsl:variable name="versionInfo" select="'4.1.0'"/>
+    <xsl:variable name="versionInfo" select="'4.2.0'"/>
     <!--    bibo:status-->
     <xsl:variable name="ontologyStatus" select="'Semantic Specification Release'"/>
     <!--    owl:priorVersion -->
-    <xsl:variable name="priorVersion" select="'4.0.2'"/>
+    <xsl:variable name="priorVersion" select="'4.1.0'"/>
     <!--    vann:preferredNamespaceUri -->
     <xsl:variable name="preferredNamespaceUri" select="'http://data.europa.eu/a4g/ontology#'"/>
     <!--    vann:preferredNamespacePrefix -->
diff --git a/implementation/eAccess/model2owl-config/namespaces.xml b/implementation/eAccess/model2owl-config/namespaces.xml
index 20f42d97..98c8df05 100644
--- a/implementation/eAccess/model2owl-config/namespaces.xml
+++ b/implementation/eAccess/model2owl-config/namespaces.xml
@@ -21,6 +21,7 @@
     <prefix name="epo-ful" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-acc" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-sub" value="http://data.europa.eu/a4g/ontology#" importURI="http://data.europa.eu/a4g/ontology#sub"/>
+    <prefix name="epo-inv" value="http://data.europa.eu/a4g/ontology#"/>
 
     <prefix name="nuts" value="http://data.europa.eu/nuts/"/>
     <prefix name="espd" value="https://github.com/ESPD/ESPD-EDM/"/>
diff --git a/implementation/eAccess/xmi_conceptual_model/eAccess.xml b/implementation/eAccess/xmi_conceptual_model/eAccess.xml
index e51f46ee..20f5f6e6 100644
--- a/implementation/eAccess/xmi_conceptual_model/eAccess.xml
+++ b/implementation/eAccess/xmi_conceptual_model/eAccess.xml
@@ -4,7 +4,7 @@
 	<uml:Model xmi:type="uml:Model" name="EA_Model">
 		<packagedElement xmi:type="uml:Package" xmi:id="EAPK_13BC28FC_D8CE_4b0d_9D58_994B1D88F3FC" name="Access">
 			<packagedElement xmi:type="uml:Package" xmi:id="EAPK_64A4F7DE_E728_471b_B05F_6E9C608D689B" name="access">
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_9D04654A_8CAC_48dd_8971_41B6CDC2E4DA" name="diagrams">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_530FD6B0_9DEC_4c1c_9434_AF5FF2BE83FC" name="diagrams">
 					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_F6DB02CC_2D4E_4a02_B1E9_538EB3E24ED2" body="provides a platform; can be used by both Contracting Authority and Economic Operator. ">
 						<annotatedElement xmi:idref="EAID_49EC0F16_408C_4b28_B611_0048946DC070"/>
 					</ownedComment>
@@ -13,6 +13,10 @@
 						<annotatedElement xmi:idref="EAID_F955E894_651A_4a8b_A411_E8DA312BC449"/>
 					</ownedComment>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_6876A19C_66D7_48bd_AB58_21E5FB903810" name="ProxyConnector"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_70B4792E_F818_45db_80A4_32F092496FEF" name="ProxyConnector"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C" name="ProxyConnector">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_84F5E9DD_96DE_4ca7_8CA6_9C68826B377B" general="EAID_70B4792E_F818_45db_80A4_32F092496FEF"/>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_A83127C7_BC27_4269_962F_2ACF2FABD599" name="ProxyConnector">
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_116B9777_31D7_4d5f_8817_DBE9EF9EC21B" general="EAID_6876A19C_66D7_48bd_AB58_21E5FB903810"/>
 					</packagedElement>
@@ -21,7 +25,7 @@
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_2CEA69E5_ADCD_4af6_94C4_FD1CAF5CCC27" general="EAID_E58666CF_445F_4da3_97FA_8DD2F8F1AD20"/>
 					</packagedElement>
 				</packagedElement>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_063878B1_1C32_468c_9530_4124B3BA7E16" name="classes">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_25079F0D_7875_4a82_A2AC_F3595A8CDF02" name="classes">
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_A8D775E4_EEB9_4502_B8A1_C1DD5D555864" name="cccev:EvidenceType">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstDB5E69_CB31_4e1e_B095_115C894CFE58" name="adms:identifier" association="EAID_0BDB5E69_CB31_4e1e_B095_115C894CFE58">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
@@ -250,7 +254,7 @@
 						</ownedEnd>
 					</packagedElement>
 				</packagedElement>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_23CEC6BC_8981_4d47_A6B6_6B5AB6F3D5C2" name="controlled vocabularies">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_F26DC730_76B0_4bff_95DB_E8247E74C494" name="controlled vocabularies">
 					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_57E0D640_269C_4419_86DA_FB2573C10969" name="at-voc:atu"/>
 					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_A6490FDD_CA64_44d2_A9E8_4030CFD2A87F" name="at-voc:resource-type"/>
 					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_609AC59C_F0F1_4ec2_A89D_289F17022CE9" name="at-voc:subdivision"/>
@@ -266,7 +270,7 @@
 				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_3F3B24F6_9679_4fd7_B052_F09042D782C9" name="xsd:integer"/>
 			</packagedElement>
 		</packagedElement>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_398308FF_9B97_44da_AA6D_8D59A066CA4A" isFrame="false" modelElement="EAPK_9D04654A_8CAC_48dd_8971_41B6CDC2E4DA">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_398308FF_9B97_44da_AA6D_8D59A066CA4A" isFrame="false" modelElement="EAPK_530FD6B0_9DEC_4c1c_9434_AF5FF2BE83FC">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_398308FF_9B97_44da_BE9C_C9CD1456AEBB" modelElement="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9B97_44da_BE9C_C9CD1456AEBB" text="epo-acc:ESPDRequest"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9B97_44da_BE9C_C9CD1456AEBB" x="274" y="418" width="147" height="63"/>
@@ -377,11 +381,26 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_398308FF_9B97_44da_A56C_6D68CD1BEAF3" modelElement="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9B97_44da_A56C_6D68CD1BEAF3" text="epo:ProcurementDocument"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9B97_44da_A56C_6D68CD1BEAF3" x="273" y="145" width="149" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9B97_44da_A56C_6D68CD1BEAF3" x="280" y="145" width="133" height="70"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_95A0_E058E0BD5450" source="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_29996CD1_F979_44e0_95A0_E058E0BD5450">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_95A0_E058E0BD5450" x="422" y="179"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_95A0_E058E0BD5450" x="784" y="179"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_94A0_32241C0F50CE" source="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_A6577BAD_B1CB_4608_94A0_32241C0F50CE">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_94A0_32241C0F50CE" x="878" y="285"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_94A0_32241C0F50CE" x="879" y="249"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_97ED_A515BDF3B98B" source="EAID_F6DB02CC_2D4E_4a02_B1E9_538EB3E24ED2" target="EAID_49EC0F16_408C_4b28_B611_0048946DC070" modelElement="EAID_A5FB826B_2F91_4a40_97ED_A515BDF3B98B">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_97ED_A515BDF3B98B" x="1068" y="724"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_97ED_A515BDF3B98B" x="953" y="698"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_AA17_2A8EC003CCFE" source="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_D01E7677_5AC2_42b1_AA17_2A8EC003CCFE">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9B97_44da_AA17_2A8EC003CCFE" text="+epo:isResponsibilityOfBuyer" modelElement="EAID_dst1E7677_5AC2_42b1_AA17_2A8EC003CCFE">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9B97_44da_AA17_2A8EC003CCFE" x="648" y="505" width="117" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9B97_44da_AA17_2A8EC003CCFE" text="0..*" modelElement="EAID_dst1E7677_5AC2_42b1_AA17_2A8EC003CCFE">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9B97_44da_AA17_2A8EC003CCFE" x="748" y="528" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_AA17_2A8EC003CCFE" x="577" y="627"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_AA17_2A8EC003CCFE" x="577" y="523"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9B97_44da_AA17_2A8EC003CCFE" x="767" y="523"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_AB2B_CBE8A5D24AC5" source="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" target="EAID_49EC0F16_408C_4b28_B611_0048946DC070" modelElement="EAID_28460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9B97_44da_AB2B_CBE8A5D24AC5" text="+epo:isExecutedByProcurementServiceProvider" modelElement="EAID_dst460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
@@ -429,28 +448,24 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_BBA1_4FFA393BE7FA" x="928" y="543"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_BBA1_4FFA393BE7FA" x="928" y="657"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_9C21_84470056CF01" source="EAID_96B284C4_E759_4bad_9655_04521F703750" target="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" modelElement="EAID_BD5C98D5_43D4_41be_9C21_84470056CF01">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_9C21_84470056CF01" x="986" y="500"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_9C21_84470056CF01" x="1074" y="500"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_8CA6_9C68826B377B" source="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C" target="EAID_70B4792E_F818_45db_80A4_32F092496FEF" modelElement="EAID_84F5E9DD_96DE_4ca7_8CA6_9C68826B377B">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_8CA6_9C68826B377B" x="684" y="523"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_8CA6_9C68826B377B" x="685" y="640"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_9195_C96F98BD3349" source="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9B97_44da_9195_C96F98BD3349" text="+epo:hasProcurementScopeDividedIntoLot" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9B97_44da_9195_C96F98BD3349" x="767" y="735" width="171" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_A411_E8DA312BC449" source="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" target="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" modelElement="EAID_F955E894_651A_4a8b_A411_E8DA312BC449">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9B97_44da_A411_E8DA312BC449" text="+epo:refersToProcedure" modelElement="EAID_dst55E894_651A_4a8b_A411_E8DA312BC449">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9B97_44da_A411_E8DA312BC449" x="476" y="590" width="97" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9B97_44da_9195_C96F98BD3349" text="1..*" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9B97_44da_9195_C96F98BD3349" x="890" y="749" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9B97_44da_A411_E8DA312BC449" text="1" modelElement="EAID_dst55E894_651A_4a8b_A411_E8DA312BC449">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9B97_44da_A411_E8DA312BC449" x="531" y="609" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_9195_C96F98BD3349" x="601" y="727"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_9195_C96F98BD3349" x="882" y="727"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9B97_44da_9195_C96F98BD3349" x="882" y="767"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_94A0_32241C0F50CE" source="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_A6577BAD_B1CB_4608_94A0_32241C0F50CE">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_94A0_32241C0F50CE" x="878" y="285"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_94A0_32241C0F50CE" x="879" y="249"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_A411_E8DA312BC449" x="736" y="411"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_A411_E8DA312BC449" x="523" y="411"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9B97_44da_A411_E8DA312BC449" x="523" y="627"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_8CA6_9C68826B377B" source="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C" target="EAID_70B4792E_F818_45db_80A4_32F092496FEF" modelElement="EAID_84F5E9DD_96DE_4ca7_8CA6_9C68826B377B">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_8CA6_9C68826B377B" x="684" y="523"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_8CA6_9C68826B377B" x="685" y="640"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_A266_DDF9F55EABCE" source="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" target="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" modelElement="EAID_93385F64_990A_44d0_A266_DDF9F55EABCE">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_A266_DDF9F55EABCE" x="1118" y="466"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_A266_DDF9F55EABCE" x="1118" y="394"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_B3C3_6654ABB348DF" source="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9B97_44da_B3C3_6654ABB348DF" text="+epo:refersToLot" modelElement="EAID_dstB9978D_8D66_48ab_B3C3_6654ABB348DF">
@@ -464,8 +479,8 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9B97_44da_B3C3_6654ABB348DF" x="936" y="787"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_A6A4_14096262384A" source="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" target="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" modelElement="EAID_4E94CD77_EB61_4a9e_A6A4_14096262384A">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_A6A4_14096262384A" x="347" y="418"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_A6A4_14096262384A" x="347" y="215"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_A6A4_14096262384A" x="345" y="418"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_A6A4_14096262384A" x="345" y="215"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_96C4_9709B72BA620" source="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" target="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" modelElement="EAID_E69DD4EA_847D_4a36_96C4_9709B72BA620">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9B97_44da_96C4_9709B72BA620" text="+epo:concernsProcedure" modelElement="EAID_dst9DD4EA_847D_4a36_96C4_9709B72BA620">
@@ -479,14 +494,14 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_963A_7FE0F57DA5D8" source="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_D3DD6F7E_CC4D_4861_963A_7FE0F57DA5D8">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9B97_44da_963A_7FE0F57DA5D8" text="+epo-acc:refersToNotice" modelElement="EAID_dstDD6F7E_CC4D_4861_963A_7FE0F57DA5D8">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9B97_44da_963A_7FE0F57DA5D8" x="636" y="329" width="98" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9B97_44da_963A_7FE0F57DA5D8" x="636" y="327" width="98" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9B97_44da_963A_7FE0F57DA5D8" text="0..*" modelElement="EAID_dstDD6F7E_CC4D_4861_963A_7FE0F57DA5D8">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9B97_44da_963A_7FE0F57DA5D8" x="717" y="353" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9B97_44da_963A_7FE0F57DA5D8" x="717" y="351" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_963A_7FE0F57DA5D8" x="393" y="418"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_963A_7FE0F57DA5D8" x="393" y="348"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9B97_44da_963A_7FE0F57DA5D8" x="736" y="348"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_963A_7FE0F57DA5D8" x="381" y="418"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_963A_7FE0F57DA5D8" x="381" y="346"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9B97_44da_963A_7FE0F57DA5D8" x="736" y="346"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_9E28_8D741E0840F3" source="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_18CF5F1B_45DD_4b29_9E28_8D741E0840F3">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9B97_44da_9E28_8D741E0840F3" text="+epo:specifiesProcurementCriterion" modelElement="EAID_dstCF5F1B_45DD_4b29_9E28_8D741E0840F3">
@@ -513,24 +528,18 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_9B97_44da_B8FF_34E21440DAD9" x="904" y="109"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_9B97_44da_B8FF_34E21440DAD9" x="904" y="109"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_97ED_A515BDF3B98B" source="EAID_F6DB02CC_2D4E_4a02_B1E9_538EB3E24ED2" target="EAID_49EC0F16_408C_4b28_B611_0048946DC070" modelElement="EAID_A5FB826B_2F91_4a40_97ED_A515BDF3B98B">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_97ED_A515BDF3B98B" x="1068" y="724"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_97ED_A515BDF3B98B" x="953" y="698"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_9C21_84470056CF01" source="EAID_96B284C4_E759_4bad_9655_04521F703750" target="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" modelElement="EAID_BD5C98D5_43D4_41be_9C21_84470056CF01">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_9C21_84470056CF01" x="986" y="500"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_9C21_84470056CF01" x="1074" y="500"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_A411_E8DA312BC449" source="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" target="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" modelElement="EAID_F955E894_651A_4a8b_A411_E8DA312BC449">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9B97_44da_A411_E8DA312BC449" text="+epo:refersToProcedure" modelElement="EAID_dst55E894_651A_4a8b_A411_E8DA312BC449">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9B97_44da_A411_E8DA312BC449" x="476" y="590" width="97" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9B97_44da_A411_E8DA312BC449" text="1" modelElement="EAID_dst55E894_651A_4a8b_A411_E8DA312BC449">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9B97_44da_A411_E8DA312BC449" x="531" y="609" width="6" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_A411_E8DA312BC449" x="736" y="411"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_A411_E8DA312BC449" x="523" y="411"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9B97_44da_A411_E8DA312BC449" x="523" y="627"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_8C52_BAE14F5149F6" source="EAID_29678A10_6473_461a_BE84_76269B5BBD68" target="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" modelElement="EAID_D0F25E0B_E148_41e7_8C52_BAE14F5149F6">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_8C52_BAE14F5149F6" x="1448" y="946"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_8C52_BAE14F5149F6" x="1448" y="1020"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_B227_85988E5F2016" source="EAID_29678A10_6473_461a_BE84_76269B5BBD68" target="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40" modelElement="EAID_626183B8_93AC_4300_B227_85988E5F2016">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_B227_85988E5F2016" x="1338" y="946"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_B227_85988E5F2016" x="1338" y="1020"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_BFBF_00E3B99864B4" source="EAID_432BFDAD_99CD_40ab_A159_824F0F6571E2" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_E51D25BC_E9FB_423c_BFBF_00E3B99864B4">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_BFBF_00E3B99864B4" x="767" y="1054"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_BFBF_00E3B99864B4" x="767" y="888"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9B97_44da_BFBF_00E3B99864B4" x="599" y="888"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_8D8D_679E9486EE84" source="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_03FC1FD2_BDF5_4ae5_8D8D_679E9486EE84">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_8D8D_679E9486EE84" x="461" y="976"/>
@@ -581,35 +590,34 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_B087_27A619B6C819" x="816" y="856"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9B97_44da_B087_27A619B6C819" x="599" y="856"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_A7F5_548146C45BC4" source="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9B97_44da_A7F5_548146C45BC4" text="+epo:specifiesProcurementCriterion" modelElement="EAID_dst1AA305_6E1E_4123_A7F5_548146C45BC4">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9B97_44da_A7F5_548146C45BC4" x="619" y="784" width="142" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_9195_C96F98BD3349" source="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9B97_44da_9195_C96F98BD3349" text="+epo:hasProcurementScopeDividedIntoLot" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9B97_44da_9195_C96F98BD3349" x="767" y="735" width="171" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9B97_44da_A7F5_548146C45BC4" text="0..*" modelElement="EAID_dst1AA305_6E1E_4123_A7F5_548146C45BC4">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9B97_44da_A7F5_548146C45BC4" x="602" y="807" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9B97_44da_9195_C96F98BD3349" text="1..*" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9B97_44da_9195_C96F98BD3349" x="890" y="749" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_A7F5_548146C45BC4" x="837" y="802"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_A7F5_548146C45BC4" x="599" y="802"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_9195_C96F98BD3349" x="601" y="727"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_9195_C96F98BD3349" x="882" y="727"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9B97_44da_9195_C96F98BD3349" x="882" y="767"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_AA17_2A8EC003CCFE" source="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_D01E7677_5AC2_42b1_AA17_2A8EC003CCFE">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9B97_44da_AA17_2A8EC003CCFE" text="+epo:isResponsibilityOfBuyer" modelElement="EAID_dst1E7677_5AC2_42b1_AA17_2A8EC003CCFE">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9B97_44da_AA17_2A8EC003CCFE" x="648" y="505" width="117" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_BD17_379180274988" source="EAID_33E9269C_0B96_4b38_A129_C30771A9833F" target="EAID_29678A10_6473_461a_BE84_76269B5BBD68" modelElement="EAID_A4228FCF_2B3C_44e6_BD17_379180274988">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9B97_44da_BD17_379180274988" text="+locn:address" modelElement="EAID_dst228FCF_2B3C_44e6_BD17_379180274988">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9B97_44da_BD17_379180274988" x="1362" y="750" width="56" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9B97_44da_AA17_2A8EC003CCFE" text="0..*" modelElement="EAID_dst1E7677_5AC2_42b1_AA17_2A8EC003CCFE">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9B97_44da_AA17_2A8EC003CCFE" x="748" y="528" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9B97_44da_BD17_379180274988" text="0..1" modelElement="EAID_dst228FCF_2B3C_44e6_BD17_379180274988">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9B97_44da_BD17_379180274988" x="1399" y="775" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_AA17_2A8EC003CCFE" x="577" y="627"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_AA17_2A8EC003CCFE" x="577" y="523"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9B97_44da_AA17_2A8EC003CCFE" x="767" y="523"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_BD17_379180274988" x="1391" y="739"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_BD17_379180274988" x="1391" y="793"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_8C52_BAE14F5149F6" source="EAID_29678A10_6473_461a_BE84_76269B5BBD68" target="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" modelElement="EAID_D0F25E0B_E148_41e7_8C52_BAE14F5149F6">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_8C52_BAE14F5149F6" x="1448" y="946"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_8C52_BAE14F5149F6" x="1448" y="1020"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_95A0_E058E0BD5450" source="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_29996CD1_F979_44e0_95A0_E058E0BD5450">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_95A0_E058E0BD5450" x="413" y="179"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_95A0_E058E0BD5450" x="784" y="179"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_BFBF_00E3B99864B4" source="EAID_432BFDAD_99CD_40ab_A159_824F0F6571E2" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_E51D25BC_E9FB_423c_BFBF_00E3B99864B4">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_BFBF_00E3B99864B4" x="767" y="1054"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_BFBF_00E3B99864B4" x="767" y="888"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9B97_44da_BFBF_00E3B99864B4" x="599" y="888"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_B227_85988E5F2016" source="EAID_29678A10_6473_461a_BE84_76269B5BBD68" target="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40" modelElement="EAID_626183B8_93AC_4300_B227_85988E5F2016">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_B227_85988E5F2016" x="1338" y="946"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_B227_85988E5F2016" x="1338" y="1020"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_B370_202D9A0110E0" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_2FF93267_E672_481d_B370_202D9A0110E0">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9B97_44da_B370_202D9A0110E0" text="+org:subOrganizationOf 0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
@@ -685,22 +693,18 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_B7C9_925B517BC914" x="1172" y="680"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9B97_44da_B7C9_925B517BC914" x="1291" y="680"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_A266_DDF9F55EABCE" source="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" target="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" modelElement="EAID_93385F64_990A_44d0_A266_DDF9F55EABCE">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_A266_DDF9F55EABCE" x="1118" y="466"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_A266_DDF9F55EABCE" x="1118" y="394"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_BD17_379180274988" source="EAID_33E9269C_0B96_4b38_A129_C30771A9833F" target="EAID_29678A10_6473_461a_BE84_76269B5BBD68" modelElement="EAID_A4228FCF_2B3C_44e6_BD17_379180274988">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9B97_44da_BD17_379180274988" text="+locn:address" modelElement="EAID_dst228FCF_2B3C_44e6_BD17_379180274988">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9B97_44da_BD17_379180274988" x="1362" y="750" width="56" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_398308FF_9B97_44da_A7F5_548146C45BC4" source="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9B97_44da_A7F5_548146C45BC4" text="+epo:specifiesProcurementCriterion" modelElement="EAID_dst1AA305_6E1E_4123_A7F5_548146C45BC4">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9B97_44da_A7F5_548146C45BC4" x="619" y="784" width="142" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9B97_44da_BD17_379180274988" text="0..1" modelElement="EAID_dst228FCF_2B3C_44e6_BD17_379180274988">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9B97_44da_BD17_379180274988" x="1399" y="775" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9B97_44da_A7F5_548146C45BC4" text="0..*" modelElement="EAID_dst1AA305_6E1E_4123_A7F5_548146C45BC4">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9B97_44da_A7F5_548146C45BC4" x="602" y="807" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_BD17_379180274988" x="1391" y="739"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_BD17_379180274988" x="1391" y="793"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B97_44da_A7F5_548146C45BC4" x="837" y="802"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B97_44da_A7F5_548146C45BC4" x="599" y="802"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_0C92219A_FEEE_409c_835C_E39228FEC769" isFrame="false" modelElement="EAPK_9D04654A_8CAC_48dd_8971_41B6CDC2E4DA">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_0C92219A_FEEE_409c_835C_E39228FEC769" isFrame="false" modelElement="EAPK_530FD6B0_9DEC_4c1c_9434_AF5FF2BE83FC">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0C92219A_FEEE_409c_B0A6_4F3CEC5EEDC0" modelElement="EAID_905EBE80_E994_48ec_B0A6_4F3CEC5EEDC0">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_FEEE_409c_B0A6_4F3CEC5EEDC0" text="eli:LegalResourceSubdivision"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_FEEE_409c_B0A6_4F3CEC5EEDC0" x="471" y="428" width="151" height="50"/>
@@ -890,7 +894,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_FEEE_409c_BFBB_56453EA7473F" x="198" y="304"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_4EFE5F0B_EC4D_4c8b_959D_BEBC0AF790D1" isFrame="false" modelElement="EAPK_9D04654A_8CAC_48dd_8971_41B6CDC2E4DA">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_4EFE5F0B_EC4D_4c8b_959D_BEBC0AF790D1" isFrame="false" modelElement="EAPK_530FD6B0_9DEC_4c1c_9434_AF5FF2BE83FC">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4EFE5F0B_EC4D_4c8b_B3F6_8FC4EB9806DC" modelElement="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_EC4D_4c8b_B3F6_8FC4EB9806DC" text="cccev:Requirement"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_EC4D_4c8b_B3F6_8FC4EB9806DC" x="827" y="219" width="216" height="95"/>
@@ -1149,7 +1153,7 @@
 	<xmi:Extension extender="Enterprise Architect" extenderID="6.5">
 		<elements>
 			<element xmi:idref="EAPK_13BC28FC_D8CE_4b0d_9D58_994B1D88F3FC">
-				<packageproperties version="1.0" tpos="6"/>
+				<packageproperties version="1.0" tpos="7"/>
 				<paths/>
 				<times created="2023-07-31 00:00:00" modified="2023-07-31 00:00:00"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;"/>
@@ -1168,10 +1172,10 @@
 				<times created="2023-07-31 17:06:40" modified="2023-07-31 17:06:40"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
 			</element>
-			<element xmi:idref="EAPK_9D04654A_8CAC_48dd_8971_41B6CDC2E4DA" xmi:type="uml:Package" name="diagrams" scope="public">
-				<model package2="EAID_9D04654A_8CAC_48dd_8971_41B6CDC2E4DA" package="EAPK_64A4F7DE_E728_471b_B05F_6E9C608D689B" tpos="1" ea_localid="255" ea_eleType="package"/>
+			<element xmi:idref="EAPK_530FD6B0_9DEC_4c1c_9434_AF5FF2BE83FC" xmi:type="uml:Package" name="diagrams" scope="public">
+				<model package2="EAID_530FD6B0_9DEC_4c1c_9434_AF5FF2BE83FC" package="EAPK_64A4F7DE_E728_471b_B05F_6E9C608D689B" tpos="1" ea_localid="244" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 13:03:43" modified="2024-03-18 13:03:43" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:42:30" modified="2024-07-23 11:42:30" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -1179,11 +1183,11 @@
 				<extendedProperties tagged="0" package_name="access"/>
 				<packageproperties version="1.0" tpos="1"/>
 				<paths/>
-				<times created="2024-03-18 13:03:43" modified="2024-03-18 13:03:43"/>
+				<times created="2024-07-23 11:42:30" modified="2024-07-23 11:42:30"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAID_2DD34400_B85D_489b_967F_8B532B71DCD2" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_9D04654A_8CAC_48dd_8971_41B6CDC2E4DA" tpos="0" ea_localid="3374" ea_eleType="element"/>
+				<model package="EAPK_530FD6B0_9DEC_4c1c_9434_AF5FF2BE83FC" tpos="0" ea_localid="3374" ea_eleType="element"/>
 				<properties documentation="The relations epo-acc:concernsProcedure and epo:refersToProcedure have to refer to the same Procedure." isSpecification="false" sType="Note" nType="1" scope="public"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2023-12-12 16:15:08" modified="2023-12-12 16:17:12" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
@@ -1193,7 +1197,7 @@
 				<extendedProperties tagged="0" package_name="diagrams" relatedlinks="idref1=EAID_E69DD4EA_847D_4a36_96C4_9709B72BA620;idref2=EAID_F955E894_651A_4a8b_A411_E8DA312BC449;"/>
 			</element>
 			<element xmi:idref="EAID_6876A19C_66D7_48bd_AB58_21E5FB903810" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F">
-				<model package="EAPK_9D04654A_8CAC_48dd_8971_41B6CDC2E4DA" tpos="0" ea_localid="3265" ea_eleType="element"/>
+				<model package="EAPK_530FD6B0_9DEC_4c1c_9434_AF5FF2BE83FC" tpos="0" ea_localid="3265" ea_eleType="element"/>
 				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2023-11-07 15:15:02" modified="2023-11-07 15:15:02" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
@@ -1205,8 +1209,34 @@
 					<Generalization xmi:id="EAID_116B9777_31D7_4d5f_8817_DBE9EF9EC21B" start="EAID_A83127C7_BC27_4269_962F_2ACF2FABD599" end="EAID_6876A19C_66D7_48bd_AB58_21E5FB903810"/>
 				</links>
 			</element>
+			<element xmi:idref="EAID_70B4792E_F818_45db_80A4_32F092496FEF" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_9B2D6DCC_5092_48cf_878A_8035A42A43F9">
+				<model package="EAPK_530FD6B0_9DEC_4c1c_9434_AF5FF2BE83FC" tpos="0" ea_localid="1932" ea_eleType="element"/>
+				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-06-07 16:21:22" modified="2022-06-07 16:21:22" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<Generalization xmi:id="EAID_84F5E9DD_96DE_4ca7_8CA6_9C68826B377B" start="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C" end="EAID_70B4792E_F818_45db_80A4_32F092496FEF"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_D01E7677_5AC2_42b1_AA17_2A8EC003CCFE">
+				<model package="EAPK_530FD6B0_9DEC_4c1c_9434_AF5FF2BE83FC" tpos="0" ea_localid="1931" ea_eleType="element"/>
+				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-06-07 16:21:22" modified="2022-06-07 16:21:22" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<Generalization xmi:id="EAID_84F5E9DD_96DE_4ca7_8CA6_9C68826B377B" start="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C" end="EAID_70B4792E_F818_45db_80A4_32F092496FEF"/>
+				</links>
+			</element>
 			<element xmi:idref="EAID_A83127C7_BC27_4269_962F_2ACF2FABD599" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_5879D937_81BB_4b88_BC30_54B777A7B4B8">
-				<model package="EAPK_9D04654A_8CAC_48dd_8971_41B6CDC2E4DA" tpos="0" ea_localid="3264" ea_eleType="element"/>
+				<model package="EAPK_530FD6B0_9DEC_4c1c_9434_AF5FF2BE83FC" tpos="0" ea_localid="3264" ea_eleType="element"/>
 				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2023-11-07 15:15:02" modified="2023-11-07 15:15:02" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
@@ -1219,7 +1249,7 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_E58666CF_445F_4da3_97FA_8DD2F8F1AD20" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F">
-				<model package="EAPK_9D04654A_8CAC_48dd_8971_41B6CDC2E4DA" tpos="0" ea_localid="1901" ea_eleType="element"/>
+				<model package="EAPK_530FD6B0_9DEC_4c1c_9434_AF5FF2BE83FC" tpos="0" ea_localid="1901" ea_eleType="element"/>
 				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
 				<project author="lps" version="1.0" phase="1.0" created="2022-05-24 16:45:29" modified="2022-05-24 16:45:29" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
@@ -1232,7 +1262,7 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_F6DB02CC_2D4E_4a02_B1E9_538EB3E24ED2" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_9D04654A_8CAC_48dd_8971_41B6CDC2E4DA" tpos="0" ea_localid="3135" ea_eleType="element"/>
+				<model package="EAPK_530FD6B0_9DEC_4c1c_9434_AF5FF2BE83FC" tpos="0" ea_localid="3135" ea_eleType="element"/>
 				<properties documentation="provides a platform; can be used by both Contracting Authority and Economic Operator. " isSpecification="false" sType="Note" nType="0" scope="public"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2023-08-21 08:41:04" modified="2023-08-22 15:50:57" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
@@ -1245,7 +1275,7 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_FBAEFE81_BDD9_4cf1_BBB5_EC6BE02F8DBD" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_D65C20FC_D382_4766_9563_4C96020D607C">
-				<model package="EAPK_9D04654A_8CAC_48dd_8971_41B6CDC2E4DA" tpos="0" ea_localid="1900" ea_eleType="element"/>
+				<model package="EAPK_530FD6B0_9DEC_4c1c_9434_AF5FF2BE83FC" tpos="0" ea_localid="1900" ea_eleType="element"/>
 				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
 				<project author="lps" version="1.0" phase="1.0" created="2022-05-24 16:45:29" modified="2022-05-24 16:45:29" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
@@ -1257,10 +1287,10 @@
 					<Generalization xmi:id="EAID_2CEA69E5_ADCD_4af6_94C4_FD1CAF5CCC27" start="EAID_FBAEFE81_BDD9_4cf1_BBB5_EC6BE02F8DBD" end="EAID_E58666CF_445F_4da3_97FA_8DD2F8F1AD20"/>
 				</links>
 			</element>
-			<element xmi:idref="EAPK_063878B1_1C32_468c_9530_4124B3BA7E16" xmi:type="uml:Package" name="classes" scope="public">
-				<model package2="EAID_063878B1_1C32_468c_9530_4124B3BA7E16" package="EAPK_64A4F7DE_E728_471b_B05F_6E9C608D689B" tpos="2" ea_localid="256" ea_eleType="package"/>
+			<element xmi:idref="EAPK_25079F0D_7875_4a82_A2AC_F3595A8CDF02" xmi:type="uml:Package" name="classes" scope="public">
+				<model package2="EAID_25079F0D_7875_4a82_A2AC_F3595A8CDF02" package="EAPK_64A4F7DE_E728_471b_B05F_6E9C608D689B" tpos="2" ea_localid="245" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 13:03:57" modified="2024-03-18 13:03:57" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:42:45" modified="2024-07-23 11:42:45" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -1268,13 +1298,13 @@
 				<extendedProperties tagged="0" package_name="access"/>
 				<packageproperties version="1.0" tpos="2"/>
 				<paths/>
-				<times created="2024-03-18 13:03:57" modified="2024-03-18 13:03:57"/>
+				<times created="2024-07-23 11:42:45" modified="2024-07-23 11:42:45"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAID_A8D775E4_EEB9_4502_B8A1_C1DD5D555864" xmi:type="uml:Class" name="cccev:EvidenceType" scope="public">
-				<model package="EAPK_063878B1_1C32_468c_9530_4124B3BA7E16" tpos="0" ea_localid="3505" ea_eleType="element"/>
+				<model package="EAPK_25079F0D_7875_4a82_A2AC_F3595A8CDF02" tpos="0" ea_localid="3505" ea_eleType="element"/>
 				<properties documentation="Information about the characteristics of an Evidence.&#xA;&#xA;Additional Information:&#xA;The Evidence Type and the characteristics it describes are not concrete individual responses to a Requirement (i.e. Evidence), but descriptions about the desired form, content, source and/or other characteristics that an actual response should have and provide (e.g. membership of a class of Evidences)." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-02-15 14:16:31" modified="2024-03-18 13:04:04" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-02-15 14:16:31" modified="2024-07-23 11:42:49" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -1288,9 +1318,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_3124967E_D23F_4c3b_9B72_E02C23A08D68" xmi:type="uml:Class" name="cccev:EvidenceTypeList" scope="public">
-				<model package="EAPK_063878B1_1C32_468c_9530_4124B3BA7E16" tpos="0" ea_localid="3506" ea_eleType="element"/>
+				<model package="EAPK_25079F0D_7875_4a82_A2AC_F3595A8CDF02" tpos="0" ea_localid="3506" ea_eleType="element"/>
 				<properties documentation="Group of Evidence Types for conforming to a Requirement.&#xA;&#xA;Additional Information:&#xA;An Evidence Type List is satisfied, if and only if, for all included Evidence Types in this List, corresponding conformant Evidence(s) are supporting the Requirement having this List. The Evidence Type List describes thus an AND condition on the different Evidence Types within the list and an OR condition between two or more Evidence Type Lists. Combinations of alternative Lists can be provided for a respondent of a Requirement to choose amongst them." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-02-15 14:16:42" modified="2024-03-18 13:04:04" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-02-15 14:16:42" modified="2024-07-23 11:42:49" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -1335,9 +1365,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_8374872A_B283_4698_9E00_72FD255BAFCB" xmi:type="uml:Class" name="eli:LegalExpression" scope="public">
-				<model package="EAPK_063878B1_1C32_468c_9530_4124B3BA7E16" tpos="0" ea_localid="3258" ea_eleType="element"/>
+				<model package="EAPK_25079F0D_7875_4a82_A2AC_F3595A8CDF02" tpos="0" ea_localid="3258" ea_eleType="element"/>
 				<properties documentation="The intellectual realisation of a legal resource in the form of a &quot;sequence of signs&quot; (typically alpha-numeric characters in a legal context).&#xA;For example, any version of the legal resource whose content is specified and different from others for any reason: language, versions, etc.;&#xA;&#xA;Note that ELI ontology accommodates different point of view on what should be considered a new legal resource, or a new legal expression of the same resource. Typically, a consolidated version can be viewed, in the context of ELI, either as separate legal resource (linked to original version and previous consolidated version using corresponding ELI relations), or as a different legal expression of the same legal resource.&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-11-01 11:25:26" modified="2024-03-18 13:04:04" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-11-01 11:25:26" modified="2024-07-23 11:42:54" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -1413,9 +1443,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_D7D6EB20_18A6_4b80_8B0F_73E4C1852FB7" xmi:type="uml:Class" name="eli:LegalResource" scope="public">
-				<model package="EAPK_063878B1_1C32_468c_9530_4124B3BA7E16" tpos="0" ea_localid="3254" ea_eleType="element"/>
+				<model package="EAPK_25079F0D_7875_4a82_A2AC_F3595A8CDF02" tpos="0" ea_localid="3254" ea_eleType="element"/>
 				<properties documentation="A work in a legislative corpus. This applies to acts that have been legally enacted (whether or not they are still in force).&#xA;For example, the abstract concept of the legal resource; e.g. &quot;act 3 of 2005&quot; (adapted from Akoma Ntoso)&#xA;&#xA;A legal resource can represent a legal act or any component of a legal act, like an article.  Legal resources can be linked together using properties defined in the model.&#xA;&#xA;Note that ELI ontology accommodates different point of view on what should be considered a new legal resource, or a new legal expression of the same resource. Typically, a consolidated version can be viewed, in the context of ELI, either as separate legal resource (linked to original version and previous consolidated version using corresponding ELI relations), or as a different legal expression of the same legal resource.&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-11-01 11:16:24" modified="2024-03-18 13:04:04" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-11-01 11:16:24" modified="2024-07-23 11:42:54" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -1477,9 +1507,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_905EBE80_E994_48ec_B0A6_4F3CEC5EEDC0" xmi:type="uml:Class" name="eli:LegalResourceSubdivision" scope="public">
-				<model package="EAPK_063878B1_1C32_468c_9530_4124B3BA7E16" tpos="0" ea_localid="3253" ea_eleType="element"/>
+				<model package="EAPK_25079F0D_7875_4a82_A2AC_F3595A8CDF02" tpos="0" ea_localid="3253" ea_eleType="element"/>
 				<properties documentation="A component of a legal act, at an arbitrary level of precision, like a chapter, an article, an alinea, a paragraph or an list item." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-11-01 11:12:11" modified="2024-03-18 13:04:04" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-11-01 11:12:11" modified="2024-07-23 11:42:54" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -1492,9 +1522,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_C22D5D37_4AD1_4d60_A579_C78C5935F277" xmi:type="uml:Class" name="eli:Work" scope="public">
-				<model package="EAPK_063878B1_1C32_468c_9530_4124B3BA7E16" tpos="0" ea_localid="3257" ea_eleType="element"/>
+				<model package="EAPK_25079F0D_7875_4a82_A2AC_F3595A8CDF02" tpos="0" ea_localid="3257" ea_eleType="element"/>
 				<properties documentation="Any distinct intellectual creation (i.e., the intellectual content), in the context of ELI.&#xA;&#xA;The substance of Work is ideas.&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-11-01 11:23:31" modified="2024-03-18 13:04:04" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-11-01 11:23:31" modified="2024-07-23 11:42:54" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -1508,9 +1538,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" xmi:type="uml:Class" name="epo-acc:ESPDRequest" scope="public">
-				<model package="EAPK_063878B1_1C32_468c_9530_4124B3BA7E16" tpos="0" ea_localid="1664" ea_eleType="element"/>
+				<model package="EAPK_25079F0D_7875_4a82_A2AC_F3595A8CDF02" tpos="0" ea_localid="1664" ea_eleType="element"/>
 				<properties documentation="An updated self-declaration used by the economic operator as a preliminary evidence in replacement of certificates issued by public authorities or third parties confirming that the economic operator fulfils the Exclusion Grounds and the Selection Criteria set out by the Buyer for a specific Procurement.&#xA;&#xA;WG Approval 05/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-03-18 17:00:22" modified="2024-03-18 13:04:04" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-03-18 17:00:22" modified="2024-07-23 11:42:54" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -1524,10 +1554,10 @@
 					<Association xmi:id="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B" start="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" end="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB"/>
 				</links>
 			</element>
-			<element xmi:idref="EAPK_23CEC6BC_8981_4d47_A6B6_6B5AB6F3D5C2" xmi:type="uml:Package" name="controlled vocabularies" scope="public">
-				<model package2="EAID_23CEC6BC_8981_4d47_A6B6_6B5AB6F3D5C2" package="EAPK_64A4F7DE_E728_471b_B05F_6E9C608D689B" tpos="3" ea_localid="257" ea_eleType="package"/>
+			<element xmi:idref="EAPK_F26DC730_76B0_4bff_95DB_E8247E74C494" xmi:type="uml:Package" name="controlled vocabularies" scope="public">
+				<model package2="EAID_F26DC730_76B0_4bff_95DB_E8247E74C494" package="EAPK_64A4F7DE_E728_471b_B05F_6E9C608D689B" tpos="3" ea_localid="246" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 13:04:09" modified="2024-03-18 13:04:12" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:43:04" modified="2024-07-23 11:43:04" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -1535,13 +1565,13 @@
 				<extendedProperties tagged="0" package_name="access"/>
 				<packageproperties version="1.0" tpos="3"/>
 				<paths/>
-				<times created="2024-03-18 13:04:09" modified="2024-03-18 13:04:09"/>
+				<times created="2024-07-23 11:43:04" modified="2024-07-23 11:43:04"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAID_57E0D640_269C_4419_86DA_FB2573C10969" xmi:type="uml:Enumeration" name="at-voc:atu" scope="public">
-				<model package="EAPK_23CEC6BC_8981_4d47_A6B6_6B5AB6F3D5C2" tpos="0" ea_localid="3259" ea_eleType="element"/>
+				<model package="EAPK_F26DC730_76B0_4bff_95DB_E8247E74C494" tpos="0" ea_localid="3259" ea_eleType="element"/>
 				<properties documentation="http://publications.europa.eu/resource/dataset/atu" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-11-01 15:20:10" modified="2024-03-18 13:04:19" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-11-01 15:20:10" modified="2024-07-23 11:43:11" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -1553,9 +1583,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_A6490FDD_CA64_44d2_A9E8_4030CFD2A87F" xmi:type="uml:Enumeration" name="at-voc:resource-type" scope="public">
-				<model package="EAPK_23CEC6BC_8981_4d47_A6B6_6B5AB6F3D5C2" tpos="0" ea_localid="3255" ea_eleType="element"/>
+				<model package="EAPK_F26DC730_76B0_4bff_95DB_E8247E74C494" tpos="0" ea_localid="3255" ea_eleType="element"/>
 				<properties documentation="The type of a legal resource (e.g. &quot;Directive&quot;, &quot;R&amp;#232;glement grand ducal&quot;, &quot;law&quot;, &quot;r&amp;#232;glement minist&amp;#233;riel&quot;, &quot;draft proposition&quot;, &quot;Parliamentary act&quot;, etc.). &#xA;&#xA;Member states are encouraged to make their own list of values in the corresponding concept scheme. EU Publications Office provides a list of values for EU resource types at https://op.europa.eu/en/web/eu-vocabularies/at-dataset/-/resource/dataset/resource-type&#xA;&#xA;&#xA;http://publications.europa.eu/resource/dataset/resource-type&#xA;" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-11-01 11:17:12" modified="2024-03-18 13:04:19" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-11-01 11:17:12" modified="2024-07-23 11:43:11" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -1566,9 +1596,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_609AC59C_F0F1_4ec2_A89D_289F17022CE9" xmi:type="uml:Enumeration" name="at-voc:subdivision" scope="public">
-				<model package="EAPK_23CEC6BC_8981_4d47_A6B6_6B5AB6F3D5C2" tpos="0" ea_localid="3256" ea_eleType="element"/>
+				<model package="EAPK_F26DC730_76B0_4bff_95DB_E8247E74C494" tpos="0" ea_localid="3256" ea_eleType="element"/>
 				<properties documentation="The type of a document subdivision (e.g. &quot;Article&quot;, &quot;Paragraph&quot;, &quot;Section&quot;, etc.).&#xA;A subdivision can have only one type.&#xA;&#xA;ELI does not specify a list of possible values. Member states are encouraged to make their own list of values in the corresponding concept scheme. EU Publication Office provies a list of values for EU resource types at https://op.europa.eu/en/web/eu-vocabularies/at-dataset/-/resource/dataset/subdivision&#xA;&#xA;&#xA;http://publications.europa.eu/resource/authority/subdivision" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-11-01 11:17:17" modified="2024-03-18 13:04:19" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-11-01 11:17:17" modified="2024-07-23 11:43:11" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -1697,6 +1727,39 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_84F5E9DD_96DE_4ca7_8CA6_9C68826B377B">
+				<source xmi:idref="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C">
+					<model ea_localid="1931" type="ProxyConnector" name="ProxyConnector"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_70B4792E_F818_45db_80A4_32F092496FEF">
+					<model ea_localid="1932" type="ProxyConnector" name="ProxyConnector"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3158"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_2CEA69E5_ADCD_4af6_94C4_FD1CAF5CCC27">
 				<source xmi:idref="EAID_FBAEFE81_BDD9_4cf1_BBB5_EC6BE02F8DBD">
 					<model ea_localid="1900" type="ProxyConnector" name="ProxyConnector"/>
@@ -2570,16 +2633,16 @@
 		<profiles/>
 		<diagrams>
 			<diagram xmi:id="EAID_398308FF_9B97_44da_AA6D_8D59A066CA4A">
-				<model package="EAPK_9D04654A_8CAC_48dd_8971_41B6CDC2E4DA" localID="475" owner="EAPK_9D04654A_8CAC_48dd_8971_41B6CDC2E4DA" tpos="1"/>
+				<model package="EAPK_530FD6B0_9DEC_4c1c_9434_AF5FF2BE83FC" localID="475" owner="EAPK_530FD6B0_9DEC_4c1c_9434_AF5FF2BE83FC" tpos="1"/>
 				<properties name="access" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-07-31 17:06:57" modified="2024-07-08 13:16:29"/>
+				<project author="andreea" version="1.0" created="2023-07-31 17:06:57" modified="2024-07-11 13:47:34"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=75;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=698D345F;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=99A3992C;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=273;Top=145;Right=422;Bottom=215;" subject="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" seqno="1" style="DUID=72C62D40;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=280;Top=145;Right=413;Bottom=215;" subject="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" seqno="1" style="DUID=0529DA0C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=692;Top=1054;Right=838;Bottom=1089;" subject="EAID_432BFDAD_99CD_40ab_A159_824F0F6571E2" seqno="2" style="DUID=C7DAEF4C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=383;Top=488;Right=498;Bottom=585;" subject="EAID_2DD34400_B85D_489b_967F_8B532B71DCD2" seqno="3" style="DUID=D2A804C6;"/>
 					<element geometry="Left=1290;Top=1020;Right=1380;Bottom=1080;" subject="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40" seqno="4" style="DUID=4964C4D1;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
@@ -2607,29 +2670,30 @@
 					<element geometry="Left=767;Top=458;Right=986;Bottom=543;" subject="EAID_96B284C4_E759_4bad_9655_04521F703750" seqno="26" style="DUID=CFA9FBA1;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=736;Top=285;Right=1017;Bottom=435;" subject="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" seqno="27" style="DUID=153BF086;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=274;Top=418;Right=421;Bottom=481;" subject="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" seqno="28" style="NSL=0;DUID=2EFCA1EE;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=1016;SCTR.TOP=-325;SCTR.RIGHT=1047;SCTR.BOTTOM=-310;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1017:-325$1047:-325$1047:-310$1017:-310$;" subject="EAID_7EE70932_F57C_4861_BE52_91F3F7270840" style="Mode=3;EOID=153BF086;SOID=153BF086;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_29996CD1_F979_44e0_95A0_E058E0BD5450" style="Mode=3;EOID=F3D3CE34;SOID=72C62D40;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A6577BAD_B1CB_4608_94A0_32241C0F50CE" style="Mode=3;EOID=F3D3CE34;SOID=153BF086;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A5FB826B_2F91_4a40_97ED_A515BDF3B98B" style="Mode=3;EOID=8412A052;SOID=69301261;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=115;SY=0;EX=0;EY=-23;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=117:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=577:-523$;" subject="EAID_D01E7677_5AC2_42b1_AA17_2A8EC003CCFE" style="Mode=3;EOID=CFA9FBA1;SOID=EB137612;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=189:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-2:OY=5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_28460B26_E1D3_4c16_AB2B_CBE8A5D24AC5" style="Mode=3;EOID=8412A052;SOID=EB137612;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=0;SY=42;EX=-86;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=80:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=790:-640$;" subject="EAID_9B2D6DCC_5092_48cf_878A_8035A42A43F9" style="Mode=3;EOID=CFA9FBA1;SOID=EB137612;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-20;SY=-2;EX=-48;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87:CY=14:OX=52:OY=14:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4714A192_0DFA_49f4_AB11_165E12CB38A6" style="Mode=3;EOID=CFA9FBA1;SOID=8412A052;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=5;EX=-3;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1116:-677$;" subject="EAID_657CE8BE_2717_41d1_B80A_3B15D5AAC373" style="Mode=3;EOID=A59E34AC;SOID=8412A052;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-20;SY=-42;EX=-20;EY=-56;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_46812517_A9DA_432d_A7B8_F5FEC69BBDA5" style="Mode=3;EOID=FCF768BD;SOID=CFA9FBA1;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=57;SY=0;EX=52;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=143:CY=14:OX=97:OY=-25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_E076346D_AFB2_421a_BBA1_4FFA393BE7FA" style="Mode=3;EOID=8412A052;SOID=CFA9FBA1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BD5C98D5_43D4_41be_9C21_84470056CF01" style="Mode=3;EOID=A59E34AC;SOID=CFA9FBA1;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=-45;EX=-4;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=63:OY=-14:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=882:-727$;" subject="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=BA1F8F73;SOID=EB137612;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A6577BAD_B1CB_4608_94A0_32241C0F50CE" style="Mode=3;EOID=F3D3CE34;SOID=153BF086;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_84F5E9DD_96DE_4ca7_8CA6_9C68826B377B" style="Mode=3;EOID=D6959E16;SOID=2ED91211;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=-51;EX=61;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=57:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=523:-411$;" subject="EAID_F955E894_651A_4a8b_A411_E8DA312BC449" style="Mode=3;EOID=EB137612;SOID=153BF086;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_93385F64_990A_44d0_A266_DDF9F55EABCE" style="Mode=3;EOID=A0A3FA47;SOID=A59E34AC;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=1016;SCTR.TOP=-325;SCTR.RIGHT=1047;SCTR.BOTTOM=-310;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1017:-325$1047:-325$1047:-310$1017:-310$;" subject="EAID_7EE70932_F57C_4861_BE52_91F3F7270840" style="Mode=3;EOID=153BF086;SOID=153BF086;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=137;SY=0;EX=0;EY=15;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=69:CY=14:OX=4:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1013:-787$;" subject="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF" style="Mode=3;EOID=BA1F8F73;SOID=153BF086;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=1;SY=-7;EX=0;EY=-7;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4E94CD77_EB61_4a9e_A6A4_14096262384A" style="Mode=3;EOID=72C62D40;SOID=2EFCA1EE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-5;SY=3;EX=28;EY=-32;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4E94CD77_EB61_4a9e_A6A4_14096262384A" style="Mode=3;EOID=0529DA0C;SOID=2EFCA1EE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=7;SY=1;EX=-108;EY=4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=65:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_E69DD4EA_847D_4a36_96C4_9709B72BA620" style="Mode=3;EOID=EB137612;SOID=2EFCA1EE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=46;SY=0;EX=0;EY=12;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=98:CY=14:OX=0:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=393:-348$;" subject="EAID_D3DD6F7E_CC4D_4861_963A_7FE0F57DA5D8" style="Mode=3;EOID=153BF086;SOID=2EFCA1EE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=34;SY=0;EX=0;EY=14;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=98:CY=14:OX=0:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=381:-346$;" subject="EAID_D3DD6F7E_CC4D_4861_963A_7FE0F57DA5D8" style="Mode=3;EOID=153BF086;SOID=2EFCA1EE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-58;SY=0;EX=0;EY=25;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=71:OY=-43:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=289:-829$;" subject="EAID_18CF5F1B_45DD_4b29_9E28_8D741E0840F3" style="Mode=3;EOID=5E5CC32C;SOID=2EFCA1EE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=874;SCTR.TOP=-110;SCTR.RIGHT=889;SCTR.BOTTOM=-79;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=889:-109$889:-79$874:-79$874:-109$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=F3D3CE34;SOID=F3D3CE34;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=4;SCTR.LEFT=715;SCTR.TOP=-208;SCTR.RIGHT=800;SCTR.BOTTOM=-137;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=784:-137$715:-137$715:-208$784:-208$;" subject="EAID_39F3583F_0D40_4e9f_8018_10297955785C" style="Mode=3;EOID=F3D3CE34;SOID=F3D3CE34;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=904;SCTR.TOP=-113;SCTR.RIGHT=947;SCTR.BOTTOM=-89;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=82:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=947:-109$947:-89$904:-89$904:-109$;" subject="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9" style="Mode=3;EOID=F3D3CE34;SOID=F3D3CE34;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A5FB826B_2F91_4a40_97ED_A515BDF3B98B" style="Mode=3;EOID=8412A052;SOID=69301261;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=-51;EX=61;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=57:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=523:-411$;" subject="EAID_F955E894_651A_4a8b_A411_E8DA312BC449" style="Mode=3;EOID=EB137612;SOID=153BF086;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=20;SY=0;EX=-11;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=76:CY=14:OX=44:OY=-28:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_626183B8_93AC_4300_B227_85988E5F2016" style="Mode=3;EOID=4964C4D1;SOID=7646E603;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BD5C98D5_43D4_41be_9C21_84470056CF01" style="Mode=3;EOID=A59E34AC;SOID=CFA9FBA1;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=101;SY=2;EX=-7;EY=2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=55:OY=-33:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D0F25E0B_E148_41e7_8C52_BAE14F5149F6" style="Mode=3;EOID=55ED93F7;SOID=7646E603;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=2;SY=0;EX=0;EY=-34;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=767:-888$;" subject="EAID_E51D25BC_E9FB_423c_BFBF_00E3B99864B4" style="Mode=3;EOID=5E5CC32C;SOID=C7DAEF4C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_03FC1FD2_BDF5_4ae5_8D8D_679E9486EE84" style="Mode=3;EOID=5E5CC32C;SOID=F5D23353;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=499;SCTR.TOP=-994;SCTR.RIGHT=567;SCTR.BOTTOM=-955;$LLB=;LLT=;LMT=;LMB=;LRT=CX=140:CY=14:OX=135:OY=-18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=521:-994$567:-994$567:-955$499:-955$499:-976$;" subject="EAID_A04862A6_080C_43b0_8DCE_04D577B2D3F0" style="Mode=3;EOID=F5D23353;SOID=F5D23353;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=10;SY=2;EX=10;EY=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B61D93A6_A88F_4730_93D5_612F44B8ECE4" style="Mode=3;EOID=F5D23353;SOID=6B36D93E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -2637,10 +2701,10 @@
 					<element geometry="SX=6;SY=3;EX=1;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_72F9467C_3D0D_4b12_8FA6_A01D070F8819" style="Mode=3;EOID=78A7AD68;SOID=D4FFD42D;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=0;SY=0;EX=-1;EY=-21;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=85:OY=25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_20732599_332F_4f0e_BFE6_593632EDB11F" style="Mode=3;EOID=BA1F8F73;SOID=7843FF73;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-70;SY=0;EX=0;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=18:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=816:-856$;" subject="EAID_FC7073E1_3362_472f_B087_27A619B6C819" style="Mode=3;EOID=5E5CC32C;SOID=7843FF73;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=52;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=17:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4" style="Mode=3;EOID=5E5CC32C;SOID=BA1F8F73;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=115;SY=0;EX=0;EY=-23;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=117:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=577:-523$;" subject="EAID_D01E7677_5AC2_42b1_AA17_2A8EC003CCFE" style="Mode=3;EOID=CFA9FBA1;SOID=EB137612;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=101;SY=2;EX=-7;EY=2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=55:OY=-33:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D0F25E0B_E148_41e7_8C52_BAE14F5149F6" style="Mode=3;EOID=55ED93F7;SOID=7646E603;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=2;SY=0;EX=0;EY=-34;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=767:-888$;" subject="EAID_E51D25BC_E9FB_423c_BFBF_00E3B99864B4" style="Mode=3;EOID=5E5CC32C;SOID=C7DAEF4C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-45;EX=-4;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=63:OY=-14:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=882:-727$;" subject="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=BA1F8F73;SOID=EB137612;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=5;EX=3;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=56:CY=14:OX=34:OY=-25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_A4228FCF_2B3C_44e6_BD17_379180274988" style="Mode=3;EOID=7646E603;SOID=FCF768BD;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_29996CD1_F979_44e0_95A0_E058E0BD5450" style="Mode=3;EOID=F3D3CE34;SOID=0529DA0C;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=20;SY=0;EX=-11;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=76:CY=14:OX=44:OY=-28:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_626183B8_93AC_4300_B227_85988E5F2016" style="Mode=3;EOID=4964C4D1;SOID=7646E603;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=1508;SCTR.TOP=-452;SCTR.RIGHT=1557;SCTR.BOTTOM=-421;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=94:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=1517:-452$1557:-452$1557:-421$1508:-421$1508:-443$;" subject="EAID_2FF93267_E672_481d_B370_202D9A0110E0" style="Mode=3;EOID=87CA43CF;SOID=87CA43CF;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=-23;EX=0;EY=36;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=56:CY=14:OX=1:OY=-5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1554:-523$1554:-833$;" subject="EAID_9F23612C_1865_4c8b_82ED_0BAA7D433501" style="Mode=3;EOID=7646E603;SOID=87CA43CF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_19AD8C15_4D9D_48f2_A3E1_A997E86942D2" style="Mode=3;EOID=87419E61;SOID=87CA43CF;Color=-1;LWidth=0;Hidden=0;"/>
@@ -2649,12 +2713,11 @@
 					<element geometry="SX=-30;SY=12;EX=-30;EY=12;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_1FFF54A3_B491_40f9_AB43_E5A825C5F2E2" style="Mode=3;EOID=55ED93F7;SOID=87CA43CF;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=61:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6" style="Mode=3;EOID=87419E61;SOID=A0A3FA47;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=54;SY=0;EX=0;EY=2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=113:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1172:-680$;" subject="EAID_4B6E629B_BECA_4e04_B7C9_925B517BC914" style="Mode=3;EOID=FCF768BD;SOID=A0A3FA47;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_93385F64_990A_44d0_A266_DDF9F55EABCE" style="Mode=3;EOID=A0A3FA47;SOID=A59E34AC;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=5;EX=3;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=56:CY=14:OX=34:OY=-25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_A4228FCF_2B3C_44e6_BD17_379180274988" style="Mode=3;EOID=7646E603;SOID=FCF768BD;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=52;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=17:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4" style="Mode=3;EOID=5E5CC32C;SOID=BA1F8F73;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_0C92219A_FEEE_409c_835C_E39228FEC769">
-				<model package="EAPK_9D04654A_8CAC_48dd_8971_41B6CDC2E4DA" localID="498" owner="EAPK_9D04654A_8CAC_48dd_8971_41B6CDC2E4DA" tpos="3"/>
+				<model package="EAPK_530FD6B0_9DEC_4c1c_9434_AF5FF2BE83FC" localID="498" owner="EAPK_530FD6B0_9DEC_4c1c_9434_AF5FF2BE83FC" tpos="3"/>
 				<properties name="access legislation" type="Logical"/>
 				<project author="andreea" version="1.0" created="2023-11-08 13:24:49" modified="2024-03-12 17:13:54"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
@@ -2696,7 +2759,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_4EFE5F0B_EC4D_4c8b_959D_BEBC0AF790D1">
-				<model package="EAPK_9D04654A_8CAC_48dd_8971_41B6CDC2E4DA" localID="526" owner="EAPK_9D04654A_8CAC_48dd_8971_41B6CDC2E4DA" tpos="2"/>
+				<model package="EAPK_530FD6B0_9DEC_4c1c_9434_AF5FF2BE83FC" localID="526" owner="EAPK_530FD6B0_9DEC_4c1c_9434_AF5FF2BE83FC" tpos="2"/>
 				<properties name="access criterion" type="Logical"/>
 				<project author="andreea" version="1.0" created="2024-02-15 14:04:41" modified="2024-03-14 17:57:50"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=75;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
diff --git a/implementation/eCatalogue/model2owl-config/config-parameters.xsl b/implementation/eCatalogue/model2owl-config/config-parameters.xsl
index cc59b780..9169750e 100644
--- a/implementation/eCatalogue/model2owl-config/config-parameters.xsl
+++ b/implementation/eCatalogue/model2owl-config/config-parameters.xsl
@@ -122,11 +122,11 @@
     <!--    owl:incompatibleWith -->
     <xsl:variable name="incompatibleWith" select="'3.1.0'"/>
     <!--    owl:versionInfo -->
-    <xsl:variable name="versionInfo" select="'4.1.0'"/>
+    <xsl:variable name="versionInfo" select="'4.2.0'"/>
     <!--    bibo:status-->
     <xsl:variable name="ontologyStatus" select="'Semantic Specification Release'"/>
     <!--    owl:priorVersion -->
-    <xsl:variable name="priorVersion" select="'4.0.2'"/>
+    <xsl:variable name="priorVersion" select="'4.1.0'"/>
     <!--    vann:preferredNamespaceUri -->
     <xsl:variable name="preferredNamespaceUri" select="'http://data.europa.eu/a4g/ontology#'"/>
     <!--    vann:preferredNamespacePrefix -->
diff --git a/implementation/eCatalogue/model2owl-config/namespaces.xml b/implementation/eCatalogue/model2owl-config/namespaces.xml
index 9c35da41..d12669cd 100644
--- a/implementation/eCatalogue/model2owl-config/namespaces.xml
+++ b/implementation/eCatalogue/model2owl-config/namespaces.xml
@@ -21,6 +21,7 @@
     <prefix name="epo-ful" value="http://data.europa.eu/a4g/ontology#" importURI="http://data.europa.eu/a4g/ontology#ful"/>
     <prefix name="epo-acc" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-sub" value="http://data.europa.eu/a4g/ontology#"/>
+    <prefix name="epo-inv" value="http://data.europa.eu/a4g/ontology#"/>
 
     <prefix name="nuts" value="http://data.europa.eu/nuts/"/>
     <prefix name="espd" value="https://github.com/ESPD/ESPD-EDM/"/>
diff --git a/implementation/eCatalogue/xmi_conceptual_model/eCatalogue.xml b/implementation/eCatalogue/xmi_conceptual_model/eCatalogue.xml
index e0af198e..2631b18a 100644
--- a/implementation/eCatalogue/xmi_conceptual_model/eCatalogue.xml
+++ b/implementation/eCatalogue/xmi_conceptual_model/eCatalogue.xml
@@ -4,70 +4,82 @@
 	<uml:Model xmi:type="uml:Model" name="EA_Model">
 		<packagedElement xmi:type="uml:Package" xmi:id="EAPK_2C5CFA6C_02C3_4fc3_9AA8_74318B172290" name="Catalogue">
 			<packagedElement xmi:type="uml:Package" xmi:id="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" name="catalogue">
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172" name="diagrams">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2" name="diagrams">
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_BCDEE6F5_A44E_454a_A6FD_F7B270D8DE17" body="Will this ever be a controlled vocabulary? &#xA;&#xA;To be proposed to EUVocabularies for publication. &#xA;">
+						<annotatedElement xmi:idref="EAID_B0937CD2_46D2_48d7_849F_409BCB726909"/>
+					</ownedComment>
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_7C2498F5_4923_4199_A897_66E923299404" body="To be checked in eInvoicing the relation to VAT code.&#xA;Awaiting a new change request on other types of TAX. "/>
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_05BF87EB_40D1_4fbc_98CF_2F9920D6FA83" body="Waiting for code list.">
+						<annotatedElement xmi:idref="EAID_ABDB4F83_303C_49aa_86E4_C7A6A9388FE0"/>
+						<annotatedElement xmi:idref="EAID_AEFD9686_5D49_4105_AEBB_8004EBB7007F"/>
+					</ownedComment>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_7C89A04E_6BCC_4cb8_B4DC_76817402265D" name="ProxyConnector">
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_89FDF957_97A3_47f3_98F1_B3229B558EC4" general="EAID_C328FA20_C15A_40a9_A9D6_A8B08A5ACBD7"/>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_C328FA20_C15A_40a9_A9D6_A8B08A5ACBD7" name="ProxyConnector"/>
-					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_539436E9_1B11_4461_B549_9B764CC4DB6A" name="post award object">
-						<packagedElement xmi:type="uml:Class" xmi:id="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A" name="epo-cat:InformationHub">
-							<generalization xmi:type="uml:Generalization" xmi:id="EAID_0F0A4585_C0E2_4438_81E0_5F41FAE01E73" general="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
-							<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst038715_CD52_4521_96D4_FF2138630244" name="epo-cat:isSpecificToLine" association="EAID_AB038715_CD52_4521_96D4_FF2138630244">
-								<type xmi:idref="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7"/>
-								<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000001__CD52_4521_96D4_FF2138630244" value="0"/>
-								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000002__CD52_4521_96D4_FF2138630244" value="*"/>
-							</ownedAttribute>
-						</packagedElement>
-						<packagedElement xmi:type="uml:Association" xmi:id="EAID_AB038715_CD52_4521_96D4_FF2138630244">
-							<memberEnd xmi:idref="EAID_dst038715_CD52_4521_96D4_FF2138630244"/>
-							<memberEnd xmi:idref="EAID_src038715_CD52_4521_96D4_FF2138630244"/>
-							<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src038715_CD52_4521_96D4_FF2138630244" association="EAID_AB038715_CD52_4521_96D4_FF2138630244">
-								<type xmi:idref="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
-							</ownedEnd>
-						</packagedElement>
-						<packagedElement xmi:type="uml:Class" xmi:id="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" name="epo-cat:Line">
-							<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_AE25C2FF_DC4C_492c_969F_2EF25B5E086F" name="dct:description">
-								<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000003_DC4C_492c_969F_2EF25B5E086F" value="0"/>
-								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000004_DC4C_492c_969F_2EF25B5E086F" value="1"/>
-								<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-							</ownedAttribute>
-							<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst87FBF1_89C8_4ed0_9551_9C0C13B80044" name="adms:identifier" association="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044">
-								<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-								<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000005__89C8_4ed0_9551_9C0C13B80044" value="0"/>
-								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000006__89C8_4ed0_9551_9C0C13B80044" value="1"/>
-							</ownedAttribute>
-							<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807" name="epo-cat:specifiesItem" association="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807">
-								<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-								<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000007__6882_44e8_BD03_7B202CFA4807" value="1"/>
-								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000008__6882_44e8_BD03_7B202CFA4807" value="1"/>
-							</ownedAttribute>
-						</packagedElement>
-						<packagedElement xmi:type="uml:Association" xmi:id="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044">
-							<memberEnd xmi:idref="EAID_dst87FBF1_89C8_4ed0_9551_9C0C13B80044"/>
-							<memberEnd xmi:idref="EAID_src87FBF1_89C8_4ed0_9551_9C0C13B80044"/>
-							<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src87FBF1_89C8_4ed0_9551_9C0C13B80044" association="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044">
-								<type xmi:idref="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7"/>
-							</ownedEnd>
-						</packagedElement>
-						<packagedElement xmi:type="uml:Association" xmi:id="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807">
-							<memberEnd xmi:idref="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807"/>
-							<memberEnd xmi:idref="EAID_srcE94395_6882_44e8_BD03_7B202CFA4807"/>
-							<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE94395_6882_44e8_BD03_7B202CFA4807" association="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807">
-								<type xmi:idref="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7"/>
-							</ownedEnd>
-						</packagedElement>
-						<packagedElement xmi:type="uml:Class" xmi:id="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" name="epo-cat:PostAwardDocument">
-							<generalization xmi:type="uml:Generalization" xmi:id="EAID_618070AC_783D_48ae_9723_9C69BB0EB7B4" general="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-						</packagedElement>
-						<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_233516AD_8114_473d_B8A6_42826FC39635" supplier="EAID_C3684D7C_E07D_415a_B935_B52376928738" client="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
-						<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_2B89940C_0005_4c86_BE14_3F84B34FF9D8" supplier="EAID_274424DF_415D_400f_99C0_FDA108C74C7A" client="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
-					</packagedElement>
+					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_539436E9_1B11_4461_B549_9B764CC4DB6A" name="post award object"/>
 				</packagedElement>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_789F6532_92B8_4618_8DF0_FCB72A894B5A" name="classes">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_5C1F4218_BC0A_4f09_B6CE_B4D878A3952C" name="classes">
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A" name="epo-cat:InformationHub">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_0F0A4585_C0E2_4438_81E0_5F41FAE01E73" general="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst038715_CD52_4521_96D4_FF2138630244" name="epo-cat:isSpecificToLine" association="EAID_AB038715_CD52_4521_96D4_FF2138630244">
+							<type xmi:idref="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000001__CD52_4521_96D4_FF2138630244" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000002__CD52_4521_96D4_FF2138630244" value="*"/>
+						</ownedAttribute>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_AB038715_CD52_4521_96D4_FF2138630244">
+						<memberEnd xmi:idref="EAID_dst038715_CD52_4521_96D4_FF2138630244"/>
+						<memberEnd xmi:idref="EAID_src038715_CD52_4521_96D4_FF2138630244"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src038715_CD52_4521_96D4_FF2138630244" association="EAID_AB038715_CD52_4521_96D4_FF2138630244">
+							<type xmi:idref="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" name="epo-cat:Line">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_AE25C2FF_DC4C_492c_969F_2EF25B5E086F" name="dct:description">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000003_DC4C_492c_969F_2EF25B5E086F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000004_DC4C_492c_969F_2EF25B5E086F" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_AA5A9919_BD48_4632_96F8_93193EE27298" name="epo:hasAdditionalInformation">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000005_BD48_4632_96F8_93193EE27298" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000006_BD48_4632_96F8_93193EE27298" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst87FBF1_89C8_4ed0_9551_9C0C13B80044" name="adms:identifier" association="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044">
+							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000007__89C8_4ed0_9551_9C0C13B80044" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000008__89C8_4ed0_9551_9C0C13B80044" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807" name="epo-cat:specifiesItem" association="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807">
+							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000009__6882_44e8_BD03_7B202CFA4807" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000010__6882_44e8_BD03_7B202CFA4807" value="1"/>
+						</ownedAttribute>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044">
+						<memberEnd xmi:idref="EAID_dst87FBF1_89C8_4ed0_9551_9C0C13B80044"/>
+						<memberEnd xmi:idref="EAID_src87FBF1_89C8_4ed0_9551_9C0C13B80044"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src87FBF1_89C8_4ed0_9551_9C0C13B80044" association="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044">
+							<type xmi:idref="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807">
+						<memberEnd xmi:idref="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807"/>
+						<memberEnd xmi:idref="EAID_srcE94395_6882_44e8_BD03_7B202CFA4807"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE94395_6882_44e8_BD03_7B202CFA4807" association="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807">
+							<type xmi:idref="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" name="epo-cat:PostAwardDocument">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_618070AC_783D_48ae_9723_9C69BB0EB7B4" general="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_233516AD_8114_473d_B8A6_42826FC39635" supplier="EAID_C3684D7C_E07D_415a_B935_B52376928738" client="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_2B89940C_0005_4c86_BE14_3F84B34FF9D8" supplier="EAID_274424DF_415D_400f_99C0_FDA108C74C7A" client="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_A3E8B06E_AAC4_4ee6_8057_BBB2E7E570FE" name="epo-cat:Brand">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_F28E86EC_1E6A_4ca3_92EC_91A96C4446B3" name="dct:title">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000009_1E6A_4ca3_92EC_91A96C4446B3" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000010_1E6A_4ca3_92EC_91A96C4446B3" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000011_1E6A_4ca3_92EC_91A96C4446B3" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000012_1E6A_4ca3_92EC_91A96C4446B3" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 					</packagedElement>
@@ -79,13 +91,25 @@
 						</ownedEnd>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" name="epo-cat:ChargeInformation">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst3E463C_04A8_41ba_94C0_F1ACF5EF8818" name="epo-inv:isSpecificToInvoiceLine" association="EAID_363E463C_04A8_41ba_94C0_F1ACF5EF8818">
+							<type xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000013__04A8_41ba_94C0_F1ACF5EF8818" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000014__04A8_41ba_94C0_F1ACF5EF8818" value="*"/>
+						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst18A153_57A6_4142_86D1_A887FC375039" name="epo-ord:isSpecificToOrderLine" association="EAID_AD18A153_57A6_4142_86D1_A887FC375039">
 							<type xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000011__57A6_4142_86D1_A887FC375039" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000012__57A6_4142_86D1_A887FC375039" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000015__57A6_4142_86D1_A887FC375039" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000016__57A6_4142_86D1_A887FC375039" value="*"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_D8788651_B092_4dea_82FA_E8F122CD0638" general="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1"/>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_363E463C_04A8_41ba_94C0_F1ACF5EF8818">
+						<memberEnd xmi:idref="EAID_dst3E463C_04A8_41ba_94C0_F1ACF5EF8818"/>
+						<memberEnd xmi:idref="EAID_src3E463C_04A8_41ba_94C0_F1ACF5EF8818"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3E463C_04A8_41ba_94C0_F1ACF5EF8818" association="EAID_363E463C_04A8_41ba_94C0_F1ACF5EF8818">
+							<type xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_AD18A153_57A6_4142_86D1_A887FC375039">
 						<memberEnd xmi:idref="EAID_dst18A153_57A6_4142_86D1_A887FC375039"/>
 						<memberEnd xmi:idref="EAID_src18A153_57A6_4142_86D1_A887FC375039"/>
@@ -107,6 +131,20 @@
 							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6AA08C54_54FE_402e_8B58_8804E01D8889">
+						<memberEnd xmi:idref="EAID_dstA08C54_54FE_402e_8B58_8804E01D8889"/>
+						<memberEnd xmi:idref="EAID_srcA08C54_54FE_402e_8B58_8804E01D8889"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA08C54_54FE_402e_8B58_8804E01D8889" association="EAID_6AA08C54_54FE_402e_8B58_8804E01D8889">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6DA6B6C9_7964_4102_A413_050778056B72">
+						<memberEnd xmi:idref="EAID_dstA6B6C9_7964_4102_A413_050778056B72"/>
+						<memberEnd xmi:idref="EAID_srcA6B6C9_7964_4102_A413_050778056B72"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA6B6C9_7964_4102_A413_050778056B72" association="EAID_6DA6B6C9_7964_4102_A413_050778056B72">
+							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7A1163CB_9C26_4b4f_BCD6_23ABF38C12BE">
 						<memberEnd xmi:idref="EAID_dst1163CB_9C26_4b4f_BCD6_23ABF38C12BE"/>
 						<memberEnd xmi:idref="EAID_src1163CB_9C26_4b4f_BCD6_23ABF38C12BE"/>
@@ -132,29 +170,34 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" name="epo-cat:ItemProperty">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_F16DE9E2_6233_423a_9884_110D0A949ED9" name="epo-cat:hasAttributeType">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000013_6233_423a_9884_110D0A949ED9" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000014_6233_423a_9884_110D0A949ED9" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000017_6233_423a_9884_110D0A949ED9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000018_6233_423a_9884_110D0A949ED9" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_BF73D71E_1B85_4bd9_9A0A_EED7EF527F0F" name="epo-cat:hasClassificationScheme">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000015_1B85_4bd9_9A0A_EED7EF527F0F" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000016_1B85_4bd9_9A0A_EED7EF527F0F" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000019_1B85_4bd9_9A0A_EED7EF527F0F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000020_1B85_4bd9_9A0A_EED7EF527F0F" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_832D1359_1F4C_4f2d_9BC0_630E39EA86C6" name="epo-cat:hasLiteralValue">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000017_1F4C_4f2d_9BC0_630E39EA86C6" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000018_1F4C_4f2d_9BC0_630E39EA86C6" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000021_1F4C_4f2d_9BC0_630E39EA86C6" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000022_1F4C_4f2d_9BC0_630E39EA86C6" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_A3429F90_694B_4ab8_9E58_20178484918E" name="dct:title">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000023_694B_4ab8_9E58_20178484918E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000024_694B_4ab8_9E58_20178484918E" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst92BD51_5113_4e40_A80A_3CDDD84D3629" name="epo-cat:describesItem" association="EAID_0692BD51_5113_4e40_A80A_3CDDD84D3629">
 							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000019__5113_4e40_A80A_3CDDD84D3629" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000020__5113_4e40_A80A_3CDDD84D3629" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000025__5113_4e40_A80A_3CDDD84D3629" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000026__5113_4e40_A80A_3CDDD84D3629" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstC9C412_36FA_46d5_AA00_34CA1CC60CA2" name="epo-cat:hasQualifiedValue" association="EAID_B9C9C412_36FA_46d5_AA00_34CA1CC60CA2">
 							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000021__36FA_46d5_AA00_34CA1CC60CA2" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000022__36FA_46d5_AA00_34CA1CC60CA2" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000027__36FA_46d5_AA00_34CA1CC60CA2" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000028__36FA_46d5_AA00_34CA1CC60CA2" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0692BD51_5113_4e40_A80A_3CDDD84D3629">
@@ -173,8 +216,8 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_09632AAB_48D4_4308_9EFD_D1D4C65E36F5" name="epo-cat:ItemModel">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_2E66D55A_9519_4482_BD71_DFF632D155C2" name="dct:title">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000023_9519_4482_BD71_DFF632D155C2" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000024_9519_4482_BD71_DFF632D155C2" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000029_9519_4482_BD71_DFF632D155C2" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000030_9519_4482_BD71_DFF632D155C2" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 					</packagedElement>
@@ -187,14 +230,14 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967" name="epo-cat:ItemRelation">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_D469D345_8580_4844_AC6A_B3652BF66F0E" name="epo-cat:hasFactor">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000025_8580_4844_AC6A_B3652BF66F0E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000026_8580_4844_AC6A_B3652BF66F0E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000031_8580_4844_AC6A_B3652BF66F0E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000032_8580_4844_AC6A_B3652BF66F0E" value="1"/>
 							<type xmi:idref="EAJava_xsd_decimal"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstB0C90F_39E1_4d42_9568_8E5CF7B00FDD" name="epo-cat:isRelatedToItem" association="EAID_06B0C90F_39E1_4d42_9568_8E5CF7B00FDD">
 							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000027__39E1_4d42_9568_8E5CF7B00FDD" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000028__39E1_4d42_9568_8E5CF7B00FDD" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000033__39E1_4d42_9568_8E5CF7B00FDD" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000034__39E1_4d42_9568_8E5CF7B00FDD" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_06B0C90F_39E1_4d42_9568_8E5CF7B00FDD">
@@ -220,48 +263,53 @@
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" name="epo-cat:Price">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstB1CFC6_0B95_4c94_B742_4DC2F5EAF55E" name="epo-ord:hasPriceDiscountInformation" association="EAID_15B1CFC6_0B95_4c94_B742_4DC2F5EAF55E">
 							<type xmi:idref="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000029__0B95_4c94_B742_4DC2F5EAF55E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000030__0B95_4c94_B742_4DC2F5EAF55E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000035__0B95_4c94_B742_4DC2F5EAF55E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000036__0B95_4c94_B742_4DC2F5EAF55E" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst622DE3_2DEE_491f_A5F1_B592E89F9030" name="epo-cat:hasQuantityThreshold" association="EAID_1F622DE3_2DEE_491f_A5F1_B592E89F9030">
 							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000031__2DEE_491f_A5F1_B592E89F9030" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000032__2DEE_491f_A5F1_B592E89F9030" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000037__2DEE_491f_A5F1_B592E89F9030" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000038__2DEE_491f_A5F1_B592E89F9030" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstB983F5_7502_49f2_984C_17FF6E47F8F9" name="epo-cat:hasExpectedDeliveryTime" association="EAID_45B983F5_7502_49f2_984C_17FF6E47F8F9">
 							<type xmi:idref="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000033__7502_49f2_984C_17FF6E47F8F9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000034__7502_49f2_984C_17FF6E47F8F9" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000039__7502_49f2_984C_17FF6E47F8F9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000040__7502_49f2_984C_17FF6E47F8F9" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE28283_E9BB_4790_9AB4_37A6F31DF36A" name="epo-ord:hasGrossMonetaryValue" association="EAID_47E28283_E9BB_4790_9AB4_37A6F31DF36A">
+							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000041__E9BB_4790_9AB4_37A6F31DF36A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000042__E9BB_4790_9AB4_37A6F31DF36A" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38" name="epo:hasPriceSurchargeInformation" association="EAID_4F4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
 							<type xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000035__A3BC_4cfc_BFCF_A26F9C0B1D38" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000036__A3BC_4cfc_BFCF_A26F9C0B1D38" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000043__A3BC_4cfc_BFCF_A26F9C0B1D38" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000044__A3BC_4cfc_BFCF_A26F9C0B1D38" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst569FED_815F_45f4_87EA_C0E83DC5C9AF" name="epo-cat:hasPriceValidity" association="EAID_6D569FED_815F_45f4_87EA_C0E83DC5C9AF">
 							<type xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000037__815F_45f4_87EA_C0E83DC5C9AF" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000038__815F_45f4_87EA_C0E83DC5C9AF" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000045__815F_45f4_87EA_C0E83DC5C9AF" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000046__815F_45f4_87EA_C0E83DC5C9AF" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst92648E_ABC4_4408_B3EA_A725F5A385F7" name="epo-cat:hasNetMonetaryValue" association="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000039__ABC4_4408_B3EA_A725F5A385F7" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000040__ABC4_4408_B3EA_A725F5A385F7" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000047__ABC4_4408_B3EA_A725F5A385F7" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000048__ABC4_4408_B3EA_A725F5A385F7" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstA3B8C3_695C_4b42_8481_D40EEC904171" name="epo-cat:hasBaseQuantity" association="EAID_9EA3B8C3_695C_4b42_8481_D40EEC904171">
 							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000041__695C_4b42_8481_D40EEC904171" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000042__695C_4b42_8481_D40EEC904171" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000049__695C_4b42_8481_D40EEC904171" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000050__695C_4b42_8481_D40EEC904171" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstFABF7A_1814_4dd4_BD97_28BD0C9F2F49" name="epo-cat:hasOrderabableUnitFactorRate" association="EAID_A0FABF7A_1814_4dd4_BD97_28BD0C9F2F49">
 							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000043__1814_4dd4_BD97_28BD0C9F2F49" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000044__1814_4dd4_BD97_28BD0C9F2F49" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000051__1814_4dd4_BD97_28BD0C9F2F49" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000052__1814_4dd4_BD97_28BD0C9F2F49" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst35A308_9DDF_4d5b_980E_9D85403496D0" name="epo-cat:hasDeliveryLocation" association="EAID_DF35A308_9DDF_4d5b_980E_9D85403496D0">
 							<type xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000045__9DDF_4d5b_980E_9D85403496D0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000046__9DDF_4d5b_980E_9D85403496D0" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000053__9DDF_4d5b_980E_9D85403496D0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000054__9DDF_4d5b_980E_9D85403496D0" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_15B1CFC6_0B95_4c94_B742_4DC2F5EAF55E">
@@ -285,6 +333,13 @@
 							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_47E28283_E9BB_4790_9AB4_37A6F31DF36A">
+						<memberEnd xmi:idref="EAID_dstE28283_E9BB_4790_9AB4_37A6F31DF36A"/>
+						<memberEnd xmi:idref="EAID_srcE28283_E9BB_4790_9AB4_37A6F31DF36A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE28283_E9BB_4790_9AB4_37A6F31DF36A" association="EAID_47E28283_E9BB_4790_9AB4_37A6F31DF36A">
+							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6D569FED_815F_45f4_87EA_C0E83DC5C9AF">
 						<memberEnd xmi:idref="EAID_dst569FED_815F_45f4_87EA_C0E83DC5C9AF"/>
 						<memberEnd xmi:idref="EAID_src569FED_815F_45f4_87EA_C0E83DC5C9AF"/>
@@ -321,6 +376,13 @@
 							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_02BBBEAA_ED71_4eaf_B786_4BBE7F52C5D5">
+						<memberEnd xmi:idref="EAID_dstBBBEAA_ED71_4eaf_B786_4BBE7F52C5D5"/>
+						<memberEnd xmi:idref="EAID_srcBBBEAA_ED71_4eaf_B786_4BBE7F52C5D5"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBBBEAA_ED71_4eaf_B786_4BBE7F52C5D5" association="EAID_02BBBEAA_ED71_4eaf_B786_4BBE7F52C5D5">
+							<type xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1F2E5010_8DA9_46f5_A0D6_59757CEC226D">
 						<memberEnd xmi:idref="EAID_dst2E5010_8DA9_46f5_A0D6_59757CEC226D"/>
 						<memberEnd xmi:idref="EAID_src2E5010_8DA9_46f5_A0D6_59757CEC226D"/>
@@ -355,8 +417,8 @@
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD" name="epo-cat:Manufacturer">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstD80540_9E04_44d6_B0B4_339ED74111CC" name="epo:hasManufacturerID" association="EAID_31D80540_9E04_44d6_B0B4_339ED74111CC">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000047__9E04_44d6_B0B4_339ED74111CC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000048__9E04_44d6_B0B4_339ED74111CC" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000055__9E04_44d6_B0B4_339ED74111CC" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000056__9E04_44d6_B0B4_339ED74111CC" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_D2C94CC0_A14F_4c9c_B4C0_912C9C11EC4E" general="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
 					</packagedElement>
@@ -376,45 +438,45 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" name="epo-cat:Catalogue">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_FE456683_FF3B_4e45_8E68_393EB2A79185" name="epo-cat:hasSpecificPaymentArrangement">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000049_FF3B_4e45_8E68_393EB2A79185" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000050_FF3B_4e45_8E68_393EB2A79185" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000057_FF3B_4e45_8E68_393EB2A79185" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000058_FF3B_4e45_8E68_393EB2A79185" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_51057DA3_81A5_4e16_A7F9_22D9EFCB1693" general="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst428053_29BF_4efe_807B_B6FA3BB29BF5" name="epo:specifiesCatalogueReceiver" association="EAID_52428053_29BF_4efe_807B_B6FA3BB29BF5">
 							<type xmi:idref="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000051__29BF_4efe_807B_B6FA3BB29BF5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000052__29BF_4efe_807B_B6FA3BB29BF5" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000059__29BF_4efe_807B_B6FA3BB29BF5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000060__29BF_4efe_807B_B6FA3BB29BF5" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst89809C_E481_4fb3_9090_B37DC376C605" name="epo:specifiesSeller" association="EAID_6089809C_E481_4fb3_9090_B37DC376C605">
 							<type xmi:idref="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000053__E481_4fb3_9090_B37DC376C605" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000054__E481_4fb3_9090_B37DC376C605" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000061__E481_4fb3_9090_B37DC376C605" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000062__E481_4fb3_9090_B37DC376C605" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstD8157E_3EB6_44da_84E5_92EF1E2753B3" name="epo:specifiesCatalogueProvider" association="EAID_9BD8157E_3EB6_44da_84E5_92EF1E2753B3">
 							<type xmi:idref="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000055__3EB6_44da_84E5_92EF1E2753B3" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000056__3EB6_44da_84E5_92EF1E2753B3" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000063__3EB6_44da_84E5_92EF1E2753B3" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000064__3EB6_44da_84E5_92EF1E2753B3" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstBEA51D_27BB_47b3_9536_602D5F0E8782" name="epo-cat:comprisesCatalogueLine" association="EAID_9DBEA51D_27BB_47b3_9536_602D5F0E8782">
 							<type xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000057__27BB_47b3_9536_602D5F0E8782" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000058__27BB_47b3_9536_602D5F0E8782" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000065__27BB_47b3_9536_602D5F0E8782" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000066__27BB_47b3_9536_602D5F0E8782" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstDDC1AB_FC05_462d_A479_433862DD01D8" name="epo:hasValidityPeriod" association="EAID_9EDDC1AB_FC05_462d_A479_433862DD01D8">
 							<type xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000059__FC05_462d_A479_433862DD01D8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000060__FC05_462d_A479_433862DD01D8" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000067__FC05_462d_A479_433862DD01D8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000068__FC05_462d_A479_433862DD01D8" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst94D054_08DB_4bb5_A279_498213B45F8E" name="epo-cat:isSubordinatedToContract" association="EAID_BC94D054_08DB_4bb5_A279_498213B45F8E">
 							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000061__08DB_4bb5_A279_498213B45F8E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000062__08DB_4bb5_A279_498213B45F8E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000069__08DB_4bb5_A279_498213B45F8E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000070__08DB_4bb5_A279_498213B45F8E" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst0C71CA_F2D3_48ca_8D27_E3F34E3AF36B" name="epo:specifiesBuyer" association="EAID_C00C71CA_F2D3_48ca_8D27_E3F34E3AF36B">
 							<type xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000063__F2D3_48ca_8D27_E3F34E3AF36B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000064__F2D3_48ca_8D27_E3F34E3AF36B" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000071__F2D3_48ca_8D27_E3F34E3AF36B" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000072__F2D3_48ca_8D27_E3F34E3AF36B" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_52428053_29BF_4efe_807B_B6FA3BB29BF5">
@@ -483,70 +545,70 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" name="epo-cat:CatalogueLine">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_BFF4421D_4A82_4912_8FAB_B8F008971603" name="epo-cat:isOrderable">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000065_4A82_4912_8FAB_B8F008971603" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000066_4A82_4912_8FAB_B8F008971603" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000073_4A82_4912_8FAB_B8F008971603" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000074_4A82_4912_8FAB_B8F008971603" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_FBB0B29A_DB6B_4a7d_9D89_28022FD2ADF9" name="epo-cat:hasOrderableUnitFactorRate">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000067_DB6B_4a7d_9D89_28022FD2ADF9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000068_DB6B_4a7d_9D89_28022FD2ADF9" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000075_DB6B_4a7d_9D89_28022FD2ADF9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000076_DB6B_4a7d_9D89_28022FD2ADF9" value="1"/>
 							<type xmi:idref="EAJava_xsd_decimal"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_5F3E38FD_970B_44c9_A7ED_42A9A735C2A5" name="epo-cat:hasOrderableQuantityIncrement">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000069_970B_44c9_A7ED_42A9A735C2A5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000070_970B_44c9_A7ED_42A9A735C2A5" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000077_970B_44c9_A7ED_42A9A735C2A5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000078_970B_44c9_A7ED_42A9A735C2A5" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_EF997DF6_B759_4395_BB70_DDF2E8D940A7" name="epo-cat:hasWarrantyInformation">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000071_B759_4395_BB70_DDF2E8D940A7" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000072_B759_4395_BB70_DDF2E8D940A7" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000079_B759_4395_BB70_DDF2E8D940A7" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000080_B759_4395_BB70_DDF2E8D940A7" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_B3958CA3_067C_4ccb_A27A_2C53C993F704" name="epo-cat:isContractedItem">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000073_067C_4ccb_A27A_2C53C993F704" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000074_067C_4ccb_A27A_2C53C993F704" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000081_067C_4ccb_A27A_2C53C993F704" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000082_067C_4ccb_A27A_2C53C993F704" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_7FC6DBD9_8555_4378_9A2D_09158D45F0AB" name="epo-cat:hasTransactionConditions">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000075_8555_4378_9A2D_09158D45F0AB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000076_8555_4378_9A2D_09158D45F0AB" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000083_8555_4378_9A2D_09158D45F0AB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000084_8555_4378_9A2D_09158D45F0AB" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstEA3AE7_155D_492a_ADD5_430BD3FAB4A8" name="epo-cat:foreseesPackage" association="EAID_1FEA3AE7_155D_492a_ADD5_430BD3FAB4A8">
 							<type xmi:idref="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000077__155D_492a_ADD5_430BD3FAB4A8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000078__155D_492a_ADD5_430BD3FAB4A8" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000085__155D_492a_ADD5_430BD3FAB4A8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000086__155D_492a_ADD5_430BD3FAB4A8" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst28A6D1_3F44_48a1_A013_1A7BA2859AFA" name="epo-cat:hasPrice" association="EAID_3C28A6D1_3F44_48a1_A013_1A7BA2859AFA">
 							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000079__3F44_48a1_A013_1A7BA2859AFA" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000080__3F44_48a1_A013_1A7BA2859AFA" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000087__3F44_48a1_A013_1A7BA2859AFA" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000088__3F44_48a1_A013_1A7BA2859AFA" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst6E2C47_4590_4730_B50C_8F40D73778CB" name="epo-cat:hasStandardisedUnitPrice" association="EAID_5E6E2C47_4590_4730_B50C_8F40D73778CB">
 							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000081__4590_4730_B50C_8F40D73778CB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000082__4590_4730_B50C_8F40D73778CB" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000089__4590_4730_B50C_8F40D73778CB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000090__4590_4730_B50C_8F40D73778CB" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF88923_D9FB_4937_B866_FABECBC1DB55" name="epo-cat:hasCatalogueLineValidity" association="EAID_8FF88923_D9FB_4937_B866_FABECBC1DB55">
 							<type xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000083__D9FB_4937_B866_FABECBC1DB55" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000084__D9FB_4937_B866_FABECBC1DB55" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000091__D9FB_4937_B866_FABECBC1DB55" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000092__D9FB_4937_B866_FABECBC1DB55" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst9C4956_D3A6_47cd_966E_C37D023DC755" name="epo-cat:hasChargeInformation" association="EAID_9D9C4956_D3A6_47cd_966E_C37D023DC755">
 							<type xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000085__D3A6_47cd_966E_C37D023DC755" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000086__D3A6_47cd_966E_C37D023DC755" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000093__D3A6_47cd_966E_C37D023DC755" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000094__D3A6_47cd_966E_C37D023DC755" value="*"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_C33C0B35_4ADE_463d_BD51_7717D3E67FCB" general="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst3A74BB_614F_4b1c_AE59_F45CD626BB7A" name="epo-cat:hasMinimumQuantityGuaranteedForDelivery" association="EAID_E93A74BB_614F_4b1c_AE59_F45CD626BB7A">
 							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000087__614F_4b1c_AE59_F45CD626BB7A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000088__614F_4b1c_AE59_F45CD626BB7A" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000095__614F_4b1c_AE59_F45CD626BB7A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000096__614F_4b1c_AE59_F45CD626BB7A" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst75E438_48A3_41f5_A736_268C91FF8AF2" name="epo-cat:hasMaximumOrderQuantity" association="EAID_F475E438_48A3_41f5_A736_268C91FF8AF2">
 							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000089__48A3_41f5_A736_268C91FF8AF2" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000090__48A3_41f5_A736_268C91FF8AF2" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000097__48A3_41f5_A736_268C91FF8AF2" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000098__48A3_41f5_A736_268C91FF8AF2" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1FEA3AE7_155D_492a_ADD5_430BD3FAB4A8">
@@ -596,29 +658,29 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E" name="epo-cat:Batch">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_883D9F2F_AD07_486d_8D59_3528CDA63AAC" name="epo-cat:hasManufactureDate">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000091_AD07_486d_8D59_3528CDA63AAC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000092_AD07_486d_8D59_3528CDA63AAC" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000099_AD07_486d_8D59_3528CDA63AAC" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000100_AD07_486d_8D59_3528CDA63AAC" value="1"/>
 							<type xmi:idref="EAJava_xsd_dateTime"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_F894F4EA_2D4C_4dd8_8443_CCD64C72E323" name="epo-cat:hasBestBeforeDate">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000093_2D4C_4dd8_8443_CCD64C72E323" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000094_2D4C_4dd8_8443_CCD64C72E323" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000101_2D4C_4dd8_8443_CCD64C72E323" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000102_2D4C_4dd8_8443_CCD64C72E323" value="1"/>
 							<type xmi:idref="EAJava_xsd_date"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_B193D13F_BEA3_4ea4_9F18_96D02FFDCB96" name="epo-cat:hasExpiryDate">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000095_BEA3_4ea4_9F18_96D02FFDCB96" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000096_BEA3_4ea4_9F18_96D02FFDCB96" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000103_BEA3_4ea4_9F18_96D02FFDCB96" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000104_BEA3_4ea4_9F18_96D02FFDCB96" value="1"/>
 							<type xmi:idref="EAJava_xsd_date"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstA0DAC3_2E18_40c1_BB08_B80EA400868A" name="epo-cat:isProductionOf" association="EAID_65A0DAC3_2E18_40c1_BB08_B80EA400868A">
 							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000097__2E18_40c1_BB08_B80EA400868A" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000098__2E18_40c1_BB08_B80EA400868A" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000105__2E18_40c1_BB08_B80EA400868A" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000106__2E18_40c1_BB08_B80EA400868A" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstCA405B_7FF7_41ad_9ACB_A1015C643C97" name="epo:hasBatchID" association="EAID_ACCA405B_7FF7_41ad_9ACB_A1015C643C97">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000099__7FF7_41ad_9ACB_A1015C643C97" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000100__7FF7_41ad_9ACB_A1015C643C97" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000107__7FF7_41ad_9ACB_A1015C643C97" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000108__7FF7_41ad_9ACB_A1015C643C97" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_65A0DAC3_2E18_40c1_BB08_B80EA400868A">
@@ -637,134 +699,139 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" name="epo-cat:Item">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_A8D31BA8_2CFF_4c26_9532_EB27449F27A5" name="dct:title">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000101_2CFF_4c26_9532_EB27449F27A5" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000102_2CFF_4c26_9532_EB27449F27A5" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000109_2CFF_4c26_9532_EB27449F27A5" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000110_2CFF_4c26_9532_EB27449F27A5" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_77A2D19B_3C35_4d9e_90DA_7AFEA316F25B" name="dct:description">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000103_3C35_4d9e_90DA_7AFEA316F25B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000104_3C35_4d9e_90DA_7AFEA316F25B" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000111_3C35_4d9e_90DA_7AFEA316F25B" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000112_3C35_4d9e_90DA_7AFEA316F25B" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_68BA72F5_8B76_44e1_BE3C_78945DDC9AB5" name="epo-cat:hasDimensionDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000105_8B76_44e1_BE3C_78945DDC9AB5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000106_8B76_44e1_BE3C_78945DDC9AB5" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000113_8B76_44e1_BE3C_78945DDC9AB5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000114_8B76_44e1_BE3C_78945DDC9AB5" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_9EAF0F75_2FEC_42db_A241_77B8583908EF" name="epo-cat:hasHazardousClass">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000107_2FEC_42db_A241_77B8583908EF" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000108_2FEC_42db_A241_77B8583908EF" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000115_2FEC_42db_A241_77B8583908EF" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000116_2FEC_42db_A241_77B8583908EF" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_62E08CF3_60EE_420d_97ED_66D2A42238A1" name="epo-cat:isInStock">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000109_60EE_420d_97ED_66D2A42238A1" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000110_60EE_420d_97ED_66D2A42238A1" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000117_60EE_420d_97ED_66D2A42238A1" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000118_60EE_420d_97ED_66D2A42238A1" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_40D54F27_7828_42fb_9986_2F847B78C3DA" name="epo-cat:hasKeyword">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000111_7828_42fb_9986_2F847B78C3DA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000112_7828_42fb_9986_2F847B78C3DA" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000119_7828_42fb_9986_2F847B78C3DA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000120_7828_42fb_9986_2F847B78C3DA" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst6B1F71_0D37_48b2_B8F5_8C2924DBDB24" name="dct:requires" association="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24">
 							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000113__0D37_48b2_B8F5_8C2924DBDB24" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000114__0D37_48b2_B8F5_8C2924DBDB24" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000121__0D37_48b2_B8F5_8C2924DBDB24" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000122__0D37_48b2_B8F5_8C2924DBDB24" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF54CAF_0D08_45a7_BB5B_816DF773903A" name="epo-cat:hasQualifiedItemRelation" association="EAID_14F54CAF_0D08_45a7_BB5B_816DF773903A">
 							<type xmi:idref="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000115__0D08_45a7_BB5B_816DF773903A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000116__0D08_45a7_BB5B_816DF773903A" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000123__0D08_45a7_BB5B_816DF773903A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000124__0D08_45a7_BB5B_816DF773903A" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF8E397_60D1_4c6e_8AC0_E18C87C2622B" name="epo-cat:hasBrand" association="EAID_14F8E397_60D1_4c6e_8AC0_E18C87C2622B">
 							<type xmi:idref="EAID_A3E8B06E_AAC4_4ee6_8057_BBB2E7E570FE"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000117__60D1_4c6e_8AC0_E18C87C2622B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000118__60D1_4c6e_8AC0_E18C87C2622B" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000125__60D1_4c6e_8AC0_E18C87C2622B" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000126__60D1_4c6e_8AC0_E18C87C2622B" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst464872_BFB6_40bb_84F1_8A3969FE662E" name="epo:hasItemStandardID" association="EAID_15464872_BFB6_40bb_84F1_8A3969FE662E">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000119__BFB6_40bb_84F1_8A3969FE662E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000120__BFB6_40bb_84F1_8A3969FE662E" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000127__BFB6_40bb_84F1_8A3969FE662E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000128__BFB6_40bb_84F1_8A3969FE662E" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst9E2AC7_4D59_4119_A715_C0AF0EF80B65" name="epo-cat:hasNetQuantity" association="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65">
 							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000121__4D59_4119_A715_C0AF0EF80B65" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000122__4D59_4119_A715_C0AF0EF80B65" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000129__4D59_4119_A715_C0AF0EF80B65" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000130__4D59_4119_A715_C0AF0EF80B65" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst70E246_3BA3_4795_8084_FD257C99FB89" name="epo-ord:hasTaxInformation" association="EAID_3570E246_3BA3_4795_8084_FD257C99FB89">
 							<type xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000123__3BA3_4795_8084_FD257C99FB89" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000124__3BA3_4795_8084_FD257C99FB89" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000131__3BA3_4795_8084_FD257C99FB89" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000132__3BA3_4795_8084_FD257C99FB89" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst5C76C8_B834_46d5_A5CA_93F12F0E5824" name="epo-cat:hasSpecification" association="EAID_455C76C8_B834_46d5_A5CA_93F12F0E5824">
 							<type xmi:idref="EAID_0B2ADA0F_0895_4cee_BF7A_BF9E5E76BDCC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000125__B834_46d5_A5CA_93F12F0E5824" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000126__B834_46d5_A5CA_93F12F0E5824" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000133__B834_46d5_A5CA_93F12F0E5824" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000134__B834_46d5_A5CA_93F12F0E5824" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst8C85CC_EF8D_49e2_821D_FF39CCA1773F" name="dct:hasPart" association="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F">
 							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000127__EF8D_49e2_821D_FF39CCA1773F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000128__EF8D_49e2_821D_FF39CCA1773F" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000135__EF8D_49e2_821D_FF39CCA1773F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000136__EF8D_49e2_821D_FF39CCA1773F" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstCB7369_B0C2_4acc_A513_76150076F808" name="epo-inv:hasItemClassificationIdentifier" association="EAID_52CB7369_B0C2_4acc_A513_76150076F808">
+							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000137__B0C2_4acc_A513_76150076F808" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000138__B0C2_4acc_A513_76150076F808" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst4DB5D8_4929_4670_9014_608B3C5534ED" name="epo-cat:hasAccessoryItem" association="EAID_574DB5D8_4929_4670_9014_608B3C5534ED">
 							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000129__4929_4670_9014_608B3C5534ED" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000130__4929_4670_9014_608B3C5534ED" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000139__4929_4670_9014_608B3C5534ED" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000140__4929_4670_9014_608B3C5534ED" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst49101F_45CB_45ba_9792_E3508C6FE92A" name="epo:hasCertification" association="EAID_6749101F_45CB_45ba_9792_E3508C6FE92A">
 							<type xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000131__45CB_45ba_9792_E3508C6FE92A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000132__45CB_45ba_9792_E3508C6FE92A" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000141__45CB_45ba_9792_E3508C6FE92A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000142__45CB_45ba_9792_E3508C6FE92A" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst6B650B_17CC_499e_A49B_8791C8D7CBEA" name="epo:hasSellerItemID" association="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000133__17CC_499e_A49B_8791C8D7CBEA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000134__17CC_499e_A49B_8791C8D7CBEA" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000143__17CC_499e_A49B_8791C8D7CBEA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000144__17CC_499e_A49B_8791C8D7CBEA" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst2B738F_531D_4495_9397_CE5771200854" name="epo-cat:hasComplementaryItem" association="EAID_AF2B738F_531D_4495_9397_CE5771200854">
 							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000135__531D_4495_9397_CE5771200854" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000136__531D_4495_9397_CE5771200854" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000145__531D_4495_9397_CE5771200854" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000146__531D_4495_9397_CE5771200854" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst8B62CF_836E_494c_A0AF_73F7FB5C8991" name="dct:isReplacedBy" association="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991">
 							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000137__836E_494c_A0AF_73F7FB5C8991" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000138__836E_494c_A0AF_73F7FB5C8991" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000147__836E_494c_A0AF_73F7FB5C8991" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000148__836E_494c_A0AF_73F7FB5C8991" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstC722BA_3236_4fcb_B51A_14A66F3D627C" name="epo:hasSerialID" association="EAID_BBC722BA_3236_4fcb_B51A_14A66F3D627C">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000139__3236_4fcb_B51A_14A66F3D627C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000140__3236_4fcb_B51A_14A66F3D627C" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000149__3236_4fcb_B51A_14A66F3D627C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000150__3236_4fcb_B51A_14A66F3D627C" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst34A9FD_D673_4331_8F43_3A98DA6CD0B7" name="epo-cat:hasModel" association="EAID_C734A9FD_D673_4331_8F43_3A98DA6CD0B7">
 							<type xmi:idref="EAID_09632AAB_48D4_4308_9EFD_D1D4C65E36F5"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000141__D673_4331_8F43_3A98DA6CD0B7" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000142__D673_4331_8F43_3A98DA6CD0B7" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000151__D673_4331_8F43_3A98DA6CD0B7" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000152__D673_4331_8F43_3A98DA6CD0B7" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst07D198_1A41_4b43_873A_F9E88411186D" name="epo:hasManufacturerItemID" association="EAID_E507D198_1A41_4b43_873A_F9E88411186D">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000143__1A41_4b43_873A_F9E88411186D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000144__1A41_4b43_873A_F9E88411186D" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000153__1A41_4b43_873A_F9E88411186D" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000154__1A41_4b43_873A_F9E88411186D" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstEFDC69_19B4_47d7_A201_D8391B5C67DF" name="epo:hasBuyerItemID" association="EAID_ECEFDC69_19B4_47d7_A201_D8391B5C67DF">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000145__19B4_47d7_A201_D8391B5C67DF" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000146__19B4_47d7_A201_D8391B5C67DF" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000155__19B4_47d7_A201_D8391B5C67DF" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000156__19B4_47d7_A201_D8391B5C67DF" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst8320C5_899E_4f5f_971B_BF5DE149A892" name="epo-cat:hasManufacturer" association="EAID_F58320C5_899E_4f5f_971B_BF5DE149A892">
 							<type xmi:idref="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000147__899E_4f5f_971B_BF5DE149A892" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000148__899E_4f5f_971B_BF5DE149A892" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000157__899E_4f5f_971B_BF5DE149A892" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000158__899E_4f5f_971B_BF5DE149A892" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstCADBEA_BE8C_41f0_8070_7102E73439C9" name="epo-cat:hasExternalSpecification" association="EAID_F7CADBEA_BE8C_41f0_8070_7102E73439C9">
 							<type xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000149__BE8C_41f0_8070_7102E73439C9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000150__BE8C_41f0_8070_7102E73439C9" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000159__BE8C_41f0_8070_7102E73439C9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000160__BE8C_41f0_8070_7102E73439C9" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_src8B62CF_836E_494c_A0AF_73F7FB5C8991" name="dct:replaces" association="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991">
 							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000151__836E_494c_A0AF_73F7FB5C8991" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000152__836E_494c_A0AF_73F7FB5C8991" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000161__836E_494c_A0AF_73F7FB5C8991" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000162__836E_494c_A0AF_73F7FB5C8991" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_056C94FE_E7B7_428e_B87E_F0795660EA2B" supplier="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" client="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
@@ -803,6 +870,13 @@
 							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_52CB7369_B0C2_4acc_A513_76150076F808">
+						<memberEnd xmi:idref="EAID_dstCB7369_B0C2_4acc_A513_76150076F808"/>
+						<memberEnd xmi:idref="EAID_srcCB7369_B0C2_4acc_A513_76150076F808"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCB7369_B0C2_4acc_A513_76150076F808" association="EAID_52CB7369_B0C2_4acc_A513_76150076F808">
+							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_574DB5D8_4929_4670_9014_608B3C5534ED">
 						<memberEnd xmi:idref="EAID_dst4DB5D8_4929_4670_9014_608B3C5534ED"/>
 						<memberEnd xmi:idref="EAID_src4DB5D8_4929_4670_9014_608B3C5534ED"/>
@@ -867,7 +941,7 @@
 						</ownedEnd>
 					</packagedElement>
 				</packagedElement>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_27F0F3F5_D4BC_4df2_A79B_26C72684E33F" name="controlled vocabularies">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_803AC905_1BBF_478d_A943_5EE4B99F6A19" name="controlled vocabularies">
 					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_C3684D7C_E07D_415a_B935_B52376928738" name="at-voc-new:document-type"/>
 					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_E89B28AF_BD5D_429d_9A62_EC5FCB2442FF" name="at-voc-new:price-type"/>
 					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A" name="at-voc-new:tax-category"/>
@@ -881,34 +955,34 @@
 				</packagedElement>
 			</packagedElement>
 			<packagedElement xmi:type="uml:Package" xmi:id="EAPK_86DA858F_073B_49ae_8133_6704576FF802" name="catalogue response">
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_434C478A_1DD4_4dbc_BC16_6DA0B0A6546B" name="diagrams"/>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_8B4601F4_9768_420f_8279_29494481FDD5" name="classes">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_227C7135_4084_44ed_B4B1_94E1D2E98D9B" name="diagrams"/>
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_DD84FBD9_2B0D_41ac_A97A_C15CEBDF855D" name="classes">
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_02622AF6_D00A_4f62_ACF8_3ACA0F78EFF3" name="epo-cat:CatalogueResponse">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst7E8888_F950_475b_A9CB_0B9307819295" name="epo-cat:specifiesCatalogueResponseInformation" association="EAID_107E8888_F950_475b_A9CB_0B9307819295">
 							<type xmi:idref="EAID_84590049_CB31_46ad_9E29_90E679D32C10"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000153__F950_475b_A9CB_0B9307819295" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000154__F950_475b_A9CB_0B9307819295" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000163__F950_475b_A9CB_0B9307819295" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000164__F950_475b_A9CB_0B9307819295" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_358B44F1_E8E4_43b8_AEE5_A1928786F529" general="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstCD5D1F_2A27_44c8_8F41_DF78D99C15DF" name="epo-cat:comprisesCatalogueResponseLine" association="EAID_4ECD5D1F_2A27_44c8_8F41_DF78D99C15DF">
 							<type xmi:idref="EAID_025C0172_297F_4458_9268_2B10478B6736"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000155__2A27_44c8_8F41_DF78D99C15DF" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000156__2A27_44c8_8F41_DF78D99C15DF" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000165__2A27_44c8_8F41_DF78D99C15DF" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000166__2A27_44c8_8F41_DF78D99C15DF" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst2AB97A_8B58_468a_833B_9D1C11E8A67F" name="epo-cat:refersToCatalogue" association="EAID_592AB97A_8B58_468a_833B_9D1C11E8A67F">
 							<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000157__8B58_468a_833B_9D1C11E8A67F" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000158__8B58_468a_833B_9D1C11E8A67F" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000167__8B58_468a_833B_9D1C11E8A67F" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000168__8B58_468a_833B_9D1C11E8A67F" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF3186C_BD8A_4c6c_9C14_636A381B9AD8" name="epo:specifiesCatalogueProvider" association="EAID_ADF3186C_BD8A_4c6c_9C14_636A381B9AD8">
 							<type xmi:idref="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000159__BD8A_4c6c_9C14_636A381B9AD8" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000160__BD8A_4c6c_9C14_636A381B9AD8" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000169__BD8A_4c6c_9C14_636A381B9AD8" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000170__BD8A_4c6c_9C14_636A381B9AD8" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF0294A_EFD5_4d01_B27F_F07D3C5A6ECD" name="epo:specifiesCatalogueReceiver" association="EAID_CFF0294A_EFD5_4d01_B27F_F07D3C5A6ECD">
 							<type xmi:idref="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000161__EFD5_4d01_B27F_F07D3C5A6ECD" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000162__EFD5_4d01_B27F_F07D3C5A6ECD" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000171__EFD5_4d01_B27F_F07D3C5A6ECD" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000172__EFD5_4d01_B27F_F07D3C5A6ECD" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_107E8888_F950_475b_A9CB_0B9307819295">
@@ -943,8 +1017,8 @@
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_868D23F3_0FC6_4127_BE78_8022E13802B9" general="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstB846B6_9B3B_4878_8E5A_43CFCCC036F0" name="epo-cat:isSpecificToCatalogueResponseLine" association="EAID_D3B846B6_9B3B_4878_8E5A_43CFCCC036F0">
 							<type xmi:idref="EAID_025C0172_297F_4458_9268_2B10478B6736"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000163__9B3B_4878_8E5A_43CFCCC036F0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000164__9B3B_4878_8E5A_43CFCCC036F0" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000173__9B3B_4878_8E5A_43CFCCC036F0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000174__9B3B_4878_8E5A_43CFCCC036F0" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D3B846B6_9B3B_4878_8E5A_43CFCCC036F0">
@@ -958,13 +1032,13 @@
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_025C0172_297F_4458_9268_2B10478B6736" name="epo-cat:CatalogueResponseLine">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst549564_CE07_4367_8550_00BC16191558" name="epo:hasUUID" association="EAID_12549564_CE07_4367_8550_00BC16191558">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000165__CE07_4367_8550_00BC16191558" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000166__CE07_4367_8550_00BC16191558" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000175__CE07_4367_8550_00BC16191558" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000176__CE07_4367_8550_00BC16191558" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst69006F_8B8D_4bf5_B941_EEAD719266A8" name="epo-cat:refersToCatalogueLine" association="EAID_6969006F_8B8D_4bf5_B941_EEAD719266A8">
 							<type xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000167__8B8D_4bf5_B941_EEAD719266A8" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000168__8B8D_4bf5_B941_EEAD719266A8" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000177__8B8D_4bf5_B941_EEAD719266A8" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000178__8B8D_4bf5_B941_EEAD719266A8" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_12549564_CE07_4367_8550_00BC16191558">
@@ -986,14 +1060,14 @@
 				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_2D6DF6F1_E0C7_46d0_BECB_8C5DF8DE3A0B" name="xsd:integer"/>
 			</packagedElement>
 		</packagedElement>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_F9772628_760B_4fc2_93CE_AA8849709931" isFrame="false" modelElement="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_F9772628_760B_4fc2_93CE_AA8849709931" isFrame="false" modelElement="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F9772628_760B_4fc2_9EFD_D1D4C65E36F5" modelElement="EAID_09632AAB_48D4_4308_9EFD_D1D4C65E36F5">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_760B_4fc2_9EFD_D1D4C65E36F5" text="epo-cat:ItemModel"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_760B_4fc2_9EFD_D1D4C65E36F5" x="1681" y="823" width="130" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F9772628_760B_4fc2_BF7A_BF9E5E76BDCC" modelElement="EAID_0B2ADA0F_0895_4cee_BF7A_BF9E5E76BDCC">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_760B_4fc2_BF7A_BF9E5E76BDCC" text="epo-cat:ProductSpecification"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_760B_4fc2_BF7A_BF9E5E76BDCC" x="1822" y="89" width="155" height="40"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_760B_4fc2_BF7A_BF9E5E76BDCC" x="1822" y="78" width="155" height="40"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F9772628_760B_4fc2_847A_7E8C5EEC0432" modelElement="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_760B_4fc2_847A_7E8C5EEC0432" text="epo:Period"/>
@@ -1031,6 +1105,9 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_760B_4fc2_8372_75A07B6AB066" text="epo:Contract"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_760B_4fc2_8372_75A07B6AB066" x="869" y="96" width="219" height="111"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_F9772628_760B_4fc2_A897_66E923299404" modelElement="EAID_7C2498F5_4923_4199_A897_66E923299404">
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_760B_4fc2_A897_66E923299404" x="2371" y="703" width="115" height="100"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F9772628_760B_4fc2_AE97_5140BE6021A2" modelElement="EAID_823E0E4B_F4B6_4255_AE97_5140BE6021A2">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_760B_4fc2_AE97_5140BE6021A2" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_760B_4fc2_AE97_5140BE6021A2" text="at-voc-new:delivery-item-type"/>
@@ -1064,6 +1141,9 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_760B_4fc2_849F_409BCB726909" text="at-voc-new:dangerous-goods-list"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_760B_4fc2_849F_409BCB726909" x="2188" y="535" width="90" height="60"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_F9772628_760B_4fc2_A6FD_F7B270D8DE17" modelElement="EAID_BCDEE6F5_A44E_454a_A6FD_F7B270D8DE17">
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_760B_4fc2_A6FD_F7B270D8DE17" x="2337" y="530" width="185" height="70"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F9772628_760B_4fc2_ABBB_CBDD98065B7F" modelElement="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_760B_4fc2_ABBB_CBDD98065B7F" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_760B_4fc2_ABBB_CBDD98065B7F" text="at-voc:country"/>
@@ -1102,20 +1182,44 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_760B_4fc2_B935_B52376928738" text="at-voc-new:document-type"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_760B_4fc2_B935_B52376928738" x="1292" y="258" width="90" height="60"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_F9772628_760B_4fc2_98CF_2F9920D6FA83" modelElement="EAID_05BF87EB_40D1_4fbc_98CF_2F9920D6FA83">
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_760B_4fc2_98CF_2F9920D6FA83" x="1346" y="357" width="115" height="55"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F9772628_760B_4fc2_83AB_E27B06BA632B" modelElement="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_760B_4fc2_83AB_E27B06BA632B" text="epo-cat:PostAwardDocument"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_760B_4fc2_83AB_E27B06BA632B" x="1044" y="267" width="129" height="41"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_807B_B6FA3BB29BF5" source="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" target="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62" modelElement="EAID_52428053_29BF_4efe_807B_B6FA3BB29BF5">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_760B_4fc2_807B_B6FA3BB29BF5" text="+epo:specifiesCatalogueReceiver" modelElement="EAID_dst428053_29BF_4efe_807B_B6FA3BB29BF5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_760B_4fc2_807B_B6FA3BB29BF5" x="632" y="505" width="132" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_84E5_92EF1E2753B3" source="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" target="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6" modelElement="EAID_9BD8157E_3EB6_44da_84E5_92EF1E2753B3">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_760B_4fc2_84E5_92EF1E2753B3" text="+epo:specifiesCatalogueProvider" modelElement="EAID_dstD8157E_3EB6_44da_84E5_92EF1E2753B3">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_760B_4fc2_84E5_92EF1E2753B3" x="630" y="410" width="131" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_760B_4fc2_807B_B6FA3BB29BF5" text="0..1" modelElement="EAID_dst428053_29BF_4efe_807B_B6FA3BB29BF5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_760B_4fc2_807B_B6FA3BB29BF5" x="628" y="530" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_760B_4fc2_84E5_92EF1E2753B3" text="0..1" modelElement="EAID_dstD8157E_3EB6_44da_84E5_92EF1E2753B3">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_760B_4fc2_84E5_92EF1E2753B3" x="631" y="435" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_807B_B6FA3BB29BF5" x="953" y="487"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_807B_B6FA3BB29BF5" x="953" y="525"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_760B_4fc2_807B_B6FA3BB29BF5" x="625" y="525"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_84E5_92EF1E2753B3" x="936" y="430"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_84E5_92EF1E2753B3" x="628" y="430"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_84F1_8A3969FE662E" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_15464872_BFB6_40bb_84F1_8A3969FE662E">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_760B_4fc2_84F1_8A3969FE662E" text="+epo:hasItemStandardID" modelElement="EAID_dst464872_BFB6_40bb_84F1_8A3969FE662E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_760B_4fc2_84F1_8A3969FE662E" x="1752" y="287" width="102" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_760B_4fc2_84F1_8A3969FE662E" text="0..*" modelElement="EAID_dst464872_BFB6_40bb_84F1_8A3969FE662E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_760B_4fc2_84F1_8A3969FE662E" x="1748" y="309" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_84F1_8A3969FE662E" x="1847" y="449"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_84F1_8A3969FE662E" x="1847" y="305"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_760B_4fc2_84F1_8A3969FE662E" x="1745" y="305"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_A49B_8791C8D7CBEA" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_760B_4fc2_A49B_8791C8D7CBEA" text="+epo:hasSellerItemID" modelElement="EAID_dst6B650B_17CC_499e_A49B_8791C8D7CBEA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_760B_4fc2_A49B_8791C8D7CBEA" x="1524" y="389" width="88" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_760B_4fc2_A49B_8791C8D7CBEA" text="0..1" modelElement="EAID_dst6B650B_17CC_499e_A49B_8791C8D7CBEA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_760B_4fc2_A49B_8791C8D7CBEA" x="1565" y="362" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_A49B_8791C8D7CBEA" x="1750" y="546"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_A49B_8791C8D7CBEA" x="1553" y="546"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_760B_4fc2_A49B_8791C8D7CBEA" x="1553" y="357"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_873A_F9E88411186D" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_E507D198_1A41_4b43_873A_F9E88411186D">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_760B_4fc2_873A_F9E88411186D" text="+epo:hasManufacturerItemID" modelElement="EAID_dst07D198_1A41_4b43_873A_F9E88411186D">
@@ -1189,42 +1293,35 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_8D27_E3F34E3AF36B" x="1003" y="625"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_760B_4fc2_8D27_E3F34E3AF36B" x="883" y="625"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_9536_602D5F0E8782" source="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" target="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" modelElement="EAID_9DBEA51D_27BB_47b3_9536_602D5F0E8782">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_760B_4fc2_9536_602D5F0E8782" text="+epo-cat:comprisesCatalogueLine" modelElement="EAID_dstBEA51D_27BB_47b3_9536_602D5F0E8782">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_760B_4fc2_9536_602D5F0E8782" x="1143" y="572" width="97" height="27"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_760B_4fc2_9536_602D5F0E8782" text="1..*" modelElement="EAID_dstBEA51D_27BB_47b3_9536_602D5F0E8782">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_760B_4fc2_9536_602D5F0E8782" x="1225" y="616" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_9536_602D5F0E8782" x="1115" y="487"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_9536_602D5F0E8782" x="1115" y="607"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_760B_4fc2_9536_602D5F0E8782" x="1244" y="607"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_9723_9C69BB0EB7B4" source="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_618070AC_783D_48ae_9723_9C69BB0EB7B4">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_9723_9C69BB0EB7B4" x="1146" y="267"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_9723_9C69BB0EB7B4" x="1146" y="212"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_760B_4fc2_9723_9C69BB0EB7B4" x="1220" y="212"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_84E5_92EF1E2753B3" source="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" target="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6" modelElement="EAID_9BD8157E_3EB6_44da_84E5_92EF1E2753B3">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_760B_4fc2_84E5_92EF1E2753B3" text="+epo:specifiesCatalogueProvider" modelElement="EAID_dstD8157E_3EB6_44da_84E5_92EF1E2753B3">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_760B_4fc2_84E5_92EF1E2753B3" x="630" y="410" width="131" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_A279_498213B45F8E" source="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" target="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" modelElement="EAID_BC94D054_08DB_4bb5_A279_498213B45F8E">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_760B_4fc2_A279_498213B45F8E" text="+epo-cat:isSubordinatedToContract" modelElement="EAID_dst94D054_08DB_4bb5_A279_498213B45F8E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_760B_4fc2_A279_498213B45F8E" x="909" y="239" width="141" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_760B_4fc2_84E5_92EF1E2753B3" text="0..1" modelElement="EAID_dstD8157E_3EB6_44da_84E5_92EF1E2753B3">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_760B_4fc2_84E5_92EF1E2753B3" x="631" y="435" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_760B_4fc2_A279_498213B45F8E" text="0..1" modelElement="EAID_dst94D054_08DB_4bb5_A279_498213B45F8E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_760B_4fc2_A279_498213B45F8E" x="997" y="212" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_84E5_92EF1E2753B3" x="936" y="430"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_84E5_92EF1E2753B3" x="628" y="430"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_A279_498213B45F8E" x="985" y="374"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_A279_498213B45F8E" x="985" y="207"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_A715_C0AF0EF80B65" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_760B_4fc2_A715_C0AF0EF80B65" text="+epo-cat:hasNetQuantity" modelElement="EAID_dst9E2AC7_4D59_4119_A715_C0AF0EF80B65">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_760B_4fc2_A715_C0AF0EF80B65" x="1586" y="745" width="64" height="27"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_A89B_4A966BB6C9D3" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_823E0E4B_F4B6_4255_AE97_5140BE6021A2" modelElement="EAID_F5E9960A_D7AE_4887_A89B_4A966BB6C9D3">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_A89B_4A966BB6C9D3" x="1996" y="633"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_A89B_4A966BB6C9D3" x="2189" y="737"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_807B_B6FA3BB29BF5" source="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" target="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62" modelElement="EAID_52428053_29BF_4efe_807B_B6FA3BB29BF5">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_760B_4fc2_807B_B6FA3BB29BF5" text="+epo:specifiesCatalogueReceiver" modelElement="EAID_dst428053_29BF_4efe_807B_B6FA3BB29BF5">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_760B_4fc2_807B_B6FA3BB29BF5" x="632" y="505" width="132" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_760B_4fc2_A715_C0AF0EF80B65" text="0..1" modelElement="EAID_dst9E2AC7_4D59_4119_A715_C0AF0EF80B65">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_760B_4fc2_A715_C0AF0EF80B65" x="1613" y="785" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_760B_4fc2_807B_B6FA3BB29BF5" text="0..1" modelElement="EAID_dst428053_29BF_4efe_807B_B6FA3BB29BF5">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_760B_4fc2_807B_B6FA3BB29BF5" x="628" y="530" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_A715_C0AF0EF80B65" x="1750" y="634"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_A715_C0AF0EF80B65" x="1605" y="634"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_760B_4fc2_A715_C0AF0EF80B65" x="1605" y="803"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_807B_B6FA3BB29BF5" x="953" y="487"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_807B_B6FA3BB29BF5" x="953" y="525"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_760B_4fc2_807B_B6FA3BB29BF5" x="625" y="525"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_B308_C0F08C743DCF" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_97C17D51_4DF6_4979_B308_C0F08C743DCF">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_B308_C0F08C743DCF" x="1088" y="151"/>
@@ -1284,19 +1381,20 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_B8A6_42826FC39635" x="1173" y="287"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_B8A6_42826FC39635" x="1292" y="287"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_A279_498213B45F8E" source="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" target="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" modelElement="EAID_BC94D054_08DB_4bb5_A279_498213B45F8E">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_760B_4fc2_A279_498213B45F8E" text="+epo-cat:isSubordinatedToContract" modelElement="EAID_dst94D054_08DB_4bb5_A279_498213B45F8E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_760B_4fc2_A279_498213B45F8E" x="909" y="239" width="141" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_9536_602D5F0E8782" source="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" target="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" modelElement="EAID_9DBEA51D_27BB_47b3_9536_602D5F0E8782">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_760B_4fc2_9536_602D5F0E8782" text="+epo-cat:comprisesCatalogueLine" modelElement="EAID_dstBEA51D_27BB_47b3_9536_602D5F0E8782">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_760B_4fc2_9536_602D5F0E8782" x="1143" y="572" width="97" height="27"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_760B_4fc2_A279_498213B45F8E" text="0..1" modelElement="EAID_dst94D054_08DB_4bb5_A279_498213B45F8E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_760B_4fc2_A279_498213B45F8E" x="997" y="212" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_760B_4fc2_9536_602D5F0E8782" text="1..*" modelElement="EAID_dstBEA51D_27BB_47b3_9536_602D5F0E8782">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_760B_4fc2_9536_602D5F0E8782" x="1225" y="616" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_A279_498213B45F8E" x="985" y="374"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_A279_498213B45F8E" x="985" y="207"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_9536_602D5F0E8782" x="1115" y="487"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_9536_602D5F0E8782" x="1115" y="607"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_760B_4fc2_9536_602D5F0E8782" x="1244" y="607"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_A7EC_23ACD7626ADE" source="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62" target="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" modelElement="EAID_DE55F8F3_DEA7_4350_A7EC_23ACD7626ADE">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_A7EC_23ACD7626ADE" x="580" y="553"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_A7EC_23ACD7626ADE" x="580" y="587"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_8105_4D93D49DFA8A" source="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_A88E2729_62D9_493c_8105_4D93D49DFA8A">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_8105_4D93D49DFA8A" x="699" y="335"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_8105_4D93D49DFA8A" x="622" y="335"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_B4C0_912C9C11EC4E" source="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_D2C94CC0_A14F_4c9c_B4C0_912C9C11EC4E">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_B4C0_912C9C11EC4E" x="625" y="909"/>
@@ -1318,11 +1416,19 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_760B_4fc2_B0B4_339ED74111CC" x="1669" y="217"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_B035_AE5068C30238" source="EAID_0B2ADA0F_0895_4cee_BF7A_BF9E5E76BDCC" target="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" modelElement="EAID_7EFC644F_3191_4d57_B035_AE5068C30238">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_B035_AE5068C30238" x="1890" y="89"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_B035_AE5068C30238" x="1890" y="78"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_B035_AE5068C30238" x="1890" y="21"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_760B_4fc2_B035_AE5068C30238" x="1109" y="21"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_760B_4fc2_B035_AE5068C30238" x="1109" y="267"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_8D6E_D6623AF6D2FF" source="EAID_05BF87EB_40D1_4fbc_98CF_2F9920D6FA83" target="EAID_AEFD9686_5D49_4105_AEBB_8004EBB7007F" modelElement="EAID_6E211308_0015_4c99_8D6E_D6623AF6D2FF">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_8D6E_D6623AF6D2FF" x="1422" y="412"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_8D6E_D6623AF6D2FF" x="1448" y="449"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_A8FB_A636173FB8C1" source="EAID_05BF87EB_40D1_4fbc_98CF_2F9920D6FA83" target="EAID_ABDB4F83_303C_49aa_86E4_C7A6A9388FE0" modelElement="EAID_3AF5D51C_E1E0_4756_A8FB_A636173FB8C1">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_A8FB_A636173FB8C1" x="1381" y="412"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_A8FB_A636173FB8C1" x="1353" y="449"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_B72E_BC6C99FF3009" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_760B_4fc2_B72E_BC6C99FF3009" text="+epo:hasElectronicDigest 0..*" modelElement="EAID_dstE6AD20_DD67_4f31_B72E_BC6C99FF3009">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_760B_4fc2_B72E_BC6C99FF3009" x="1368" y="29" width="119" height="14"/>
@@ -1402,42 +1508,32 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_9ACB_A1015C643C97" x="2061" y="267"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_9ACB_A1015C643C97" x="1745" y="267"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_BB08_B80EA400868A" source="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E" target="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" modelElement="EAID_65A0DAC3_2E18_40c1_BB08_B80EA400868A">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_760B_4fc2_BB08_B80EA400868A" text="+epo-cat:isProductionOf" modelElement="EAID_dstA0DAC3_2E18_40c1_BB08_B80EA400868A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_760B_4fc2_BB08_B80EA400868A" x="1915" y="414" width="97" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_A715_C0AF0EF80B65" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_760B_4fc2_A715_C0AF0EF80B65" text="+epo-cat:hasNetQuantity" modelElement="EAID_dst9E2AC7_4D59_4119_A715_C0AF0EF80B65">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_760B_4fc2_A715_C0AF0EF80B65" x="1586" y="745" width="64" height="27"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_760B_4fc2_BB08_B80EA400868A" text="1" modelElement="EAID_dstA0DAC3_2E18_40c1_BB08_B80EA400868A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_760B_4fc2_BB08_B80EA400868A" x="1966" y="435" width="6" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_760B_4fc2_A715_C0AF0EF80B65" text="0..1" modelElement="EAID_dst9E2AC7_4D59_4119_A715_C0AF0EF80B65">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_760B_4fc2_A715_C0AF0EF80B65" x="1613" y="785" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_BB08_B80EA400868A" x="2061" y="290"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_BB08_B80EA400868A" x="1957" y="290"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_760B_4fc2_BB08_B80EA400868A" x="1957" y="449"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_A715_C0AF0EF80B65" x="1750" y="634"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_A715_C0AF0EF80B65" x="1605" y="634"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_760B_4fc2_A715_C0AF0EF80B65" x="1605" y="803"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_A49B_8791C8D7CBEA" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_760B_4fc2_A49B_8791C8D7CBEA" text="+epo:hasSellerItemID" modelElement="EAID_dst6B650B_17CC_499e_A49B_8791C8D7CBEA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_760B_4fc2_A49B_8791C8D7CBEA" x="1524" y="389" width="88" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_760B_4fc2_A49B_8791C8D7CBEA" text="0..1" modelElement="EAID_dst6B650B_17CC_499e_A49B_8791C8D7CBEA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_760B_4fc2_A49B_8791C8D7CBEA" x="1565" y="362" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_A49B_8791C8D7CBEA" x="1750" y="546"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_A49B_8791C8D7CBEA" x="1553" y="546"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_760B_4fc2_A49B_8791C8D7CBEA" x="1553" y="357"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_9420_41F9921B71EF" source="EAID_BCDEE6F5_A44E_454a_A6FD_F7B270D8DE17" target="EAID_B0937CD2_46D2_48d7_849F_409BCB726909" modelElement="EAID_57270DB3_8BAB_4bd4_9420_41F9921B71EF">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_9420_41F9921B71EF" x="2337" y="565"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_9420_41F9921B71EF" x="2278" y="565"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_B87E_F0795660EA2B" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" modelElement="EAID_056C94FE_E7B7_428e_B87E_F0795660EA2B">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_B87E_F0795660EA2B" x="1996" y="492"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_B87E_F0795660EA2B" x="2165" y="492"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_9C21_84470056CF01" source="EAID_96B284C4_E759_4bad_9655_04521F703750" target="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" modelElement="EAID_BD5C98D5_43D4_41be_9C21_84470056CF01">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_9C21_84470056CF01" x="664" y="622"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_9C21_84470056CF01" x="625" y="622"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_84F1_8A3969FE662E" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_15464872_BFB6_40bb_84F1_8A3969FE662E">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_760B_4fc2_84F1_8A3969FE662E" text="+epo:hasItemStandardID" modelElement="EAID_dst464872_BFB6_40bb_84F1_8A3969FE662E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_760B_4fc2_84F1_8A3969FE662E" x="1752" y="287" width="102" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_760B_4fc2_84F1_8A3969FE662E" text="0..*" modelElement="EAID_dst464872_BFB6_40bb_84F1_8A3969FE662E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_760B_4fc2_84F1_8A3969FE662E" x="1748" y="309" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_84F1_8A3969FE662E" x="1847" y="449"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_84F1_8A3969FE662E" x="1847" y="305"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_760B_4fc2_84F1_8A3969FE662E" x="1745" y="305"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_A7EC_23ACD7626ADE" source="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62" target="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" modelElement="EAID_DE55F8F3_DEA7_4350_A7EC_23ACD7626ADE">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_A7EC_23ACD7626ADE" x="580" y="553"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_A7EC_23ACD7626ADE" x="580" y="587"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_B51A_14A66F3D627C" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_BBC722BA_3236_4fcb_B51A_14A66F3D627C">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_760B_4fc2_B51A_14A66F3D627C" text="+epo:hasSerialID" modelElement="EAID_dstC722BA_3236_4fcb_B51A_14A66F3D627C">
@@ -1452,14 +1548,24 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_8070_7102E73439C9" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_F7CADBEA_BE8C_41f0_8070_7102E73439C9">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_760B_4fc2_8070_7102E73439C9" text="+epo-cat:hasExternalSpecification" modelElement="EAID_dstCADBEA_BE8C_41f0_8070_7102E73439C9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_760B_4fc2_8070_7102E73439C9" x="1418" y="150" width="135" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_760B_4fc2_8070_7102E73439C9" x="1418" y="141" width="135" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_760B_4fc2_8070_7102E73439C9" text="0..*" modelElement="EAID_dstCADBEA_BE8C_41f0_8070_7102E73439C9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_760B_4fc2_8070_7102E73439C9" x="1418" y="173" width="100" height="10"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_760B_4fc2_8070_7102E73439C9" x="1418" y="164" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_8070_7102E73439C9" x="1877" y="449"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_8070_7102E73439C9" x="1877" y="168"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_760B_4fc2_8070_7102E73439C9" x="1415" y="168"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_8070_7102E73439C9" x="1877" y="159"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_760B_4fc2_8070_7102E73439C9" x="1415" y="159"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_A513_76150076F808" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_52CB7369_B0C2_4acc_A513_76150076F808">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_760B_4fc2_A513_76150076F808" text="+epo-inv:hasItemClassificationIdentifier" modelElement="EAID_dstCB7369_B0C2_4acc_A513_76150076F808">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_760B_4fc2_A513_76150076F808" x="1530" y="362" width="159" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_760B_4fc2_A513_76150076F808" text="0..*" modelElement="EAID_dstCB7369_B0C2_4acc_A513_76150076F808">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_760B_4fc2_A513_76150076F808" x="1708" y="362" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_A513_76150076F808" x="1774" y="449"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_A513_76150076F808" x="1696" y="357"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_A201_D8391B5C67DF" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_ECEFDC69_19B4_47d7_A201_D8391B5C67DF">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_760B_4fc2_A201_D8391B5C67DF" text="+epo:hasBuyerItemID" modelElement="EAID_dstEFDC69_19B4_47d7_A201_D8391B5C67DF">
@@ -1489,28 +1595,27 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_A5CA_93F12F0E5824" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_0B2ADA0F_0895_4cee_BF7A_BF9E5E76BDCC" modelElement="EAID_455C76C8_B834_46d5_A5CA_93F12F0E5824">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_760B_4fc2_A5CA_93F12F0E5824" text="+epo-cat:hasSpecification" modelElement="EAID_dst5C76C8_B834_46d5_A5CA_93F12F0E5824">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_760B_4fc2_A5CA_93F12F0E5824" x="1861" y="154" width="103" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_760B_4fc2_A5CA_93F12F0E5824" x="1863" y="138" width="103" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_760B_4fc2_A5CA_93F12F0E5824" text="0..*" modelElement="EAID_dst5C76C8_B834_46d5_A5CA_93F12F0E5824">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_760B_4fc2_A5CA_93F12F0E5824" x="1923" y="134" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_760B_4fc2_A5CA_93F12F0E5824" x="1923" y="123" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_A5CA_93F12F0E5824" x="1911" y="449"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_A5CA_93F12F0E5824" x="1911" y="129"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_A89B_4A966BB6C9D3" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_823E0E4B_F4B6_4255_AE97_5140BE6021A2" modelElement="EAID_F5E9960A_D7AE_4887_A89B_4A966BB6C9D3">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_A89B_4A966BB6C9D3" x="1996" y="633"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_A89B_4A966BB6C9D3" x="2189" y="737"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_A5CA_93F12F0E5824" x="1911" y="118"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_B87E_F0795660EA2B" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" modelElement="EAID_056C94FE_E7B7_428e_B87E_F0795660EA2B">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_B87E_F0795660EA2B" x="1996" y="492"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_B87E_F0795660EA2B" x="2165" y="492"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_8105_4D93D49DFA8A" source="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_A88E2729_62D9_493c_8105_4D93D49DFA8A">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_8105_4D93D49DFA8A" x="699" y="335"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_8105_4D93D49DFA8A" x="622" y="335"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F9772628_760B_4fc2_BB08_B80EA400868A" source="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E" target="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" modelElement="EAID_65A0DAC3_2E18_40c1_BB08_B80EA400868A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_760B_4fc2_BB08_B80EA400868A" text="+epo-cat:isProductionOf" modelElement="EAID_dstA0DAC3_2E18_40c1_BB08_B80EA400868A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_760B_4fc2_BB08_B80EA400868A" x="1915" y="414" width="97" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_760B_4fc2_BB08_B80EA400868A" text="1" modelElement="EAID_dstA0DAC3_2E18_40c1_BB08_B80EA400868A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_760B_4fc2_BB08_B80EA400868A" x="1966" y="435" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_BB08_B80EA400868A" x="2061" y="290"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_BB08_B80EA400868A" x="1957" y="290"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_760B_4fc2_BB08_B80EA400868A" x="1957" y="449"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_DE493AFE_2122_4b99_950A_737EC632B3C5" isFrame="false" modelElement="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_DE493AFE_2122_4b99_950A_737EC632B3C5" isFrame="false" modelElement="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_DE493AFE_2122_4b99_847A_7E8C5EEC0432" modelElement="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2122_4b99_847A_7E8C5EEC0432" text="epo:Period"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2122_4b99_847A_7E8C5EEC0432" x="300" y="377" width="176" height="85"/>
@@ -1553,72 +1658,67 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2122_4b99_AFA8_D5DCED9D61C7" text="dct:Location"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2122_4b99_AFA8_D5DCED9D61C7" x="774" y="68" width="200" height="70"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_B6AB_525BE36FDC06" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_E89B28AF_BD5D_429d_9A62_EC5FCB2442FF" modelElement="EAID_A4EABD09_62ED_4add_B6AB_525BE36FDC06">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_B6AB_525BE36FDC06" x="670" y="306"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_B6AB_525BE36FDC06" x="670" y="395"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2122_4b99_B6AB_525BE36FDC06" x="774" y="395"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_8481_D40EEC904171" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_9EA3B8C3_695C_4b42_8481_D40EEC904171">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2122_4b99_8481_D40EEC904171" text="+epo-cat:hasBaseQuantity" modelElement="EAID_dstA3B8C3_695C_4b42_8481_D40EEC904171">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2122_4b99_8481_D40EEC904171" x="460" y="146" width="107" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_87EA_C0E83DC5C9AF" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_6D569FED_815F_45f4_87EA_C0E83DC5C9AF">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2122_4b99_87EA_C0E83DC5C9AF" text="+epo-cat:hasPriceValidity" modelElement="EAID_dst569FED_815F_45f4_87EA_C0E83DC5C9AF">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2122_4b99_87EA_C0E83DC5C9AF" x="488" y="413" width="102" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2122_4b99_8481_D40EEC904171" text="0..1" modelElement="EAID_dstA3B8C3_695C_4b42_8481_D40EEC904171">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2122_4b99_8481_D40EEC904171" x="532" y="126" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2122_4b99_87EA_C0E83DC5C9AF" text="1" modelElement="EAID_dst569FED_815F_45f4_87EA_C0E83DC5C9AF">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2122_4b99_87EA_C0E83DC5C9AF" x="479" y="443" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_8481_D40EEC904171" x="520" y="242"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_8481_D40EEC904171" x="520" y="121"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_87EA_C0E83DC5C9AF" x="577" y="306"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_87EA_C0E83DC5C9AF" x="577" y="438"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2122_4b99_87EA_C0E83DC5C9AF" x="476" y="438"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_984C_17FF6E47F8F9" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" modelElement="EAID_45B983F5_7502_49f2_984C_17FF6E47F8F9">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2122_4b99_984C_17FF6E47F8F9" text="+epo-cat:hasExpectedDeliveryTime" modelElement="EAID_dstB983F5_7502_49f2_984C_17FF6E47F8F9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2122_4b99_984C_17FF6E47F8F9" x="610" y="445" width="142" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2122_4b99_984C_17FF6E47F8F9" text="0..1" modelElement="EAID_dstB983F5_7502_49f2_984C_17FF6E47F8F9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2122_4b99_984C_17FF6E47F8F9" x="739" y="473" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_984C_17FF6E47F8F9" x="637" y="306"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_984C_17FF6E47F8F9" x="637" y="468"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2122_4b99_984C_17FF6E47F8F9" x="758" y="468"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_AA82_ECF06C845021" source="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C" target="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" modelElement="EAID_FE0B0FB5_E0B6_41e2_AA82_ECF06C845021">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_AA82_ECF06C845021" x="841" y="539"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_AA82_ECF06C845021" x="841" y="502"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_A5F1_B592E89F9030" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_1F622DE3_2DEE_491f_A5F1_B592E89F9030">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2122_4b99_A5F1_B592E89F9030" text="+epo-cat:hasQuantityThreshold" modelElement="EAID_dst622DE3_2DEE_491f_A5F1_B592E89F9030">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2122_4b99_A5F1_B592E89F9030" x="526" y="163" width="127" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_B866_FABECBC1DB55" source="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_8FF88923_D9FB_4937_B866_FABECBC1DB55">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2122_4b99_B866_FABECBC1DB55" text="+epo-cat:hasCatalogueLineValidity" modelElement="EAID_dstF88923_D9FB_4937_B866_FABECBC1DB55">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2122_4b99_B866_FABECBC1DB55" x="134" y="398" width="139" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2122_4b99_A5F1_B592E89F9030" text="0..1" modelElement="EAID_dst622DE3_2DEE_491f_A5F1_B592E89F9030">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2122_4b99_A5F1_B592E89F9030" x="597" y="126" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2122_4b99_B866_FABECBC1DB55" text="0..1" modelElement="EAID_dstF88923_D9FB_4937_B866_FABECBC1DB55">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2122_4b99_B866_FABECBC1DB55" x="281" y="429" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_A5F1_B592E89F9030" x="585" y="242"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_A5F1_B592E89F9030" x="585" y="121"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_B866_FABECBC1DB55" x="202" y="336"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_B866_FABECBC1DB55" x="202" y="424"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2122_4b99_B866_FABECBC1DB55" x="300" y="424"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_BD97_28BD0C9F2F49" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_A0FABF7A_1814_4dd4_BD97_28BD0C9F2F49">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2122_4b99_BD97_28BD0C9F2F49" text="+epo-cat:hasOrderabableUnitFactorRate" modelElement="EAID_dstFABF7A_1814_4dd4_BD97_28BD0C9F2F49">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2122_4b99_BD97_28BD0C9F2F49" x="602" y="142" width="162" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_A736_268C91FF8AF2" source="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_F475E438_48A3_41f5_A736_268C91FF8AF2">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2122_4b99_A736_268C91FF8AF2" text="+epo-cat:hasMaximumOrderQuantity" modelElement="EAID_dst75E438_48A3_41f5_A736_268C91FF8AF2">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2122_4b99_A736_268C91FF8AF2" x="274" y="62" width="152" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2122_4b99_BD97_28BD0C9F2F49" text="0..1" modelElement="EAID_dstFABF7A_1814_4dd4_BD97_28BD0C9F2F49">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2122_4b99_BD97_28BD0C9F2F49" x="666" y="126" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2122_4b99_A736_268C91FF8AF2" text="0..1" modelElement="EAID_dst75E438_48A3_41f5_A736_268C91FF8AF2">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2122_4b99_A736_268C91FF8AF2" x="422" y="84" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_BD97_28BD0C9F2F49" x="654" y="242"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_BD97_28BD0C9F2F49" x="654" y="121"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_A736_268C91FF8AF2" x="128" y="212"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_A736_268C91FF8AF2" x="128" y="79"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2122_4b99_A736_268C91FF8AF2" x="441" y="79"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_B3EA_A725F5A385F7" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2122_4b99_B3EA_A725F5A385F7" text="+epo-cat:hasNetMonetaryValue" modelElement="EAID_dst92648E_ABC4_4408_B3EA_A725F5A385F7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2122_4b99_B3EA_A725F5A385F7" x="721" y="256" width="130" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_AE59_F45CD626BB7A" source="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_E93A74BB_614F_4b1c_AE59_F45CD626BB7A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2122_4b99_AE59_F45CD626BB7A" text="+epo-cat:hasMinimumQuantityGuaranteedForDelivery" modelElement="EAID_dst3A74BB_614F_4b1c_AE59_F45CD626BB7A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2122_4b99_AE59_F45CD626BB7A" x="214" y="100" width="220" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2122_4b99_B3EA_A725F5A385F7" text="1" modelElement="EAID_dst92648E_ABC4_4408_B3EA_A725F5A385F7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2122_4b99_B3EA_A725F5A385F7" x="847" y="282" width="6" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2122_4b99_AE59_F45CD626BB7A" text="0..1" modelElement="EAID_dst3A74BB_614F_4b1c_AE59_F45CD626BB7A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2122_4b99_AE59_F45CD626BB7A" x="422" y="126" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_B3EA_A725F5A385F7" x="693" y="277"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_B3EA_A725F5A385F7" x="855" y="277"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_AE59_F45CD626BB7A" x="213" y="212"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_AE59_F45CD626BB7A" x="213" y="121"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2122_4b99_AE59_F45CD626BB7A" x="441" y="121"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_87EA_C0E83DC5C9AF" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_6D569FED_815F_45f4_87EA_C0E83DC5C9AF">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2122_4b99_87EA_C0E83DC5C9AF" text="+epo-cat:hasPriceValidity" modelElement="EAID_dst569FED_815F_45f4_87EA_C0E83DC5C9AF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2122_4b99_87EA_C0E83DC5C9AF" x="488" y="413" width="102" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_A013_1A7BA2859AFA" source="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" target="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" modelElement="EAID_3C28A6D1_3F44_48a1_A013_1A7BA2859AFA">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2122_4b99_A013_1A7BA2859AFA" text="+epo-cat:hasPrice" modelElement="EAID_dst28A6D1_3F44_48a1_A013_1A7BA2859AFA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2122_4b99_A013_1A7BA2859AFA" x="409" y="239" width="72" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2122_4b99_87EA_C0E83DC5C9AF" text="1" modelElement="EAID_dst569FED_815F_45f4_87EA_C0E83DC5C9AF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2122_4b99_87EA_C0E83DC5C9AF" x="479" y="443" width="6" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2122_4b99_A013_1A7BA2859AFA" text="1..*" modelElement="EAID_dst28A6D1_3F44_48a1_A013_1A7BA2859AFA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2122_4b99_A013_1A7BA2859AFA" x="489" y="232" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_87EA_C0E83DC5C9AF" x="577" y="306"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_87EA_C0E83DC5C9AF" x="577" y="438"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2122_4b99_87EA_C0E83DC5C9AF" x="476" y="438"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_A013_1A7BA2859AFA" x="357" y="255"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_A013_1A7BA2859AFA" x="503" y="255"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_8076_1ECB982268EE" source="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C" target="EAID_EDCD6F3A_F86A_46ca_ACD1_13C3E1A4B7F9" modelElement="EAID_90566F74_64BC_49c8_8076_1ECB982268EE">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_8076_1ECB982268EE" x="924" y="574"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_8076_1ECB982268EE" x="1049" y="574"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_980E_9D85403496D0" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" modelElement="EAID_DF35A308_9DDF_4d5b_980E_9D85403496D0">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2122_4b99_980E_9D85403496D0" text="+epo-cat:hasDeliveryLocation" modelElement="EAID_dst35A308_9DDF_4d5b_980E_9D85403496D0">
@@ -1631,69 +1731,84 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_980E_9D85403496D0" x="827" y="242"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2122_4b99_980E_9D85403496D0" x="827" y="138"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_B50C_8F40D73778CB" source="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" target="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" modelElement="EAID_5E6E2C47_4590_4730_B50C_8F40D73778CB">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2122_4b99_B50C_8F40D73778CB" text="+epo-cat:hasStandardisedUnitPrice" modelElement="EAID_dst6E2C47_4590_4730_B50C_8F40D73778CB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2122_4b99_B50C_8F40D73778CB" x="361" y="271" width="140" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_9AB4_37A6F31DF36A" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_47E28283_E9BB_4790_9AB4_37A6F31DF36A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2122_4b99_9AB4_37A6F31DF36A" text="+epo-ord:hasGrossMonetaryValue" modelElement="EAID_dstE28283_E9BB_4790_9AB4_37A6F31DF36A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2122_4b99_9AB4_37A6F31DF36A" x="714" y="278" width="139" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2122_4b99_B50C_8F40D73778CB" text="0..*" modelElement="EAID_dst6E2C47_4590_4730_B50C_8F40D73778CB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2122_4b99_B50C_8F40D73778CB" x="484" y="294" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2122_4b99_9AB4_37A6F31DF36A" text="0..1" modelElement="EAID_dstE28283_E9BB_4790_9AB4_37A6F31DF36A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2122_4b99_9AB4_37A6F31DF36A" x="836" y="301" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_B50C_8F40D73778CB" x="357" y="289"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_B50C_8F40D73778CB" x="503" y="289"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_9AB4_37A6F31DF36A" x="693" y="296"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_9AB4_37A6F31DF36A" x="855" y="296"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_A013_1A7BA2859AFA" source="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" target="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" modelElement="EAID_3C28A6D1_3F44_48a1_A013_1A7BA2859AFA">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2122_4b99_A013_1A7BA2859AFA" text="+epo-cat:hasPrice" modelElement="EAID_dst28A6D1_3F44_48a1_A013_1A7BA2859AFA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2122_4b99_A013_1A7BA2859AFA" x="409" y="239" width="72" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_B3EA_A725F5A385F7" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2122_4b99_B3EA_A725F5A385F7" text="+epo-cat:hasNetMonetaryValue" modelElement="EAID_dst92648E_ABC4_4408_B3EA_A725F5A385F7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2122_4b99_B3EA_A725F5A385F7" x="715" y="247" width="130" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2122_4b99_A013_1A7BA2859AFA" text="1..*" modelElement="EAID_dst28A6D1_3F44_48a1_A013_1A7BA2859AFA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2122_4b99_A013_1A7BA2859AFA" x="489" y="232" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2122_4b99_B3EA_A725F5A385F7" text="1" modelElement="EAID_dst92648E_ABC4_4408_B3EA_A725F5A385F7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2122_4b99_B3EA_A725F5A385F7" x="847" y="269" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_A013_1A7BA2859AFA" x="357" y="255"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_A013_1A7BA2859AFA" x="503" y="255"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_B3EA_A725F5A385F7" x="693" y="264"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_B3EA_A725F5A385F7" x="855" y="264"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_AE59_F45CD626BB7A" source="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_E93A74BB_614F_4b1c_AE59_F45CD626BB7A">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2122_4b99_AE59_F45CD626BB7A" text="+epo-cat:hasMinimumQuantityGuaranteedForDelivery" modelElement="EAID_dst3A74BB_614F_4b1c_AE59_F45CD626BB7A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2122_4b99_AE59_F45CD626BB7A" x="214" y="100" width="220" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_BD97_28BD0C9F2F49" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_A0FABF7A_1814_4dd4_BD97_28BD0C9F2F49">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2122_4b99_BD97_28BD0C9F2F49" text="+epo-cat:hasOrderabableUnitFactorRate" modelElement="EAID_dstFABF7A_1814_4dd4_BD97_28BD0C9F2F49">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2122_4b99_BD97_28BD0C9F2F49" x="602" y="142" width="162" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2122_4b99_AE59_F45CD626BB7A" text="0..1" modelElement="EAID_dst3A74BB_614F_4b1c_AE59_F45CD626BB7A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2122_4b99_AE59_F45CD626BB7A" x="422" y="126" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2122_4b99_BD97_28BD0C9F2F49" text="0..1" modelElement="EAID_dstFABF7A_1814_4dd4_BD97_28BD0C9F2F49">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2122_4b99_BD97_28BD0C9F2F49" x="666" y="126" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_AE59_F45CD626BB7A" x="213" y="212"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_AE59_F45CD626BB7A" x="213" y="121"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2122_4b99_AE59_F45CD626BB7A" x="441" y="121"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_BD97_28BD0C9F2F49" x="654" y="242"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_BD97_28BD0C9F2F49" x="654" y="121"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_A736_268C91FF8AF2" source="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_F475E438_48A3_41f5_A736_268C91FF8AF2">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2122_4b99_A736_268C91FF8AF2" text="+epo-cat:hasMaximumOrderQuantity" modelElement="EAID_dst75E438_48A3_41f5_A736_268C91FF8AF2">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2122_4b99_A736_268C91FF8AF2" x="274" y="62" width="152" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_A5F1_B592E89F9030" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_1F622DE3_2DEE_491f_A5F1_B592E89F9030">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2122_4b99_A5F1_B592E89F9030" text="+epo-cat:hasQuantityThreshold" modelElement="EAID_dst622DE3_2DEE_491f_A5F1_B592E89F9030">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2122_4b99_A5F1_B592E89F9030" x="526" y="163" width="127" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2122_4b99_A736_268C91FF8AF2" text="0..1" modelElement="EAID_dst75E438_48A3_41f5_A736_268C91FF8AF2">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2122_4b99_A736_268C91FF8AF2" x="422" y="84" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2122_4b99_A5F1_B592E89F9030" text="0..1" modelElement="EAID_dst622DE3_2DEE_491f_A5F1_B592E89F9030">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2122_4b99_A5F1_B592E89F9030" x="597" y="126" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_A736_268C91FF8AF2" x="128" y="212"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_A736_268C91FF8AF2" x="128" y="79"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2122_4b99_A736_268C91FF8AF2" x="441" y="79"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_A5F1_B592E89F9030" x="585" y="242"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_A5F1_B592E89F9030" x="585" y="121"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_B866_FABECBC1DB55" source="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_8FF88923_D9FB_4937_B866_FABECBC1DB55">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2122_4b99_B866_FABECBC1DB55" text="+epo-cat:hasCatalogueLineValidity" modelElement="EAID_dstF88923_D9FB_4937_B866_FABECBC1DB55">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2122_4b99_B866_FABECBC1DB55" x="134" y="398" width="139" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_984C_17FF6E47F8F9" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" modelElement="EAID_45B983F5_7502_49f2_984C_17FF6E47F8F9">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2122_4b99_984C_17FF6E47F8F9" text="+epo-cat:hasExpectedDeliveryTime" modelElement="EAID_dstB983F5_7502_49f2_984C_17FF6E47F8F9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2122_4b99_984C_17FF6E47F8F9" x="610" y="445" width="142" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2122_4b99_B866_FABECBC1DB55" text="0..1" modelElement="EAID_dstF88923_D9FB_4937_B866_FABECBC1DB55">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2122_4b99_B866_FABECBC1DB55" x="281" y="429" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2122_4b99_984C_17FF6E47F8F9" text="0..1" modelElement="EAID_dstB983F5_7502_49f2_984C_17FF6E47F8F9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2122_4b99_984C_17FF6E47F8F9" x="739" y="473" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_B866_FABECBC1DB55" x="202" y="336"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_B866_FABECBC1DB55" x="202" y="424"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2122_4b99_B866_FABECBC1DB55" x="300" y="424"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_984C_17FF6E47F8F9" x="637" y="306"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_984C_17FF6E47F8F9" x="637" y="468"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2122_4b99_984C_17FF6E47F8F9" x="758" y="468"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_AA82_ECF06C845021" source="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C" target="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" modelElement="EAID_FE0B0FB5_E0B6_41e2_AA82_ECF06C845021">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_AA82_ECF06C845021" x="841" y="539"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_AA82_ECF06C845021" x="841" y="502"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_8481_D40EEC904171" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_9EA3B8C3_695C_4b42_8481_D40EEC904171">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2122_4b99_8481_D40EEC904171" text="+epo-cat:hasBaseQuantity" modelElement="EAID_dstA3B8C3_695C_4b42_8481_D40EEC904171">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2122_4b99_8481_D40EEC904171" x="460" y="146" width="107" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2122_4b99_8481_D40EEC904171" text="0..1" modelElement="EAID_dstA3B8C3_695C_4b42_8481_D40EEC904171">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2122_4b99_8481_D40EEC904171" x="532" y="126" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_8481_D40EEC904171" x="520" y="242"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_8481_D40EEC904171" x="520" y="121"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_8076_1ECB982268EE" source="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C" target="EAID_EDCD6F3A_F86A_46ca_ACD1_13C3E1A4B7F9" modelElement="EAID_90566F74_64BC_49c8_8076_1ECB982268EE">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_8076_1ECB982268EE" x="924" y="574"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_8076_1ECB982268EE" x="1049" y="574"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_B6AB_525BE36FDC06" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_E89B28AF_BD5D_429d_9A62_EC5FCB2442FF" modelElement="EAID_A4EABD09_62ED_4add_B6AB_525BE36FDC06">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_B6AB_525BE36FDC06" x="670" y="306"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_B6AB_525BE36FDC06" x="670" y="395"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2122_4b99_B6AB_525BE36FDC06" x="774" y="395"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DE493AFE_2122_4b99_B50C_8F40D73778CB" source="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" target="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" modelElement="EAID_5E6E2C47_4590_4730_B50C_8F40D73778CB">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2122_4b99_B50C_8F40D73778CB" text="+epo-cat:hasStandardisedUnitPrice" modelElement="EAID_dst6E2C47_4590_4730_B50C_8F40D73778CB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2122_4b99_B50C_8F40D73778CB" x="361" y="271" width="140" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2122_4b99_B50C_8F40D73778CB" text="0..*" modelElement="EAID_dst6E2C47_4590_4730_B50C_8F40D73778CB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2122_4b99_B50C_8F40D73778CB" x="484" y="294" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2122_4b99_B50C_8F40D73778CB" x="357" y="289"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_B50C_8F40D73778CB" x="503" y="289"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_6D3D469D_BFB6_4096_A024_D98FF37504B4" isFrame="false" modelElement="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_6D3D469D_BFB6_4096_A024_D98FF37504B4" isFrame="false" modelElement="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_6D3D469D_BFB6_4096_8793_87E238D6811B" modelElement="EAID_28F811B2_B8F5_4649_8793_87E238D6811B">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_BFB6_4096_8793_87E238D6811B" text="epo-cat:CatalogueLine"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_BFB6_4096_8793_87E238D6811B" x="159" y="213" width="263" height="124"/>
@@ -1916,7 +2031,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_BFB6_4096_A0AF_73F7FB5C8991" x="766" y="220"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_82AEC70B_C506_4fe9_9828_22C4B82B893A" isFrame="false" modelElement="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_82AEC70B_C506_4fe9_9828_22C4B82B893A" isFrame="false" modelElement="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_82AEC70B_C506_4fe9_81FF_2C5D1C5F37D0" modelElement="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C506_4fe9_81FF_2C5D1C5F37D0" text="epo-cat:Catalogue"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C506_4fe9_81FF_2C5D1C5F37D0" x="276" y="454" width="279" height="59"/>
@@ -2035,7 +2150,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C506_4fe9_9723_9C69BB0EB7B4" x="426" y="311"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_EEFF3272_C785_42be_B2BD_2FB6B7CDF603" isFrame="false" modelElement="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_EEFF3272_C785_42be_B2BD_2FB6B7CDF603" isFrame="false" modelElement="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEFF3272_C785_42be_847A_7E8C5EEC0432" modelElement="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C785_42be_847A_7E8C5EEC0432" text="epo:Period"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C785_42be_847A_7E8C5EEC0432" x="357" y="70" width="176" height="61"/>
@@ -2174,7 +2289,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C785_42be_829F_004DFE769A97" x="448" y="131"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_88441576_E11C_4349_95BE_00842656A68E" isFrame="false" modelElement="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_88441576_E11C_4349_95BE_00842656A68E" isFrame="false" modelElement="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_88441576_E11C_4349_9B44_2FCDD6AB5C9D" modelElement="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_E11C_4349_9B44_2FCDD6AB5C9D" text="epo:MonetaryValue"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_E11C_4349_9B44_2FCDD6AB5C9D" x="933" y="193" width="267" height="98"/>
@@ -2339,14 +2454,14 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_88441576_E11C_4349_B3EA_A725F5A385F7" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_E11C_4349_B3EA_A725F5A385F7" text="+epo-cat:hasNetMonetaryValue" modelElement="EAID_dst92648E_ABC4_4408_B3EA_A725F5A385F7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_E11C_4349_B3EA_A725F5A385F7" x="977" y="326" width="130" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_E11C_4349_B3EA_A725F5A385F7" x="979" y="326" width="130" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_E11C_4349_B3EA_A725F5A385F7" text="1" modelElement="EAID_dst92648E_ABC4_4408_B3EA_A725F5A385F7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_E11C_4349_B3EA_A725F5A385F7" x="1042" y="296" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_E11C_4349_B3EA_A725F5A385F7" x="1044" y="296" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E11C_4349_B3EA_A725F5A385F7" x="253" y="616"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E11C_4349_B3EA_A725F5A385F7" x="1030" y="616"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_E11C_4349_B3EA_A725F5A385F7" x="1030" y="291"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E11C_4349_B3EA_A725F5A385F7" x="253" y="615"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E11C_4349_B3EA_A725F5A385F7" x="1032" y="615"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_E11C_4349_B3EA_A725F5A385F7" x="1032" y="291"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_88441576_E11C_4349_BFCF_A26F9C0B1D38" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" modelElement="EAID_4F4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_E11C_4349_BFCF_A26F9C0B1D38" text="+epo:hasPriceSurchargeInformation" modelElement="EAID_dst4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
@@ -2359,6 +2474,17 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E11C_4349_BFCF_A26F9C0B1D38" x="555" y="577"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_E11C_4349_BFCF_A26F9C0B1D38" x="555" y="418"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_88441576_E11C_4349_9AB4_37A6F31DF36A" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_47E28283_E9BB_4790_9AB4_37A6F31DF36A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_E11C_4349_9AB4_37A6F31DF36A" text="+epo-ord:hasGrossMonetaryValue" modelElement="EAID_dstE28283_E9BB_4790_9AB4_37A6F31DF36A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_E11C_4349_9AB4_37A6F31DF36A" x="1102" y="355" width="139" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_E11C_4349_9AB4_37A6F31DF36A" text="0..1" modelElement="EAID_dstE28283_E9BB_4790_9AB4_37A6F31DF36A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_E11C_4349_9AB4_37A6F31DF36A" x="1151" y="296" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E11C_4349_9AB4_37A6F31DF36A" x="253" y="629"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E11C_4349_9AB4_37A6F31DF36A" x="1139" y="629"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_E11C_4349_9AB4_37A6F31DF36A" x="1139" y="291"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_88441576_E11C_4349_966E_C37D023DC755" source="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" target="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" modelElement="EAID_9D9C4956_D3A6_47cd_966E_C37D023DC755">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_E11C_4349_966E_C37D023DC755" text="+epo-cat:hasChargeInformation" modelElement="EAID_dst9C4956_D3A6_47cd_966E_C37D023DC755">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_E11C_4349_966E_C37D023DC755" x="360" y="379" width="128" height="14"/>
@@ -2370,7 +2496,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E11C_4349_966E_C37D023DC755" x="491" y="399"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_C09EF9D1_F3B2_4fbe_B445_53E5FCEE7EBC" isFrame="false" modelElement="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_C09EF9D1_F3B2_4fbe_B445_53E5FCEE7EBC" isFrame="false" modelElement="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C09EF9D1_F3B2_4fbe_AAE9_7F444FFEA26A" modelElement="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_F3B2_4fbe_AAE9_7F444FFEA26A" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_F3B2_4fbe_AAE9_7F444FFEA26A" text="at-voc-new:tax-category"/>
@@ -2405,39 +2531,49 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_F3B2_4fbe_9B44_2FCDD6AB5C9D" text="epo:MonetaryValue"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F3B2_4fbe_9B44_2FCDD6AB5C9D" x="642" y="430" width="267" height="98"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C09EF9D1_F3B2_4fbe_8084_FD257C99FB89" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" modelElement="EAID_3570E246_3BA3_4795_8084_FD257C99FB89">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3B2_4fbe_8084_FD257C99FB89" text="+epo-ord:hasTaxInformation" modelElement="EAID_dst70E246_3BA3_4795_8084_FD257C99FB89">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3B2_4fbe_8084_FD257C99FB89" x="719" y="206" width="115" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C09EF9D1_F3B2_4fbe_9AB4_37A6F31DF36A" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_47E28283_E9BB_4790_9AB4_37A6F31DF36A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3B2_4fbe_9AB4_37A6F31DF36A" text="+epo-ord:hasGrossMonetaryValue" modelElement="EAID_dstE28283_E9BB_4790_9AB4_37A6F31DF36A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3B2_4fbe_9AB4_37A6F31DF36A" x="501" y="460" width="287" height="15"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3B2_4fbe_8084_FD257C99FB89" text="0..*" modelElement="EAID_dst70E246_3BA3_4795_8084_FD257C99FB89">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3B2_4fbe_8084_FD257C99FB89" x="783" y="228" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3B2_4fbe_9AB4_37A6F31DF36A" text="0..1" modelElement="EAID_dstE28283_E9BB_4790_9AB4_37A6F31DF36A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3B2_4fbe_9AB4_37A6F31DF36A" x="623" y="483" width="287" height="15"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3B2_4fbe_8084_FD257C99FB89" x="775" y="190"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3B2_4fbe_8084_FD257C99FB89" x="775" y="246"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3B2_4fbe_9AB4_37A6F31DF36A" x="496" y="478"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3B2_4fbe_9AB4_37A6F31DF36A" x="642" y="478"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C09EF9D1_F3B2_4fbe_BD03_7B202CFA4807" source="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" target="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" modelElement="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3B2_4fbe_BD03_7B202CFA4807" text="+epo-cat:specifiesItem" modelElement="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3B2_4fbe_BD03_7B202CFA4807" x="559" y="102" width="92" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C09EF9D1_F3B2_4fbe_806C_38F93CA90719" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_33A89700_846B_47cb_93D9_9D4729194EA6" modelElement="EAID_4D92CD55_08CD_4d21_806C_38F93CA90719">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3B2_4fbe_806C_38F93CA90719" x="873" y="338"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3B2_4fbe_806C_38F93CA90719" x="1006" y="338"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C09EF9D1_F3B2_4fbe_925D_13E9A7667A18" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_87123434_C2AD_43de_925D_13E9A7667A18">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3B2_4fbe_925D_13E9A7667A18" text="+epo-cat:hasAmount" modelElement="EAID_dst123434_C2AD_43de_925D_13E9A7667A18">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3B2_4fbe_925D_13E9A7667A18" x="787" y="392" width="85" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3B2_4fbe_BD03_7B202CFA4807" text="1" modelElement="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3B2_4fbe_BD03_7B202CFA4807" x="645" y="125" width="6" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3B2_4fbe_925D_13E9A7667A18" text="0..1" modelElement="EAID_dst123434_C2AD_43de_925D_13E9A7667A18">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3B2_4fbe_925D_13E9A7667A18" x="840" y="412" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3B2_4fbe_BD03_7B202CFA4807" x="486" y="120"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3B2_4fbe_BD03_7B202CFA4807" x="653" y="120"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3B2_4fbe_925D_13E9A7667A18" x="832" y="370"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3B2_4fbe_925D_13E9A7667A18" x="832" y="430"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C09EF9D1_F3B2_4fbe_B3EA_A725F5A385F7" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3B2_4fbe_B3EA_A725F5A385F7" text="+epo-cat:hasNetMonetaryValue" modelElement="EAID_dst92648E_ABC4_4408_B3EA_A725F5A385F7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3B2_4fbe_B3EA_A725F5A385F7" x="510" y="460" width="130" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C09EF9D1_F3B2_4fbe_91B2_799578663395" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_470D1B16_C07B_4868_91B2_799578663395">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3B2_4fbe_91B2_799578663395" text="+epo:isCalculatedOn" modelElement="EAID_dst0D1B16_C07B_4868_91B2_799578663395">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3B2_4fbe_91B2_799578663395" x="683" y="396" width="83" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3B2_4fbe_B3EA_A725F5A385F7" text="1" modelElement="EAID_dst92648E_ABC4_4408_B3EA_A725F5A385F7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3B2_4fbe_B3EA_A725F5A385F7" x="634" y="483" width="6" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3B2_4fbe_91B2_799578663395" text="0..1" modelElement="EAID_dst0D1B16_C07B_4868_91B2_799578663395">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3B2_4fbe_91B2_799578663395" x="733" y="412" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3B2_4fbe_B3EA_A725F5A385F7" x="496" y="478"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3B2_4fbe_B3EA_A725F5A385F7" x="642" y="478"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3B2_4fbe_91B2_799578663395" x="725" y="370"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3B2_4fbe_91B2_799578663395" x="725" y="430"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C09EF9D1_F3B2_4fbe_BD51_7717D3E67FCB" source="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" target="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" modelElement="EAID_C33C0B35_4ADE_463d_BD51_7717D3E67FCB">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3B2_4fbe_BD51_7717D3E67FCB" x="400" y="246"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3B2_4fbe_BD51_7717D3E67FCB" x="400" y="155"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C09EF9D1_F3B2_4fbe_A013_1A7BA2859AFA" source="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" target="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" modelElement="EAID_3C28A6D1_3F44_48a1_A013_1A7BA2859AFA">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3B2_4fbe_A013_1A7BA2859AFA" text="+epo-cat:hasPrice" modelElement="EAID_dst28A6D1_3F44_48a1_A013_1A7BA2859AFA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3B2_4fbe_A013_1A7BA2859AFA" x="419" y="411" width="72" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3B2_4fbe_A013_1A7BA2859AFA" text="1..*" modelElement="EAID_dst28A6D1_3F44_48a1_A013_1A7BA2859AFA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3B2_4fbe_A013_1A7BA2859AFA" x="468" y="429" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3B2_4fbe_A013_1A7BA2859AFA" x="457" y="370"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3B2_4fbe_A013_1A7BA2859AFA" x="457" y="446"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C09EF9D1_F3B2_4fbe_B50C_8F40D73778CB" source="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" target="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" modelElement="EAID_5E6E2C47_4590_4730_B50C_8F40D73778CB">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3B2_4fbe_B50C_8F40D73778CB" text="+epo-cat:hasStandardisedUnitPrice" modelElement="EAID_dst6E2C47_4590_4730_B50C_8F40D73778CB">
@@ -2449,53 +2585,53 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3B2_4fbe_B50C_8F40D73778CB" x="345" y="370"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3B2_4fbe_B50C_8F40D73778CB" x="345" y="446"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C09EF9D1_F3B2_4fbe_A013_1A7BA2859AFA" source="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" target="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" modelElement="EAID_3C28A6D1_3F44_48a1_A013_1A7BA2859AFA">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3B2_4fbe_A013_1A7BA2859AFA" text="+epo-cat:hasPrice" modelElement="EAID_dst28A6D1_3F44_48a1_A013_1A7BA2859AFA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3B2_4fbe_A013_1A7BA2859AFA" x="419" y="411" width="72" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C09EF9D1_F3B2_4fbe_B62C_6F674CDB3888" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A" modelElement="EAID_0D4101FD_7720_417c_B62C_6F674CDB3888">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3B2_4fbe_B62C_6F674CDB3888" x="873" y="275"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3B2_4fbe_B62C_6F674CDB3888" x="1006" y="275"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C09EF9D1_F3B2_4fbe_B3EA_A725F5A385F7" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3B2_4fbe_B3EA_A725F5A385F7" text="+epo-cat:hasNetMonetaryValue" modelElement="EAID_dst92648E_ABC4_4408_B3EA_A725F5A385F7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3B2_4fbe_B3EA_A725F5A385F7" x="510" y="460" width="130" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3B2_4fbe_A013_1A7BA2859AFA" text="1..*" modelElement="EAID_dst28A6D1_3F44_48a1_A013_1A7BA2859AFA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3B2_4fbe_A013_1A7BA2859AFA" x="468" y="429" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3B2_4fbe_B3EA_A725F5A385F7" text="1" modelElement="EAID_dst92648E_ABC4_4408_B3EA_A725F5A385F7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3B2_4fbe_B3EA_A725F5A385F7" x="634" y="483" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3B2_4fbe_A013_1A7BA2859AFA" x="457" y="370"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3B2_4fbe_A013_1A7BA2859AFA" x="457" y="446"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3B2_4fbe_B3EA_A725F5A385F7" x="496" y="478"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3B2_4fbe_B3EA_A725F5A385F7" x="642" y="478"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C09EF9D1_F3B2_4fbe_91B2_799578663395" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_470D1B16_C07B_4868_91B2_799578663395">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3B2_4fbe_91B2_799578663395" text="+epo:isCalculatedOn" modelElement="EAID_dst0D1B16_C07B_4868_91B2_799578663395">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3B2_4fbe_91B2_799578663395" x="683" y="396" width="83" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C09EF9D1_F3B2_4fbe_8084_FD257C99FB89" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" modelElement="EAID_3570E246_3BA3_4795_8084_FD257C99FB89">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3B2_4fbe_8084_FD257C99FB89" text="+epo-ord:hasTaxInformation" modelElement="EAID_dst70E246_3BA3_4795_8084_FD257C99FB89">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3B2_4fbe_8084_FD257C99FB89" x="719" y="206" width="115" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3B2_4fbe_91B2_799578663395" text="0..1" modelElement="EAID_dst0D1B16_C07B_4868_91B2_799578663395">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3B2_4fbe_91B2_799578663395" x="733" y="412" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3B2_4fbe_8084_FD257C99FB89" text="0..*" modelElement="EAID_dst70E246_3BA3_4795_8084_FD257C99FB89">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3B2_4fbe_8084_FD257C99FB89" x="783" y="228" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3B2_4fbe_91B2_799578663395" x="725" y="370"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3B2_4fbe_91B2_799578663395" x="725" y="430"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3B2_4fbe_8084_FD257C99FB89" x="775" y="190"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3B2_4fbe_8084_FD257C99FB89" x="775" y="246"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C09EF9D1_F3B2_4fbe_925D_13E9A7667A18" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_87123434_C2AD_43de_925D_13E9A7667A18">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3B2_4fbe_925D_13E9A7667A18" text="+epo-cat:hasAmount" modelElement="EAID_dst123434_C2AD_43de_925D_13E9A7667A18">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3B2_4fbe_925D_13E9A7667A18" x="787" y="392" width="85" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C09EF9D1_F3B2_4fbe_BD03_7B202CFA4807" source="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" target="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" modelElement="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3B2_4fbe_BD03_7B202CFA4807" text="+epo-cat:specifiesItem" modelElement="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3B2_4fbe_BD03_7B202CFA4807" x="559" y="102" width="92" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3B2_4fbe_925D_13E9A7667A18" text="0..1" modelElement="EAID_dst123434_C2AD_43de_925D_13E9A7667A18">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3B2_4fbe_925D_13E9A7667A18" x="840" y="412" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3B2_4fbe_BD03_7B202CFA4807" text="1" modelElement="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3B2_4fbe_BD03_7B202CFA4807" x="645" y="125" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3B2_4fbe_925D_13E9A7667A18" x="832" y="370"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3B2_4fbe_925D_13E9A7667A18" x="832" y="430"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C09EF9D1_F3B2_4fbe_806C_38F93CA90719" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_33A89700_846B_47cb_93D9_9D4729194EA6" modelElement="EAID_4D92CD55_08CD_4d21_806C_38F93CA90719">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3B2_4fbe_806C_38F93CA90719" x="873" y="338"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3B2_4fbe_806C_38F93CA90719" x="1006" y="338"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3B2_4fbe_BD03_7B202CFA4807" x="486" y="120"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3B2_4fbe_BD03_7B202CFA4807" x="653" y="120"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C09EF9D1_F3B2_4fbe_B62C_6F674CDB3888" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A" modelElement="EAID_0D4101FD_7720_417c_B62C_6F674CDB3888">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3B2_4fbe_B62C_6F674CDB3888" x="873" y="275"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3B2_4fbe_B62C_6F674CDB3888" x="1006" y="275"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C09EF9D1_F3B2_4fbe_BD51_7717D3E67FCB" source="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" target="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" modelElement="EAID_C33C0B35_4ADE_463d_BD51_7717D3E67FCB">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3B2_4fbe_BD51_7717D3E67FCB" x="400" y="246"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3B2_4fbe_BD51_7717D3E67FCB" x="400" y="155"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_65F8E249_BC06_44fd_84A6_7925DA2E8A7C" isFrame="false" modelElement="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_65F8E249_BC06_44fd_84A6_7925DA2E8A7C" isFrame="false" modelElement="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_65F8E249_BC06_44fd_8793_87E238D6811B" modelElement="EAID_28F811B2_B8F5_4649_8793_87E238D6811B">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_BC06_44fd_8793_87E238D6811B" text="epo-cat:CatalogueLine"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_BC06_44fd_8793_87E238D6811B" x="494" y="577" width="263" height="124"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_65F8E249_BC06_44fd_9313_58C4BB4EB1A7" modelElement="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_BC06_44fd_9313_58C4BB4EB1A7" text="epo-cat:Line"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_BC06_44fd_9313_58C4BB4EB1A7" x="539" y="442" width="171" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_BC06_44fd_9313_58C4BB4EB1A7" x="509" y="442" width="232" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_65F8E249_BC06_44fd_99EF_E09436BF89DC" modelElement="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_BC06_44fd_99EF_E09436BF89DC" text="epo-ful:DespatchLine"/>
@@ -2525,6 +2661,16 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_BC06_44fd_B200_94202420C754" text="epo-cat:Item"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_BC06_44fd_B200_94202420C754" x="102" y="246" width="246" height="114"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_65F8E249_BC06_44fd_A2C0_6DC585D1EE96" source="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_2ECAEC7F_2186_4280_A2C0_6DC585D1EE96">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_BC06_44fd_A2C0_6DC585D1EE96" text="+epo-ful:hasGrossVolume" modelElement="EAID_dstCAEC7F_2186_4280_A2C0_6DC585D1EE96">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_BC06_44fd_A2C0_6DC585D1EE96" x="1422" y="271" width="14" height="104"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_BC06_44fd_A2C0_6DC585D1EE96" text="0..1" modelElement="EAID_dstCAEC7F_2186_4280_A2C0_6DC585D1EE96">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_BC06_44fd_A2C0_6DC585D1EE96" x="1449" y="375" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_A2C0_6DC585D1EE96" x="1441" y="212"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_A2C0_6DC585D1EE96" x="1441" y="393"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_65F8E249_BC06_44fd_BD3B_F46B589F376C" source="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_0167DB54_9519_42f6_BD3B_F46B589F376C">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_BC06_44fd_BD3B_F46B589F376C" text="+epo-ful:hasGrossWeight" modelElement="EAID_dst67DB54_9519_42f6_BD3B_F46B589F376C">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_BC06_44fd_BD3B_F46B589F376C" x="1452" y="272" width="14" height="102"/>
@@ -2539,7 +2685,7 @@
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_BC06_44fd_A51F_2425A6DBF32F" text="+epo-ful:containsGoodsItem" modelElement="EAID_dstAB192B_82DE_4520_A51F_2425A6DBF32F">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_BC06_44fd_A51F_2425A6DBF32F" x="978" y="232" width="114" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_BC06_44fd_A51F_2425A6DBF32F" text="1..*" modelElement="EAID_dstAB192B_82DE_4520_A51F_2425A6DBF32F">
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_BC06_44fd_A51F_2425A6DBF32F" text="0..*" modelElement="EAID_dstAB192B_82DE_4520_A51F_2425A6DBF32F">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_BC06_44fd_A51F_2425A6DBF32F" x="1047" y="249" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_A51F_2425A6DBF32F" x="1039" y="212"/>
@@ -2573,31 +2719,19 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_AE53_091E3E0514AF" x="994" y="302"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_AE53_091E3E0514AF" x="728" y="302"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_65F8E249_BC06_44fd_BDD9_5E0D69EFDD3D" source="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_DA6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_BC06_44fd_BDD9_5E0D69EFDD3D" text="+adms:identifier" modelElement="EAID_dst6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_BC06_44fd_BDD9_5E0D69EFDD3D" x="589" y="191" width="66" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_BC06_44fd_BDD9_5E0D69EFDD3D" text="0..1" modelElement="EAID_dst6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_BC06_44fd_BDD9_5E0D69EFDD3D" x="633" y="212" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_BDD9_5E0D69EFDD3D" x="1371" y="142"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_BDD9_5E0D69EFDD3D" x="1371" y="102"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_BC06_44fd_BDD9_5E0D69EFDD3D" x="625" y="102"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_BC06_44fd_BDD9_5E0D69EFDD3D" x="625" y="230"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_65F8E249_BC06_44fd_B27A_8F69BE5B1455" source="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" target="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" modelElement="EAID_A88D0B55_1D01_4b73_B27A_8F69BE5B1455">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_B27A_8F69BE5B1455" x="904" y="477"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_B27A_8F69BE5B1455" x="710" y="477"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_B27A_8F69BE5B1455" x="741" y="477"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_65F8E249_BC06_44fd_9418_BB9B2E957222" source="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_C5E4577A_5BDB_4176_9418_BB9B2E957222">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_BC06_44fd_9418_BB9B2E957222" text="+epo-ful:hasTotalGoodsItemQuantity" modelElement="EAID_dstE4577A_5BDB_4176_9418_BB9B2E957222">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_BC06_44fd_9418_BB9B2E957222" x="1299" y="220" width="14" height="150"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_65F8E249_BC06_44fd_9B9F_2E0BBE858668" source="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_FA2388C8_1471_4d6b_9B9F_2E0BBE858668">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_BC06_44fd_9B9F_2E0BBE858668" text="+epo-ful:hasNetVolume" modelElement="EAID_dst2388C8_1471_4d6b_9B9F_2E0BBE858668">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_BC06_44fd_9B9F_2E0BBE858668" x="1328" y="277" width="14" height="96"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_BC06_44fd_9418_BB9B2E957222" text="0..1" modelElement="EAID_dstE4577A_5BDB_4176_9418_BB9B2E957222">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_BC06_44fd_9418_BB9B2E957222" x="1323" y="375" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_BC06_44fd_9B9F_2E0BBE858668" text="0..1" modelElement="EAID_dst2388C8_1471_4d6b_9B9F_2E0BBE858668">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_BC06_44fd_9B9F_2E0BBE858668" x="1351" y="375" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_9418_BB9B2E957222" x="1315" y="212"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_9418_BB9B2E957222" x="1315" y="393"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_9B9F_2E0BBE858668" x="1343" y="212"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_9B9F_2E0BBE858668" x="1343" y="393"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_65F8E249_BC06_44fd_9551_9C0C13B80044" source="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_BC06_44fd_9551_9C0C13B80044" text="+adms:identifier" modelElement="EAID_dst87FBF1_89C8_4ed0_9551_9C0C13B80044">
@@ -2616,13 +2750,13 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_BC06_44fd_BD03_7B202CFA4807" text="1" modelElement="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_BC06_44fd_BD03_7B202CFA4807" x="236" y="365" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_BD03_7B202CFA4807" x="539" y="476"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_BD03_7B202CFA4807" x="509" y="476"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_BD03_7B202CFA4807" x="224" y="476"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_BC06_44fd_BD03_7B202CFA4807" x="224" y="360"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_65F8E249_BC06_44fd_BD51_7717D3E67FCB" source="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" target="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" modelElement="EAID_C33C0B35_4ADE_463d_BD51_7717D3E67FCB">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_BD51_7717D3E67FCB" x="624" y="577"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_BD51_7717D3E67FCB" x="624" y="512"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_BD51_7717D3E67FCB" x="625" y="577"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_BD51_7717D3E67FCB" x="625" y="512"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_65F8E249_BC06_44fd_ADD5_430BD3FAB4A8" source="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" target="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B" modelElement="EAID_1FEA3AE7_155D_492a_ADD5_430BD3FAB4A8">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_BC06_44fd_ADD5_430BD3FAB4A8" text="+epo-cat:foreseesPackage" modelElement="EAID_dstEA3AE7_155D_492a_ADD5_430BD3FAB4A8">
@@ -2645,6 +2779,26 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_84FB_38E506A895B7" x="1039" y="337"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_84FB_38E506A895B7" x="1039" y="442"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_65F8E249_BC06_44fd_873A_F9E88411186D" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_E507D198_1A41_4b43_873A_F9E88411186D">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_BC06_44fd_873A_F9E88411186D" text="+epo:hasManufacturerItemID" modelElement="EAID_dst07D198_1A41_4b43_873A_F9E88411186D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_BC06_44fd_873A_F9E88411186D" x="375" y="338" width="121" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_BC06_44fd_873A_F9E88411186D" text="0..1" modelElement="EAID_dst07D198_1A41_4b43_873A_F9E88411186D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_BC06_44fd_873A_F9E88411186D" x="502" y="361" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_873A_F9E88411186D" x="348" y="356"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_873A_F9E88411186D" x="521" y="356"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_65F8E249_BC06_44fd_A513_76150076F808" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_52CB7369_B0C2_4acc_A513_76150076F808">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_BC06_44fd_A513_76150076F808" text="+epo-inv:hasItemClassificationIdentifier" modelElement="EAID_dstCB7369_B0C2_4acc_A513_76150076F808">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_BC06_44fd_A513_76150076F808" x="360" y="284" width="159" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_BC06_44fd_A513_76150076F808" text="0..*" modelElement="EAID_dstCB7369_B0C2_4acc_A513_76150076F808">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_BC06_44fd_A513_76150076F808" x="502" y="307" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_A513_76150076F808" x="348" y="302"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_A513_76150076F808" x="521" y="302"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_65F8E249_BC06_44fd_A201_D8391B5C67DF" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_ECEFDC69_19B4_47d7_A201_D8391B5C67DF">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_BC06_44fd_A201_D8391B5C67DF" text="+epo:hasBuyerItemID" modelElement="EAID_dstEFDC69_19B4_47d7_A201_D8391B5C67DF">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_BC06_44fd_A201_D8391B5C67DF" x="414" y="235" width="89" height="14"/>
@@ -2655,45 +2809,37 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_A201_D8391B5C67DF" x="348" y="253"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_A201_D8391B5C67DF" x="521" y="253"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_65F8E249_BC06_44fd_84F1_8A3969FE662E" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_15464872_BFB6_40bb_84F1_8A3969FE662E">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_BC06_44fd_84F1_8A3969FE662E" text="+epo:hasItemStandardID" modelElement="EAID_dst464872_BFB6_40bb_84F1_8A3969FE662E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_BC06_44fd_84F1_8A3969FE662E" x="398" y="261" width="102" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_BC06_44fd_84F1_8A3969FE662E" text="0..*" modelElement="EAID_dst464872_BFB6_40bb_84F1_8A3969FE662E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_BC06_44fd_84F1_8A3969FE662E" x="502" y="283" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_84F1_8A3969FE662E" x="348" y="278"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_84F1_8A3969FE662E" x="521" y="278"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_65F8E249_BC06_44fd_A2C0_6DC585D1EE96" source="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_2ECAEC7F_2186_4280_A2C0_6DC585D1EE96">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_BC06_44fd_A2C0_6DC585D1EE96" text="+epo-ful:hasGrossVolume" modelElement="EAID_dstCAEC7F_2186_4280_A2C0_6DC585D1EE96">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_BC06_44fd_A2C0_6DC585D1EE96" x="1422" y="271" width="14" height="104"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_65F8E249_BC06_44fd_BDD9_5E0D69EFDD3D" source="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_DA6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_BC06_44fd_BDD9_5E0D69EFDD3D" text="+adms:identifier" modelElement="EAID_dst6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_BC06_44fd_BDD9_5E0D69EFDD3D" x="589" y="191" width="66" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_BC06_44fd_A2C0_6DC585D1EE96" text="0..1" modelElement="EAID_dstCAEC7F_2186_4280_A2C0_6DC585D1EE96">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_BC06_44fd_A2C0_6DC585D1EE96" x="1449" y="375" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_BC06_44fd_BDD9_5E0D69EFDD3D" text="0..1" modelElement="EAID_dst6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_BC06_44fd_BDD9_5E0D69EFDD3D" x="633" y="212" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_A2C0_6DC585D1EE96" x="1441" y="212"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_A2C0_6DC585D1EE96" x="1441" y="393"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_BDD9_5E0D69EFDD3D" x="1371" y="142"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_BDD9_5E0D69EFDD3D" x="1371" y="102"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_BC06_44fd_BDD9_5E0D69EFDD3D" x="625" y="102"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_BC06_44fd_BDD9_5E0D69EFDD3D" x="625" y="230"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_65F8E249_BC06_44fd_873A_F9E88411186D" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_E507D198_1A41_4b43_873A_F9E88411186D">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_BC06_44fd_873A_F9E88411186D" text="+epo:hasManufacturerItemID" modelElement="EAID_dst07D198_1A41_4b43_873A_F9E88411186D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_BC06_44fd_873A_F9E88411186D" x="375" y="338" width="121" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_65F8E249_BC06_44fd_A49B_8791C8D7CBEA" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_BC06_44fd_A49B_8791C8D7CBEA" text="+epo:hasSellerItemID" modelElement="EAID_dst6B650B_17CC_499e_A49B_8791C8D7CBEA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_BC06_44fd_A49B_8791C8D7CBEA" x="411" y="287" width="88" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_BC06_44fd_873A_F9E88411186D" text="0..1" modelElement="EAID_dst07D198_1A41_4b43_873A_F9E88411186D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_BC06_44fd_873A_F9E88411186D" x="502" y="361" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_BC06_44fd_A49B_8791C8D7CBEA" text="0..1" modelElement="EAID_dst6B650B_17CC_499e_A49B_8791C8D7CBEA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_BC06_44fd_A49B_8791C8D7CBEA" x="502" y="308" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_873A_F9E88411186D" x="348" y="356"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_873A_F9E88411186D" x="521" y="356"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_A49B_8791C8D7CBEA" x="348" y="303"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_A49B_8791C8D7CBEA" x="521" y="303"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_65F8E249_BC06_44fd_B51A_14A66F3D627C" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_BBC722BA_3236_4fcb_B51A_14A66F3D627C">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_BC06_44fd_B51A_14A66F3D627C" text="+epo:hasSerialID" modelElement="EAID_dstC722BA_3236_4fcb_B51A_14A66F3D627C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_BC06_44fd_B51A_14A66F3D627C" x="429" y="312" width="69" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_65F8E249_BC06_44fd_9418_BB9B2E957222" source="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_C5E4577A_5BDB_4176_9418_BB9B2E957222">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_BC06_44fd_9418_BB9B2E957222" text="+epo-ful:hasTotalGoodsItemQuantity" modelElement="EAID_dstE4577A_5BDB_4176_9418_BB9B2E957222">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_BC06_44fd_9418_BB9B2E957222" x="1299" y="220" width="14" height="150"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_BC06_44fd_B51A_14A66F3D627C" text="0..1" modelElement="EAID_dstC722BA_3236_4fcb_B51A_14A66F3D627C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_BC06_44fd_B51A_14A66F3D627C" x="502" y="334" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_BC06_44fd_9418_BB9B2E957222" text="0..1" modelElement="EAID_dstE4577A_5BDB_4176_9418_BB9B2E957222">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_BC06_44fd_9418_BB9B2E957222" x="1323" y="375" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_B51A_14A66F3D627C" x="348" y="329"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_B51A_14A66F3D627C" x="521" y="329"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_9418_BB9B2E957222" x="1315" y="212"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_9418_BB9B2E957222" x="1315" y="393"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_65F8E249_BC06_44fd_8D27_8D44BA5CA36A" source="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_770594A4_09FD_4b6e_8D27_8D44BA5CA36A">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_BC06_44fd_8D27_8D44BA5CA36A" text="+epo-ful:hasWidth" modelElement="EAID_dst0594A4_09FD_4b6e_8D27_8D44BA5CA36A">
@@ -2735,31 +2881,31 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_97D4_F3871039E80A" x="1410" y="212"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_97D4_F3871039E80A" x="1410" y="393"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_65F8E249_BC06_44fd_9B9F_2E0BBE858668" source="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_FA2388C8_1471_4d6b_9B9F_2E0BBE858668">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_BC06_44fd_9B9F_2E0BBE858668" text="+epo-ful:hasNetVolume" modelElement="EAID_dst2388C8_1471_4d6b_9B9F_2E0BBE858668">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_BC06_44fd_9B9F_2E0BBE858668" x="1328" y="277" width="14" height="96"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_65F8E249_BC06_44fd_B51A_14A66F3D627C" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_BBC722BA_3236_4fcb_B51A_14A66F3D627C">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_BC06_44fd_B51A_14A66F3D627C" text="+epo:hasSerialID" modelElement="EAID_dstC722BA_3236_4fcb_B51A_14A66F3D627C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_BC06_44fd_B51A_14A66F3D627C" x="429" y="312" width="69" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_BC06_44fd_9B9F_2E0BBE858668" text="0..1" modelElement="EAID_dst2388C8_1471_4d6b_9B9F_2E0BBE858668">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_BC06_44fd_9B9F_2E0BBE858668" x="1351" y="375" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_BC06_44fd_B51A_14A66F3D627C" text="0..1" modelElement="EAID_dstC722BA_3236_4fcb_B51A_14A66F3D627C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_BC06_44fd_B51A_14A66F3D627C" x="502" y="334" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_9B9F_2E0BBE858668" x="1343" y="212"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_9B9F_2E0BBE858668" x="1343" y="393"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_B51A_14A66F3D627C" x="348" y="329"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_B51A_14A66F3D627C" x="521" y="329"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_65F8E249_BC06_44fd_A49B_8791C8D7CBEA" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_BC06_44fd_A49B_8791C8D7CBEA" text="+epo:hasSellerItemID" modelElement="EAID_dst6B650B_17CC_499e_A49B_8791C8D7CBEA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_BC06_44fd_A49B_8791C8D7CBEA" x="411" y="287" width="88" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_65F8E249_BC06_44fd_84F1_8A3969FE662E" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_15464872_BFB6_40bb_84F1_8A3969FE662E">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_BC06_44fd_84F1_8A3969FE662E" text="+epo:hasItemStandardID" modelElement="EAID_dst464872_BFB6_40bb_84F1_8A3969FE662E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_BC06_44fd_84F1_8A3969FE662E" x="398" y="261" width="102" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_BC06_44fd_A49B_8791C8D7CBEA" text="0..1" modelElement="EAID_dst6B650B_17CC_499e_A49B_8791C8D7CBEA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_BC06_44fd_A49B_8791C8D7CBEA" x="502" y="308" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_BC06_44fd_84F1_8A3969FE662E" text="0..*" modelElement="EAID_dst464872_BFB6_40bb_84F1_8A3969FE662E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_BC06_44fd_84F1_8A3969FE662E" x="502" y="283" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_A49B_8791C8D7CBEA" x="348" y="303"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_A49B_8791C8D7CBEA" x="521" y="303"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BC06_44fd_84F1_8A3969FE662E" x="348" y="278"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BC06_44fd_84F1_8A3969FE662E" x="521" y="278"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_01F32084_0DB4_45c2_B38D_9F359540A08C" isFrame="false" modelElement="EAPK_539436E9_1B11_4461_B549_9B764CC4DB6A">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_01F32084_0DB4_45c2_9313_58C4BB4EB1A7" modelElement="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0DB4_45c2_9313_58C4BB4EB1A7" text="epo-cat:Line"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0DB4_45c2_9313_58C4BB4EB1A7" x="497" y="419" width="171" height="71"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0DB4_45c2_9313_58C4BB4EB1A7" x="466" y="420" width="232" height="71"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_01F32084_0DB4_45c2_B200_94202420C754" modelElement="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0DB4_45c2_B200_94202420C754" text="epo-cat:Item"/>
@@ -2767,7 +2913,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_01F32084_0DB4_45c2_BAD6_EEC96CE5E33A" modelElement="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0DB4_45c2_BAD6_EEC96CE5E33A" text="epo-cat:InformationHub"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0DB4_45c2_BAD6_EEC96CE5E33A" x="505" y="278" width="157" height="53"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0DB4_45c2_BAD6_EEC96CE5E33A" x="504" y="278" width="157" height="53"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_01F32084_0DB4_45c2_AD7B_7484B8FDA398" modelElement="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0DB4_45c2_AD7B_7484B8FDA398" text="adms:Identifier"/>
@@ -2785,31 +2931,31 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0DB4_45c2_960F_C4C98C40706A" text="epo-ord:OrderLine"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0DB4_45c2_960F_C4C98C40706A" x="537" y="572" width="90" height="70"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_01F32084_0DB4_45c2_873A_F9E88411186D" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_E507D198_1A41_4b43_873A_F9E88411186D">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0DB4_45c2_873A_F9E88411186D" text="+epo:hasManufacturerItemID" modelElement="EAID_dst07D198_1A41_4b43_873A_F9E88411186D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0DB4_45c2_873A_F9E88411186D" x="1134" y="252" width="121" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_01F32084_0DB4_45c2_A49B_8791C8D7CBEA" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0DB4_45c2_A49B_8791C8D7CBEA" text="+epo:hasSellerItemID" modelElement="EAID_dst6B650B_17CC_499e_A49B_8791C8D7CBEA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0DB4_45c2_A49B_8791C8D7CBEA" x="1037" y="250" width="88" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0DB4_45c2_873A_F9E88411186D" text="0..1" modelElement="EAID_dst07D198_1A41_4b43_873A_F9E88411186D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0DB4_45c2_873A_F9E88411186D" x="1188" y="224" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0DB4_45c2_A49B_8791C8D7CBEA" text="0..1" modelElement="EAID_dst6B650B_17CC_499e_A49B_8791C8D7CBEA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0DB4_45c2_A49B_8791C8D7CBEA" x="1078" y="223" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_873A_F9E88411186D" x="1197" y="370"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_873A_F9E88411186D" x="1164" y="370"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0DB4_45c2_873A_F9E88411186D" x="1164" y="218"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_A49B_8791C8D7CBEA" x="1197" y="422"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_A49B_8791C8D7CBEA" x="1066" y="422"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0DB4_45c2_A49B_8791C8D7CBEA" x="1066" y="218"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_01F32084_0DB4_45c2_A3AA_B5B7E513AEA0" source="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" target="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" modelElement="EAID_B0259612_87E6_4f34_A3AA_B5B7E513AEA0">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0DB4_45c2_A3AA_B5B7E513AEA0" text="+epo-ful:refersToOrderLine" modelElement="EAID_dst259612_87E6_4f34_A3AA_B5B7E513AEA0">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0DB4_45c2_A3AA_B5B7E513AEA0" x="426" y="589" width="109" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0DB4_45c2_A3AA_B5B7E513AEA0" text="0..1" modelElement="EAID_dst259612_87E6_4f34_A3AA_B5B7E513AEA0">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0DB4_45c2_A3AA_B5B7E513AEA0" x="518" y="612" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0DB4_45c2_A3AA_B5B7E513AEA0" text="1" modelElement="EAID_dst259612_87E6_4f34_A3AA_B5B7E513AEA0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0DB4_45c2_A3AA_B5B7E513AEA0" x="529" y="612" width="6" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_A3AA_B5B7E513AEA0" x="383" y="607"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_A3AA_B5B7E513AEA0" x="537" y="607"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_01F32084_0DB4_45c2_B27A_8F69BE5B1455" source="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" target="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" modelElement="EAID_A88D0B55_1D01_4b73_B27A_8F69BE5B1455">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_B27A_8F69BE5B1455" x="237" y="572"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_B27A_8F69BE5B1455" x="237" y="456"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0DB4_45c2_B27A_8F69BE5B1455" x="497" y="456"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_B27A_8F69BE5B1455" x="237" y="457"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0DB4_45c2_B27A_8F69BE5B1455" x="466" y="457"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_01F32084_0DB4_45c2_8A07_9FF99AC0CF07" source="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" target="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" modelElement="EAID_082B76C7_EF6B_4c76_8A07_9FF99AC0CF07">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0DB4_45c2_8A07_9FF99AC0CF07" text="+epo-ord:refersToCatalogueLine" modelElement="EAID_dst2B76C7_EF6B_4c76_8A07_9FF99AC0CF07">
@@ -2823,17 +2969,17 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_01F32084_0DB4_45c2_BCCC_37421BA960DE" source="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" target="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" modelElement="EAID_AA589EDA_B26B_44c3_BCCC_37421BA960DE">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_BCCC_37421BA960DE" x="582" y="572"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_BCCC_37421BA960DE" x="582" y="490"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_BCCC_37421BA960DE" x="582" y="491"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_01F32084_0DB4_45c2_BD03_7B202CFA4807" source="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" target="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" modelElement="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0DB4_45c2_BD03_7B202CFA4807" text="+epo-cat:specifiesItem" modelElement="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0DB4_45c2_BD03_7B202CFA4807" x="1101" y="437" width="92" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0DB4_45c2_BD03_7B202CFA4807" x="1101" y="439" width="92" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0DB4_45c2_BD03_7B202CFA4807" text="1" modelElement="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0DB4_45c2_BD03_7B202CFA4807" x="1189" y="461" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0DB4_45c2_BD03_7B202CFA4807" x="1189" y="463" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_BD03_7B202CFA4807" x="668" y="456"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_BD03_7B202CFA4807" x="1197" y="456"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_BD03_7B202CFA4807" x="698" y="458"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_BD03_7B202CFA4807" x="1197" y="458"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_01F32084_0DB4_45c2_9551_9C0C13B80044" source="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0DB4_45c2_9551_9C0C13B80044" text="+adms:identifier" modelElement="EAID_dst87FBF1_89C8_4ed0_9551_9C0C13B80044">
@@ -2842,35 +2988,35 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0DB4_45c2_9551_9C0C13B80044" text="0..1" modelElement="EAID_dst87FBF1_89C8_4ed0_9551_9C0C13B80044">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0DB4_45c2_9551_9C0C13B80044" x="1041" y="223" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_9551_9C0C13B80044" x="668" y="430"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_9551_9C0C13B80044" x="1029" y="430"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_9551_9C0C13B80044" x="698" y="431"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_9551_9C0C13B80044" x="1029" y="431"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0DB4_45c2_9551_9C0C13B80044" x="1029" y="218"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_01F32084_0DB4_45c2_BD51_7717D3E67FCB" source="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" target="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" modelElement="EAID_C33C0B35_4ADE_463d_BD51_7717D3E67FCB">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_BD51_7717D3E67FCB" x="911" y="551"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_BD51_7717D3E67FCB" x="911" y="478"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0DB4_45c2_BD51_7717D3E67FCB" x="668" y="478"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_BD51_7717D3E67FCB" x="911" y="479"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0DB4_45c2_BD51_7717D3E67FCB" x="698" y="479"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_01F32084_0DB4_45c2_96D4_FF2138630244" source="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A" target="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" modelElement="EAID_AB038715_CD52_4521_96D4_FF2138630244">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0DB4_45c2_96D4_FF2138630244" text="+epo-cat:isSpecificToLine" modelElement="EAID_dst038715_CD52_4521_96D4_FF2138630244">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0DB4_45c2_96D4_FF2138630244" x="521" y="367" width="101" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_01F32084_0DB4_45c2_873A_F9E88411186D" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_E507D198_1A41_4b43_873A_F9E88411186D">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0DB4_45c2_873A_F9E88411186D" text="+epo:hasManufacturerItemID" modelElement="EAID_dst07D198_1A41_4b43_873A_F9E88411186D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0DB4_45c2_873A_F9E88411186D" x="1134" y="252" width="121" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0DB4_45c2_96D4_FF2138630244" text="0..*" modelElement="EAID_dst038715_CD52_4521_96D4_FF2138630244">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0DB4_45c2_96D4_FF2138630244" x="590" y="401" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0DB4_45c2_873A_F9E88411186D" text="0..1" modelElement="EAID_dst07D198_1A41_4b43_873A_F9E88411186D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0DB4_45c2_873A_F9E88411186D" x="1188" y="224" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_96D4_FF2138630244" x="582" y="331"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_96D4_FF2138630244" x="582" y="419"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_873A_F9E88411186D" x="1197" y="370"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_873A_F9E88411186D" x="1164" y="370"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0DB4_45c2_873A_F9E88411186D" x="1164" y="218"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_01F32084_0DB4_45c2_A49B_8791C8D7CBEA" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0DB4_45c2_A49B_8791C8D7CBEA" text="+epo:hasSellerItemID" modelElement="EAID_dst6B650B_17CC_499e_A49B_8791C8D7CBEA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0DB4_45c2_A49B_8791C8D7CBEA" x="1037" y="250" width="88" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_01F32084_0DB4_45c2_96D4_FF2138630244" source="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A" target="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" modelElement="EAID_AB038715_CD52_4521_96D4_FF2138630244">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0DB4_45c2_96D4_FF2138630244" text="+epo-cat:isSpecificToLine" modelElement="EAID_dst038715_CD52_4521_96D4_FF2138630244">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0DB4_45c2_96D4_FF2138630244" x="520" y="368" width="101" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0DB4_45c2_A49B_8791C8D7CBEA" text="0..1" modelElement="EAID_dst6B650B_17CC_499e_A49B_8791C8D7CBEA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0DB4_45c2_A49B_8791C8D7CBEA" x="1078" y="223" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0DB4_45c2_96D4_FF2138630244" text="0..*" modelElement="EAID_dst038715_CD52_4521_96D4_FF2138630244">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0DB4_45c2_96D4_FF2138630244" x="589" y="402" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_A49B_8791C8D7CBEA" x="1197" y="422"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_A49B_8791C8D7CBEA" x="1066" y="422"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0DB4_45c2_A49B_8791C8D7CBEA" x="1066" y="218"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_96D4_FF2138630244" x="581" y="331"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_96D4_FF2138630244" x="581" y="420"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_01F32084_0DB4_45c2_84F1_8A3969FE662E" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_15464872_BFB6_40bb_84F1_8A3969FE662E">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0DB4_45c2_84F1_8A3969FE662E" text="+epo:hasItemStandardID" modelElement="EAID_dst464872_BFB6_40bb_84F1_8A3969FE662E">
@@ -3052,7 +3198,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_A0C1_4c43_B8FF_34E21440DAD9" x="682" y="90"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_B63F4E60_55FB_4b37_BB14_8B508813D89D" isFrame="false" modelElement="EAPK_434C478A_1DD4_4dbc_BC16_6DA0B0A6546B">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_B63F4E60_55FB_4b37_BB14_8B508813D89D" isFrame="false" modelElement="EAPK_227C7135_4084_44ed_B4B1_94E1D2E98D9B">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B63F4E60_55FB_4b37_ACF8_3ACA0F78EFF3" modelElement="EAID_02622AF6_D00A_4f62_ACF8_3ACA0F78EFF3">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_55FB_4b37_ACF8_3ACA0F78EFF3" text="epo-cat:CatalogueResponse"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_55FB_4b37_ACF8_3ACA0F78EFF3" x="527" y="565" width="123" height="70"/>
@@ -3299,7 +3445,7 @@
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;"/>
 			</element>
 			<element xmi:idref="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" xmi:type="uml:Package" name="catalogue" scope="public">
-				<model package2="EAID_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" package="EAPK_2C5CFA6C_02C3_4fc3_9AA8_74318B172290" tpos="1" ea_localid="50" ea_eleType="package"/>
+				<model package2="EAID_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" package="EAPK_2C5CFA6C_02C3_4fc3_9AA8_74318B172290" tpos="0" ea_localid="50" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
 				<project author="jseguraf" version="1.0" phase="1.0" created="2021-01-12 15:07:01" modified="2022-08-11 09:44:34" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
@@ -3307,15 +3453,15 @@
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="Catalogue"/>
-				<packageproperties version="1.0" tpos="1"/>
+				<packageproperties version="1.0"/>
 				<paths/>
 				<times created="2021-01-12 15:07:01" modified="2022-08-11 09:44:34" lastloaddate="2021-11-18 15:37:59" lastsavedate="2021-11-18 15:37:59"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" batchsave="0" batchload="0" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
 			</element>
-			<element xmi:idref="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172" xmi:type="uml:Package" name="diagrams" scope="public">
-				<model package2="EAID_57A8B2BC_7751_4b29_A492_7095D1A01172" package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" tpos="1" ea_localid="237" ea_eleType="package"/>
+			<element xmi:idref="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2" xmi:type="uml:Package" name="diagrams" scope="public">
+				<model package2="EAID_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2" package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" tpos="1" ea_localid="268" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 12:56:48" modified="2024-03-18 12:56:48" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:53:16" modified="2024-07-23 11:53:16" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3323,11 +3469,35 @@
 				<extendedProperties tagged="0" package_name="catalogue"/>
 				<packageproperties version="1.0" tpos="1"/>
 				<paths/>
-				<times created="2024-03-18 12:56:48" modified="2024-03-18 12:56:48"/>
+				<times created="2024-07-23 11:53:16" modified="2024-07-23 11:53:16"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
+			<element xmi:idref="EAID_05BF87EB_40D1_4fbc_98CF_2F9920D6FA83" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2" tpos="0" ea_localid="3025" ea_eleType="element"/>
+				<properties documentation="Waiting for code list." isSpecification="false" sType="Note" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-06-01 20:52:47" modified="2023-06-01 20:52:51" complexity="1" status="Proposed"/>
+				<code gentype="&lt;none&gt;"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<NoteLink xmi:id="EAID_3AF5D51C_E1E0_4756_A8FB_A636173FB8C1" start="EAID_05BF87EB_40D1_4fbc_98CF_2F9920D6FA83" end="EAID_ABDB4F83_303C_49aa_86E4_C7A6A9388FE0"/>
+					<NoteLink xmi:id="EAID_6E211308_0015_4c99_8D6E_D6623AF6D2FF" start="EAID_05BF87EB_40D1_4fbc_98CF_2F9920D6FA83" end="EAID_AEFD9686_5D49_4105_AEBB_8004EBB7007F"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_7C2498F5_4923_4199_A897_66E923299404" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2" tpos="0" ea_localid="1528" ea_eleType="element"/>
+				<properties documentation="To be checked in eInvoicing the relation to VAT code.&#xA;Awaiting a new change request on other types of TAX. " isSpecification="false" sType="Note" nType="1" scope="public"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-01-27 16:32:37" modified="2022-05-05 15:15:01" complexity="1" status="Proposed"/>
+				<code gentype="&lt;none&gt;"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams" relatedlinks="idref1=;"/>
+			</element>
 			<element xmi:idref="EAID_7C89A04E_6BCC_4cb8_B4DC_76817402265D" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_C3BED690_3A74_4118_8357_6957359310FB">
-				<model package="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172" tpos="0" ea_localid="1970" ea_eleType="element"/>
+				<model package="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2" tpos="0" ea_localid="1970" ea_eleType="element"/>
 				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
 				<project author="lps" version="1.0" phase="1.0" created="2022-07-19 15:56:28" modified="2022-07-19 15:56:28" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
@@ -3339,8 +3509,21 @@
 					<Generalization xmi:id="EAID_89FDF957_97A3_47f3_98F1_B3229B558EC4" start="EAID_7C89A04E_6BCC_4cb8_B4DC_76817402265D" end="EAID_C328FA20_C15A_40a9_A9D6_A8B08A5ACBD7"/>
 				</links>
 			</element>
+			<element xmi:idref="EAID_BCDEE6F5_A44E_454a_A6FD_F7B270D8DE17" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2" tpos="0" ea_localid="1621" ea_eleType="element"/>
+				<properties documentation="Will this ever be a controlled vocabulary? &#xA;&#xA;To be proposed to EUVocabularies for publication. &#xA;" isSpecification="false" sType="Note" nType="0" scope="public"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-02-24 16:21:31" modified="2022-05-05 15:38:06" complexity="1" status="Proposed"/>
+				<code gentype="&lt;none&gt;"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<NoteLink xmi:id="EAID_57270DB3_8BAB_4bd4_9420_41F9921B71EF" start="EAID_BCDEE6F5_A44E_454a_A6FD_F7B270D8DE17" end="EAID_B0937CD2_46D2_48d7_849F_409BCB726909"/>
+				</links>
+			</element>
 			<element xmi:idref="EAID_C328FA20_C15A_40a9_A9D6_A8B08A5ACBD7" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_8990AB87_7AAE_4276_AA04_83E4BB664FCB">
-				<model package="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172" tpos="0" ea_localid="1971" ea_eleType="element"/>
+				<model package="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2" tpos="0" ea_localid="1971" ea_eleType="element"/>
 				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
 				<project author="lps" version="1.0" phase="1.0" created="2022-07-19 15:56:28" modified="2022-07-19 15:56:28" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
@@ -3353,50 +3536,67 @@
 				</links>
 			</element>
 			<element xmi:idref="EAPK_539436E9_1B11_4461_B549_9B764CC4DB6A" xmi:type="uml:Package" name="post award object" scope="public">
-				<model package2="EAID_539436E9_1B11_4461_B549_9B764CC4DB6A" package="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172" tpos="1" ea_localid="181" ea_eleType="package"/>
+				<model package2="EAID_539436E9_1B11_4461_B549_9B764CC4DB6A" package="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2" tpos="4" ea_localid="181" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2023-01-23 17:51:41" modified="2024-03-18 12:56:59" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2023-01-23 17:51:41" modified="2024-07-23 11:54:01" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
-				<packageproperties version="1.0" tpos="1"/>
+				<packageproperties version="1.0" tpos="4"/>
 				<paths/>
 				<times created="2023-01-23 17:51:41" modified="2023-02-08 17:55:22"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
+			<element xmi:idref="EAPK_5C1F4218_BC0A_4f09_B6CE_B4D878A3952C" xmi:type="uml:Package" name="classes" scope="public">
+				<model package2="EAID_5C1F4218_BC0A_4f09_B6CE_B4D878A3952C" package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" tpos="2" ea_localid="269" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:53:23" modified="2024-07-23 11:53:23" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="catalogue"/>
+				<packageproperties version="1.0" tpos="2"/>
+				<paths/>
+				<times created="2024-07-23 11:53:23" modified="2024-07-23 11:53:23"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+			</element>
 			<element xmi:idref="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A" xmi:type="uml:Class" name="epo-cat:InformationHub" scope="public">
-				<model package="EAPK_539436E9_1B11_4461_B549_9B764CC4DB6A" tpos="0" ea_localid="2585" ea_eleType="element"/>
+				<model package="EAPK_5C1F4218_BC0A_4f09_B6CE_B4D878A3952C" tpos="0" ea_localid="2585" ea_eleType="element"/>
 				<properties documentation="Grouping of data that may be associated to various concepts.&#xA;&#xA;Additional Information:&#xA;For example, AllowanceChargeInformation may be associated to the Order or the Catalogue (either at the Line level or at the Document level), amongst others.&#xA;&#xA;WG approval 16/05/2023" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2023-01-23 17:57:17" modified="2023-05-16 17:25:23" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2023-01-23 17:57:17" modified="2024-07-23 11:53:57" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="post award object"/>
+				<extendedProperties tagged="0" package_name="classes"/>
 				<links>
 					<Generalization xmi:id="EAID_0F0A4585_C0E2_4438_81E0_5F41FAE01E73" start="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
 					<Association xmi:id="EAID_AB038715_CD52_4521_96D4_FF2138630244" start="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A" end="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7"/>
 					<Generalization xmi:id="EAID_014949B1_BE8E_4bef_8E6B_98E657488D49" start="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809" end="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
 					<Generalization xmi:id="EAID_1A5886B6_3780_442c_B301_604581D5936A" start="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" end="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
 					<Generalization xmi:id="EAID_1B6003C0_D0B7_432f_8EA3_408BD2086789" start="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB" end="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
+					<Generalization xmi:id="EAID_6906866E_320E_4e58_A7DD_49C8A3F9638B" start="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" end="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
 					<Generalization xmi:id="EAID_74FDD051_8991_4328_BB5F_DB2625DE81D1" start="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" end="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
 					<Generalization xmi:id="EAID_868D23F3_0FC6_4127_BE78_8022E13802B9" start="EAID_84590049_CB31_46ad_9E29_90E679D32C10" end="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
 					<Generalization xmi:id="EAID_8D08461D_427C_4617_A7FA_357936EA21A8" start="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" end="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
 					<Generalization xmi:id="EAID_A76AAA3D_FA92_46df_8905_FDFE3A9A6323" start="EAID_1D470B74_66C6_4e95_82A9_28C6309EBB94" end="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
+					<Generalization xmi:id="EAID_DCA67557_A587_48db_87FC_5179F7A10647" start="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D" end="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
+					<Generalization xmi:id="EAID_E1227B02_660A_4a25_9EF1_B1E472EB8A4A" start="EAID_D2275688_DA87_4409_B1D5_7AAEA8D7B844" end="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
 					<Generalization xmi:id="EAID_F38D2FE9_AA8F_4ecb_A19A_9A7A0B30CF7E" start="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" end="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" xmi:type="uml:Class" name="epo-cat:Line" scope="public">
-				<model package="EAPK_539436E9_1B11_4461_B549_9B764CC4DB6A" tpos="0" ea_localid="2584" ea_eleType="element"/>
+				<model package="EAPK_5C1F4218_BC0A_4f09_B6CE_B4D878A3952C" tpos="0" ea_localid="2584" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2023-01-23 17:52:13" modified="2023-01-23 17:52:20" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2023-01-23 17:52:13" modified="2024-07-23 11:53:57" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="post award object"/>
+				<extendedProperties tagged="0" package_name="classes"/>
 				<attributes>
 					<attribute xmi:idref="EAID_AE25C2FF_DC4C_492c_969F_2EF25B5E086F" name="dct:description" scope="Public">
 						<initial/>
@@ -3413,6 +3613,21 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
+					<attribute xmi:idref="EAID_AA5A9919_BD48_4632_96F8_93193EE27298" name="epo:hasAdditionalInformation" scope="Public">
+						<initial/>
+						<documentation value="Supplementary data about the instance of the concept. &#xA;&#xA;WG Approval 15/10/2019"/>
+						<model ea_localid="2636" ea_guid="{AA5A9919-BD48-4632-96F8-93193EE27298}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="1"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
 				</attributes>
 				<links>
 					<Association xmi:id="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044" start="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
@@ -3422,22 +3637,24 @@
 					<Generalization xmi:id="EAID_AA589EDA_B26B_44c3_BCCC_37421BA960DE" start="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" end="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7"/>
 					<Association xmi:id="EAID_AB038715_CD52_4521_96D4_FF2138630244" start="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A" end="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7"/>
 					<Generalization xmi:id="EAID_C33C0B35_4ADE_463d_BD51_7717D3E67FCB" start="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" end="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7"/>
+					<Generalization xmi:id="EAID_CF00A26F_CB76_4971_854A_CE68DE5CB673" start="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" end="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" xmi:type="uml:Class" name="epo-cat:PostAwardDocument" scope="public">
-				<model package="EAPK_539436E9_1B11_4461_B549_9B764CC4DB6A" tpos="0" ea_localid="3099" ea_eleType="element"/>
+				<model package="EAPK_5C1F4218_BC0A_4f09_B6CE_B4D878A3952C" tpos="0" ea_localid="3099" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-07-17 17:19:00" modified="2023-07-17 17:19:25" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-07-17 17:19:00" modified="2024-07-23 11:53:57" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="post award object"/>
+				<extendedProperties tagged="0" package_name="classes"/>
 				<links>
 					<Dependency xmi:id="EAID_233516AD_8114_473d_B8A6_42826FC39635" start="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" end="EAID_C3684D7C_E07D_415a_B935_B52376928738"/>
 					<Dependency xmi:id="EAID_2B89940C_0005_4c86_BE14_3F84B34FF9D8" start="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" end="EAID_274424DF_415D_400f_99C0_FDA108C74C7A"/>
 					<Generalization xmi:id="EAID_618070AC_783D_48ae_9723_9C69BB0EB7B4" start="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
 					<Generalization xmi:id="EAID_358B44F1_E8E4_43b8_AEE5_A1928786F529" start="EAID_02622AF6_D00A_4f62_ACF8_3ACA0F78EFF3" end="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
+					<Generalization xmi:id="EAID_387C6C7A_CC14_4b5e_BAB7_F3D1FB910F35" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
 					<Generalization xmi:id="EAID_51057DA3_81A5_4e16_A7F9_22D9EFCB1693" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
 					<Generalization xmi:id="EAID_7EFC644F_3191_4d57_B035_AE5068C30238" start="EAID_0B2ADA0F_0895_4cee_BF7A_BF9E5E76BDCC" end="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
 					<Generalization xmi:id="EAID_891D4ADA_5989_4b36_8188_44D7D99D8155" start="EAID_CF553CC8_8DC9_4ea2_B386_8ACB39A17657" end="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
@@ -3446,24 +3663,10 @@
 					<Generalization xmi:id="EAID_F3DC6C10_C71E_4d6a_8E54_05CFB346E654" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
 				</links>
 			</element>
-			<element xmi:idref="EAPK_789F6532_92B8_4618_8DF0_FCB72A894B5A" xmi:type="uml:Package" name="classes" scope="public">
-				<model package2="EAID_789F6532_92B8_4618_8DF0_FCB72A894B5A" package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" tpos="2" ea_localid="238" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 12:57:04" modified="2024-03-18 12:57:07" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
-				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
-				<tags/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="catalogue"/>
-				<packageproperties version="1.0" tpos="2"/>
-				<paths/>
-				<times created="2024-03-18 12:57:04" modified="2024-03-18 12:57:04"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
-			</element>
 			<element xmi:idref="EAID_A3E8B06E_AAC4_4ee6_8057_BBB2E7E570FE" xmi:type="uml:Class" name="epo-cat:Brand" scope="public">
-				<model package="EAPK_789F6532_92B8_4618_8DF0_FCB72A894B5A" tpos="1" ea_localid="1635" ea_eleType="element"/>
+				<model package="EAPK_5C1F4218_BC0A_4f09_B6CE_B4D878A3952C" tpos="1" ea_localid="1635" ea_eleType="element"/>
 				<properties documentation="Name given by an organisation to its product or service, or range of products or services. &#xA;&#xA;Additional information:&#xA;Brand name allows economic operators to distinctively describe an item in their eCatalogue. This may be different from the &quot;item name&quot;.&#xA;&#xA;WG acceptance 10/03/2022&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-03-10 16:17:01" modified="2024-03-18 12:57:22" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-03-10 16:17:01" modified="2024-07-23 11:53:47" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3491,27 +3694,30 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" xmi:type="uml:Class" name="epo-cat:ChargeInformation" scope="public">
-				<model package="EAPK_789F6532_92B8_4618_8DF0_FCB72A894B5A" tpos="7" ea_localid="1960" ea_eleType="element"/>
+				<model package="EAPK_5C1F4218_BC0A_4f09_B6CE_B4D878A3952C" tpos="7" ea_localid="1960" ea_eleType="element"/>
 				<properties documentation="Information about tax, fee or duty imposed.&#xA;&#xA;Additional Information:&#xA;Charge category indicates the nature of the tax/duty/fee, for example VAT, CAR, etc.&#xA;Charge category modifier may be used in case different levels, exemptions or other modifications apply.&#xA;The charge can be fixed or relative to the price.&#xA;&#xA;WG approval 16/05/2023" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-07-14 17:13:45" modified="2024-03-18 12:57:22" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-07-14 17:13:45" modified="2024-07-23 11:53:47" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="classes"/>
 				<links>
+					<Association xmi:id="EAID_363E463C_04A8_41ba_94C0_F1ACF5EF8818" start="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" end="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
 					<Association xmi:id="EAID_AD18A153_57A6_4142_86D1_A887FC375039" start="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" end="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
 					<Generalization xmi:id="EAID_D8788651_B092_4dea_82FA_E8F122CD0638" start="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" end="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1"/>
 					<Association xmi:id="EAID_053FA551_E0F4_4d8a_9787_DB2496C70148" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831"/>
 					<Association xmi:id="EAID_4F4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831"/>
+					<Association xmi:id="EAID_6AA08C54_54FE_402e_8B58_8804E01D8889" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831"/>
+					<Association xmi:id="EAID_6DA6B6C9_7964_4102_A413_050778056B72" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831"/>
 					<Association xmi:id="EAID_7A1163CB_9C26_4b4f_BCD6_23ABF38C12BE" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831"/>
 					<Association xmi:id="EAID_9D9C4956_D3A6_47cd_966E_C37D023DC755" start="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" end="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_75741E53_D423_4195_A619_A6477F3A2F70" xmi:type="uml:Class" name="epo-cat:ItemAccessoryRelation" scope="public">
-				<model package="EAPK_789F6532_92B8_4618_8DF0_FCB72A894B5A" tpos="8" ea_localid="1944" ea_eleType="element"/>
+				<model package="EAPK_5C1F4218_BC0A_4f09_B6CE_B4D878A3952C" tpos="8" ea_localid="1944" ea_eleType="element"/>
 				<properties documentation="Combination of two Items where the former enhances the latter.&#xA;&#xA;WG Approval: 30/06/2022&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-06-30 14:53:00" modified="2024-03-18 12:57:22" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-06-30 14:53:00" modified="2024-07-23 11:53:47" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3522,9 +3728,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_C4FD8304_712B_42fb_BC5A_599B637A2FB7" xmi:type="uml:Class" name="epo-cat:ItemComplementaryRelation" scope="public">
-				<model package="EAPK_789F6532_92B8_4618_8DF0_FCB72A894B5A" tpos="10" ea_localid="1945" ea_eleType="element"/>
+				<model package="EAPK_5C1F4218_BC0A_4f09_B6CE_B4D878A3952C" tpos="10" ea_localid="1945" ea_eleType="element"/>
 				<properties documentation="Combination of two Items which mutually enhance one another.&#xA;&#xA;WG Approval: 30/06/2022&#xA;&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-06-30 14:53:21" modified="2024-03-18 12:57:22" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-06-30 14:53:21" modified="2024-07-23 11:53:47" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3535,9 +3741,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_91272730_1D07_41a7_ACDF_37E42C9AF016" xmi:type="uml:Class" name="epo-cat:ItemComposition" scope="public">
-				<model package="EAPK_789F6532_92B8_4618_8DF0_FCB72A894B5A" tpos="11" ea_localid="1922" ea_eleType="element"/>
+				<model package="EAPK_5C1F4218_BC0A_4f09_B6CE_B4D878A3952C" tpos="11" ea_localid="1922" ea_eleType="element"/>
 				<properties documentation="Inclusion of an Item into in the described Item.&#xA;&#xA;Additional Information:&#xA;The Item is provided with its components, however, the component Items may also be provided separately. &#xA;For example, a bicycle has wheels as components, but they may be provided as spare parts as well. &#xA;This relation is useful to describe different package levels of an item or hierarchies of Items.&#xA;&#xA;WG Approval: 19/05/2022&#xA;&#xA;&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-06-02 08:48:22" modified="2024-03-18 12:57:22" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-06-02 08:48:22" modified="2024-07-23 11:53:47" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3548,9 +3754,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" xmi:type="uml:Class" name="epo-cat:ItemProperty" scope="public">
-				<model package="EAPK_789F6532_92B8_4618_8DF0_FCB72A894B5A" tpos="12" ea_localid="1940" ea_eleType="element"/>
+				<model package="EAPK_5C1F4218_BC0A_4f09_B6CE_B4D878A3952C" tpos="12" ea_localid="1940" ea_eleType="element"/>
 				<properties documentation="Construct meant to represent the association between an attribute defined in an external classification scheme and the value ascribed to it.&#xA;&#xA;WG approval 26/07/2022" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-06-14 15:20:37" modified="2024-03-18 12:57:22" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-06-14 15:20:37" modified="2024-07-23 11:53:47" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3565,7 +3771,7 @@
 						<coords ordered="0"/>
 						<containment containment="Not Specified" position="0"/>
 						<stereotype/>
-						<bounds lower="1" upper="1"/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
@@ -3580,7 +3786,7 @@
 						<coords ordered="0"/>
 						<containment containment="Not Specified" position="1"/>
 						<stereotype/>
-						<bounds lower="1" upper="1"/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
@@ -3602,6 +3808,21 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
+					<attribute xmi:idref="EAID_A3429F90_694B_4ab8_9E58_20178484918E" name="dct:title" scope="Public">
+						<initial/>
+						<documentation/>
+						<model ea_localid="2635" ea_guid="{A3429F90-694B-4ab8-9E58-20178484918E}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="3"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
 				</attributes>
 				<links>
 					<Association xmi:id="EAID_0692BD51_5113_4e40_A80A_3CDDD84D3629" start="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
@@ -3609,9 +3830,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_09632AAB_48D4_4308_9EFD_D1D4C65E36F5" xmi:type="uml:Class" name="epo-cat:ItemModel" scope="public">
-				<model package="EAPK_789F6532_92B8_4618_8DF0_FCB72A894B5A" tpos="13" ea_localid="1636" ea_eleType="element"/>
+				<model package="EAPK_5C1F4218_BC0A_4f09_B6CE_B4D878A3952C" tpos="13" ea_localid="1636" ea_eleType="element"/>
 				<properties documentation="A specific design or version of a product or service.&#xA;&#xA;Additional information:&#xA;This class is meant as a reusable reference to the model name rather than as a set of specifications of an Item of this particular model. &#xA;&#xA;WG acceptance 10/03/2022&#xA;&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-03-10 16:18:50" modified="2024-03-18 12:57:22" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-03-10 16:18:50" modified="2024-07-23 11:53:47" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3639,9 +3860,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967" xmi:type="uml:Class" name="epo-cat:ItemRelation" scope="public">
-				<model package="EAPK_789F6532_92B8_4618_8DF0_FCB72A894B5A" tpos="14" ea_localid="1925" ea_eleType="element"/>
+				<model package="EAPK_5C1F4218_BC0A_4f09_B6CE_B4D878A3952C" tpos="14" ea_localid="1925" ea_eleType="element"/>
 				<properties documentation="Connection between two Items.&#xA;&#xA;WG Approval: 30/06/2022&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-06-02 09:09:21" modified="2024-03-18 12:57:22" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-06-02 09:09:21" modified="2024-07-23 11:53:47" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3675,9 +3896,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_2A83453A_6317_4d3a_AD67_90AB1BADD69E" xmi:type="uml:Class" name="epo-cat:ItemReplacement" scope="public">
-				<model package="EAPK_789F6532_92B8_4618_8DF0_FCB72A894B5A" tpos="15" ea_localid="1943" ea_eleType="element"/>
+				<model package="EAPK_5C1F4218_BC0A_4f09_B6CE_B4D878A3952C" tpos="15" ea_localid="1943" ea_eleType="element"/>
 				<properties documentation="Supplantment, displacement or suspension of an Item by the described Item.&#xA;&#xA;WG Approval: 30/06/2022&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-06-30 14:50:41" modified="2024-03-18 12:57:22" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-06-30 14:50:41" modified="2024-07-23 11:53:47" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3688,9 +3909,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_BF6CDA1F_72FC_476b_A3AA_F15FF0357167" xmi:type="uml:Class" name="epo-cat:ItemRequirement" scope="public">
-				<model package="EAPK_789F6532_92B8_4618_8DF0_FCB72A894B5A" tpos="16" ea_localid="1921" ea_eleType="element"/>
+				<model package="EAPK_5C1F4218_BC0A_4f09_B6CE_B4D878A3952C" tpos="16" ea_localid="1921" ea_eleType="element"/>
 				<properties documentation="Necessity of an Item by the described item. &#xA;&#xA;Additional Information:&#xA;The described item is provided without other items that are required for proper functionality.&#xA;&#xA;For example, a printer cannot be used without ink cartridge; or a Server cannot be used without its installation. &#xA;&#xA;WG Approval: 19/05/2022&#xA;&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-06-02 08:46:35" modified="2024-03-18 12:57:22" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-06-02 08:46:35" modified="2024-07-23 11:53:47" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3701,9 +3922,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" xmi:type="uml:Class" name="epo-cat:Price" scope="public">
-				<model package="EAPK_789F6532_92B8_4618_8DF0_FCB72A894B5A" tpos="17" ea_localid="1831" ea_eleType="element"/>
+				<model package="EAPK_5C1F4218_BC0A_4f09_B6CE_B4D878A3952C" tpos="17" ea_localid="1831" ea_eleType="element"/>
 				<properties documentation="Amount of money required or given in exchange for Items.&#xA;&#xA;Additional information:&#xA;The Price excludes any charges (such as taxes, duties and fees) and discounts.&#xA;&#xA;WG approval 26/07/2022" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-05-05 15:42:19" modified="2024-03-18 12:57:22" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-05-05 15:42:19" modified="2024-07-23 11:53:47" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3713,6 +3934,7 @@
 					<Association xmi:id="EAID_15B1CFC6_0B95_4c94_B742_4DC2F5EAF55E" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA"/>
 					<Association xmi:id="EAID_1F622DE3_2DEE_491f_A5F1_B592E89F9030" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
 					<Association xmi:id="EAID_45B983F5_7502_49f2_984C_17FF6E47F8F9" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
+					<Association xmi:id="EAID_47E28283_E9BB_4790_9AB4_37A6F31DF36A" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
 					<Association xmi:id="EAID_4F4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831"/>
 					<Association xmi:id="EAID_6D569FED_815F_45f4_87EA_C0E83DC5C9AF" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
 					<Association xmi:id="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
@@ -3720,15 +3942,16 @@
 					<Association xmi:id="EAID_A0FABF7A_1814_4dd4_BD97_28BD0C9F2F49" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
 					<Dependency xmi:id="EAID_A4EABD09_62ED_4add_B6AB_525BE36FDC06" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_E89B28AF_BD5D_429d_9A62_EC5FCB2442FF"/>
 					<Association xmi:id="EAID_DF35A308_9DDF_4d5b_980E_9D85403496D0" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
+					<Association xmi:id="EAID_02BBBEAA_ED71_4eaf_B786_4BBE7F52C5D5" start="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" end="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
 					<Association xmi:id="EAID_1F2E5010_8DA9_46f5_A0D6_59757CEC226D" start="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" end="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
 					<Association xmi:id="EAID_3C28A6D1_3F44_48a1_A013_1A7BA2859AFA" start="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" end="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
 					<Association xmi:id="EAID_5E6E2C47_4590_4730_B50C_8F40D73778CB" start="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" end="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_0B2ADA0F_0895_4cee_BF7A_BF9E5E76BDCC" xmi:type="uml:Class" name="epo-cat:ProductSpecification" scope="public">
-				<model package="EAPK_789F6532_92B8_4618_8DF0_FCB72A894B5A" tpos="18" ea_localid="1715" ea_eleType="element"/>
+				<model package="EAPK_5C1F4218_BC0A_4f09_B6CE_B4D878A3952C" tpos="18" ea_localid="1715" ea_eleType="element"/>
 				<properties documentation="Document providing information about an Item. &#xA;&#xA;WG approval 07/04/2022&#xA;&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-04-07 16:29:28" modified="2024-03-18 12:57:22" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-07 16:29:28" modified="2024-07-23 11:53:47" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3740,9 +3963,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD" xmi:type="uml:Class" name="epo-cat:Manufacturer" scope="public">
-				<model package="EAPK_789F6532_92B8_4618_8DF0_FCB72A894B5A" tpos="19" ea_localid="1605" ea_eleType="element"/>
+				<model package="EAPK_5C1F4218_BC0A_4f09_B6CE_B4D878A3952C" tpos="19" ea_localid="1605" ea_eleType="element"/>
 				<properties documentation="The Producer of goods or provider of services. &#xA;&#xA;Additional Information:&#xA;Also, known as Supplier and Manufacturer.&#xA;&#xA;We do not care who provides these service or products we care with whom Business is done.&#xA;&#xA;PEPPOL - Invoice:&#xA;The Supplier is the Legal Person or Organisation who provides a product and/or service.&#xA;&#xA;PEPPOL - Order: The supplier is the legal person or organisation who provides a product or service.&#xA;Examples of supplier roles: seller, despatch party, creditor, economic operator.&#xA;&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-02-17 15:04:50" modified="2024-03-18 12:57:22" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-02-17 15:04:50" modified="2024-07-23 11:53:47" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3756,9 +3979,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" xmi:type="uml:Class" name="epo-cat:Catalogue" scope="public">
-				<model package="EAPK_789F6532_92B8_4618_8DF0_FCB72A894B5A" tpos="22" ea_localid="1056" ea_eleType="element"/>
+				<model package="EAPK_5C1F4218_BC0A_4f09_B6CE_B4D878A3952C" tpos="22" ea_localid="1056" ea_eleType="element"/>
 				<properties documentation="A Document describing a set of Items offered for purchase that can be processed in an electronic way.&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="jseguraf" version="1.0" phase="1.0" created="2021-01-12 16:31:41" modified="2024-03-18 12:57:22" complexity="1" status="Proposed"/>
+				<project author="jseguraf" version="1.0" phase="1.0" created="2021-01-12 16:31:41" modified="2024-07-23 11:53:47" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3796,9 +4019,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" xmi:type="uml:Class" name="epo-cat:CatalogueLine" scope="public">
-				<model package="EAPK_789F6532_92B8_4618_8DF0_FCB72A894B5A" tpos="23" ea_localid="1057" ea_eleType="element"/>
+				<model package="EAPK_5C1F4218_BC0A_4f09_B6CE_B4D878A3952C" tpos="23" ea_localid="1057" ea_eleType="element"/>
 				<properties documentation="Aggregated information about the Terms and specifications for procuring an Item.&#xA;&#xA;&#xA;Details about an Item, like Prices, packaging, discounts, special promotions, etc.&#xA;&#xA;&#xA;TC 440:&#xA;&#xA;Detailed information of an Item, Price and its composition in a Catalogue.&#xA;&#xA;Composition: e.g. information referring to its description, how to order it, what it is made of, properties, delivery conditions, etc.&#xA;&#xA;&#xA;&#xA;&#xA;&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="paula" version="1.0" phase="1.0" created="2021-03-23 15:26:51" modified="2024-03-18 12:57:22" complexity="1" status="Proposed"/>
+				<project author="paula" version="1.0" phase="1.0" created="2021-03-23 15:26:51" modified="2024-07-23 11:53:47" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3914,9 +4137,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E" xmi:type="uml:Class" name="epo-cat:Batch" scope="public">
-				<model package="EAPK_789F6532_92B8_4618_8DF0_FCB72A894B5A" tpos="24" ea_localid="1632" ea_eleType="element"/>
+				<model package="EAPK_5C1F4218_BC0A_4f09_B6CE_B4D878A3952C" tpos="24" ea_localid="1632" ea_eleType="element"/>
 				<properties documentation="A production Lot in which the Item instances were produced. &#xA;&#xA;WG Acceptance 10/03/2022&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-03-10 15:05:53" modified="2024-03-18 12:57:22" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-03-10 15:05:53" modified="2024-07-23 11:53:47" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3975,9 +4198,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" xmi:type="uml:Class" name="epo-cat:Item" scope="public">
-				<model package="EAPK_789F6532_92B8_4618_8DF0_FCB72A894B5A" tpos="25" ea_localid="1062" ea_eleType="element"/>
+				<model package="EAPK_5C1F4218_BC0A_4f09_B6CE_B4D878A3952C" tpos="25" ea_localid="1062" ea_eleType="element"/>
 				<properties documentation="A product, work, service or any combination of them.&#xA;&#xA;Additional Information:&#xA;An Item can be an atomic Thing or a composition of things that together are seen as a unit, e.g. a tetrabrik of milk or an indivisible package of six tetrabriks.&#xA;&#xA;No distinction is provided between services, goods and works to leave room for innovation.&#xA;&#xA;WG approval 30/06/2022" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-06 12:55:13" modified="2024-03-18 12:57:22" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-06 12:55:13" modified="2024-07-23 11:53:47" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4085,6 +4308,7 @@
 					<Association xmi:id="EAID_3570E246_3BA3_4795_8084_FD257C99FB89" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
 					<Association xmi:id="EAID_455C76C8_B834_46d5_A5CA_93F12F0E5824" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_0B2ADA0F_0895_4cee_BF7A_BF9E5E76BDCC"/>
 					<Association xmi:id="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					<Association xmi:id="EAID_52CB7369_B0C2_4acc_A513_76150076F808" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
 					<Association xmi:id="EAID_574DB5D8_4929_4670_9014_608B3C5534ED" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
 					<Association xmi:id="EAID_6749101F_45CB_45ba_9792_E3508C6FE92A" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39"/>
 					<Dependency xmi:id="EAID_7EF1D4F7_398F_4f04_A19A_C5D793FA14E3" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12"/>
@@ -4111,10 +4335,10 @@
 					<Association xmi:id="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807" start="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
 				</links>
 			</element>
-			<element xmi:idref="EAPK_27F0F3F5_D4BC_4df2_A79B_26C72684E33F" xmi:type="uml:Package" name="controlled vocabularies" scope="public">
-				<model package2="EAID_27F0F3F5_D4BC_4df2_A79B_26C72684E33F" package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" tpos="3" ea_localid="239" ea_eleType="package"/>
+			<element xmi:idref="EAPK_803AC905_1BBF_478d_A943_5EE4B99F6A19" xmi:type="uml:Package" name="controlled vocabularies" scope="public">
+				<model package2="EAID_803AC905_1BBF_478d_A943_5EE4B99F6A19" package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" tpos="3" ea_localid="270" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 12:57:30" modified="2024-03-18 12:57:30" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:53:35" modified="2024-07-23 11:53:35" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4122,13 +4346,13 @@
 				<extendedProperties tagged="0" package_name="catalogue"/>
 				<packageproperties version="1.0" tpos="3"/>
 				<paths/>
-				<times created="2024-03-18 12:57:29" modified="2024-03-18 12:57:29"/>
+				<times created="2024-07-23 11:53:35" modified="2024-07-23 11:53:35"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAID_C3684D7C_E07D_415a_B935_B52376928738" xmi:type="uml:Enumeration" name="at-voc-new:document-type" scope="public">
-				<model package="EAPK_27F0F3F5_D4BC_4df2_A79B_26C72684E33F" tpos="0" ea_localid="2201" ea_eleType="element"/>
-				<properties documentation="Peppol uses a Document Type code including the code list UNCL1001:&#xA;&#xA;https://docs.peppol.eu/poacc/upgrade-3/2022-Q4/codelist/UNCL1001_T01/&#xA;&#xA;https://docs.peppol.eu/poacc/upgrade-3/syntax/Catalogue/cac-CatalogueLine/cac-Item/cac-ItemSpecificationDocumentReference/cbc-DocumentTypeCode/&#xA;https://docs.peppol.eu/poacc/upgrade-3/codelist/UNCL1001/&#xA;https://docs.peppol.eu/poacc/upgrade-3/codelist/Image/" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-11-21 16:02:14" modified="2024-03-18 12:57:39" complexity="1" status="Proposed"/>
+				<model package="EAPK_803AC905_1BBF_478d_A943_5EE4B99F6A19" tpos="0" ea_localid="2201" ea_eleType="element"/>
+				<properties documentation="Peppol uses a Document Type code including the code list UNCL1001:&#xA;&#xA;for ordering:&#xA;https://docs.peppol.eu/poacc/upgrade-3/2022-Q4/codelist/UNCL1001_T01/&#xA;&#xA;for catalogue:&#xA;https://docs.peppol.eu/poacc/upgrade-3/syntax/Catalogue/cac-CatalogueLine/cac-Item/cac-ItemSpecificationDocumentReference/cbc-DocumentTypeCode/&#xA;https://docs.peppol.eu/poacc/upgrade-3/codelist/UNCL1001/&#xA;https://docs.peppol.eu/poacc/upgrade-3/codelist/Image/&#xA;&#xA;for invoicing:&#xA;https://docs.peppol.eu/poacc/billing/3.0/codelist/UNCL1001-inv/" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-11-21 16:02:14" modified="2024-07-23 11:54:14" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4140,9 +4364,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_E89B28AF_BD5D_429d_9A62_EC5FCB2442FF" xmi:type="uml:Enumeration" name="at-voc-new:price-type" scope="public">
-				<model package="EAPK_27F0F3F5_D4BC_4df2_A79B_26C72684E33F" tpos="0" ea_localid="2200" ea_eleType="element"/>
+				<model package="EAPK_803AC905_1BBF_478d_A943_5EE4B99F6A19" tpos="0" ea_localid="2200" ea_eleType="element"/>
 				<properties documentation="Peppol used the UNCL5387 list for this purpose:&#xA;&#xA;https://docs.peppol.eu/pracc/catalogue/1.0/codelist/UNCL5387/&#xA;https://service.unece.org/trade/untdid/d95b/uncl/uncl5387.htm" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-11-21 15:34:29" modified="2024-03-18 12:57:39" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-11-21 15:34:29" modified="2024-07-23 11:54:14" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4153,9 +4377,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A" xmi:type="uml:Enumeration" name="at-voc-new:tax-category" scope="public">
-				<model package="EAPK_27F0F3F5_D4BC_4df2_A79B_26C72684E33F" tpos="27" ea_localid="1964" ea_eleType="element"/>
+				<model package="EAPK_803AC905_1BBF_478d_A943_5EE4B99F6A19" tpos="27" ea_localid="1964" ea_eleType="element"/>
 				<properties documentation="&#xA;Additional Information:&#xA;https://service.unece.org/trade/untdid/d97a/uncl/uncl5305.htm&#xA;" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-07-14 17:29:00" modified="2024-03-18 12:57:39" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-07-14 17:29:00" modified="2024-07-23 11:54:14" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4166,9 +4390,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_33A89700_846B_47cb_93D9_9D4729194EA6" xmi:type="uml:Enumeration" name="at-voc-new:tax-scheme" scope="public">
-				<model package="EAPK_27F0F3F5_D4BC_4df2_A79B_26C72684E33F" tpos="28" ea_localid="1965" ea_eleType="element"/>
+				<model package="EAPK_803AC905_1BBF_478d_A943_5EE4B99F6A19" tpos="28" ea_localid="1965" ea_eleType="element"/>
 				<properties documentation="Additional Information:&#xA;https://service.unece.org/trade/untdid/d00a/tred/tred5153.htm&#xA;" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-07-14 17:29:18" modified="2024-03-18 12:57:39" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-07-14 17:29:18" modified="2024-07-23 11:54:14" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4179,9 +4403,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_823E0E4B_F4B6_4255_AE97_5140BE6021A2" xmi:type="uml:Enumeration" name="at-voc-new:delivery-item-type" scope="public">
-				<model package="EAPK_27F0F3F5_D4BC_4df2_A79B_26C72684E33F" tpos="29" ea_localid="1832" ea_eleType="element"/>
+				<model package="EAPK_803AC905_1BBF_478d_A943_5EE4B99F6A19" tpos="29" ea_localid="1832" ea_eleType="element"/>
 				<properties documentation="This is a controlled list indicating whether an Item is a product or service. &#xA;&#xA;Additional information:&#xA;For example possible values could be:&#xA;* SER - Trade Item is a service&#xA;* MTO - Trade Item is manufactured after Order&#xA;* VQ - Trade Item is variable measure Item, that is, the Quantity in the package is not fixed, and the Price for the Item varies with the Quantity&#xA;* RC - Trade Item is a returnable unit&#xA;&#xA;For example the list of possible Item types is available here: https://www.gs1.org/sites/default/files/docs/eancom/ean02s4/part3/dc245.htm&#xA;&#xA;" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-05-05 16:30:40" modified="2024-03-18 12:57:39" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-05-05 16:30:40" modified="2024-07-23 11:54:14" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4192,9 +4416,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12" xmi:type="uml:Enumeration" name="at-voc-new:item-classification" scope="public">
-				<model package="EAPK_27F0F3F5_D4BC_4df2_A79B_26C72684E33F" tpos="30" ea_localid="1638" ea_eleType="element"/>
+				<model package="EAPK_803AC905_1BBF_478d_A943_5EE4B99F6A19" tpos="30" ea_localid="1638" ea_eleType="element"/>
 				<properties documentation="This reference stands for a context dependent controlled list:&#xA;CPV, UNSPC, UNCL7143 (for ordering)&#xA;&#xA;Needs to be aligned with eCatalogue in order to chose a codelist to be used." isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-03-10 16:49:12" modified="2024-03-18 12:57:39" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-03-10 16:49:12" modified="2024-07-23 11:54:14" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4205,22 +4429,23 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_B0937CD2_46D2_48d7_849F_409BCB726909" xmi:type="uml:Enumeration" name="at-voc-new:dangerous-goods-list" scope="public">
-				<model package="EAPK_27F0F3F5_D4BC_4df2_A79B_26C72684E33F" tpos="31" ea_localid="1620" ea_eleType="element"/>
+				<model package="EAPK_803AC905_1BBF_478d_A943_5EE4B99F6A19" tpos="31" ea_localid="1620" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-02-24 16:16:05" modified="2024-03-18 12:57:39" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-02-24 16:16:05" modified="2024-07-23 11:54:14" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="controlled vocabularies"/>
 				<links>
+					<NoteLink xmi:id="EAID_57270DB3_8BAB_4bd4_9420_41F9921B71EF" start="EAID_BCDEE6F5_A44E_454a_A6FD_F7B270D8DE17" end="EAID_B0937CD2_46D2_48d7_849F_409BCB726909"/>
 					<Dependency xmi:id="EAID_9E47E1C8_547C_4dfc_AE71_4354D7B1ADDB" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_B0937CD2_46D2_48d7_849F_409BCB726909"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_9699B0FE_6E36_4f6f_B20D_CD7E6D58150A" xmi:type="uml:Enumeration" name="at-voc-new:activity-code" scope="public">
-				<model package="EAPK_27F0F3F5_D4BC_4df2_A79B_26C72684E33F" tpos="32" ea_localid="1801" ea_eleType="element"/>
+				<model package="EAPK_803AC905_1BBF_478d_A943_5EE4B99F6A19" tpos="32" ea_localid="1801" ea_eleType="element"/>
 				<properties documentation="Waiting for code list.&#xA;&#xA;Code that defines how the line should be applied to an existing eCatalogue.&#xA;&#xA;Additional information:&#xA;&#xA;Catalogue:&#xA;Legal codes on Catalogue header level:&#xA;&#xA;Add – Used when a catalogue is sent for the first time to the Catalogue Receiver referring to the contract in the header of the catalogue.&#xA;Replace – Replaces the entire catalogue referring to the contract. This is the default action.&#xA;Update – Updates a current catalogue.&#xA;Delete – deletes the entire catalogue&#xA;&#xA;Catalogue lines:&#xA;&#xA;Add – Used to add items to the catalogue.&#xA;Update – Used to update an item. The entire Catalogue Line is updated. Only used if Action code on header level is Update&#xA;Delete – Used to delete an entire Catalogue line. Only used if Action code on header level is Update.&#xA;" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-04-28 11:23:37" modified="2024-03-18 12:57:39" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-04-28 11:23:37" modified="2024-07-23 11:54:14" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4232,33 +4457,35 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_AEFD9686_5D49_4105_AEBB_8004EBB7007F" xmi:type="uml:Enumeration" name="at-voc-new:orderable-unit" scope="public">
-				<model package="EAPK_27F0F3F5_D4BC_4df2_A79B_26C72684E33F" tpos="33" ea_localid="1799" ea_eleType="element"/>
+				<model package="EAPK_803AC905_1BBF_478d_A943_5EE4B99F6A19" tpos="33" ea_localid="1799" ea_eleType="element"/>
 				<properties documentation="Waiting for code list." isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-04-28 11:18:57" modified="2024-03-18 12:57:39" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-04-28 11:18:57" modified="2024-07-23 11:54:14" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="controlled vocabularies"/>
 				<links>
+					<NoteLink xmi:id="EAID_6E211308_0015_4c99_8D6E_D6623AF6D2FF" start="EAID_05BF87EB_40D1_4fbc_98CF_2F9920D6FA83" end="EAID_AEFD9686_5D49_4105_AEBB_8004EBB7007F"/>
 					<Dependency xmi:id="EAID_8492830E_8275_4640_A08F_A44A8AA0EE1E" start="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" end="EAID_AEFD9686_5D49_4105_AEBB_8004EBB7007F"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_ABDB4F83_303C_49aa_86E4_C7A6A9388FE0" xmi:type="uml:Enumeration" name="at-voc-new:transaction-conditions" scope="public">
-				<model package="EAPK_27F0F3F5_D4BC_4df2_A79B_26C72684E33F" tpos="34" ea_localid="1800" ea_eleType="element"/>
+				<model package="EAPK_803AC905_1BBF_478d_A943_5EE4B99F6A19" tpos="34" ea_localid="1800" ea_eleType="element"/>
 				<properties documentation="Waiting for code list.&#xA;" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-04-28 11:20:46" modified="2024-03-18 12:57:39" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-04-28 11:20:46" modified="2024-07-23 11:54:14" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="controlled vocabularies"/>
 				<links>
+					<NoteLink xmi:id="EAID_3AF5D51C_E1E0_4756_A8FB_A636173FB8C1" start="EAID_05BF87EB_40D1_4fbc_98CF_2F9920D6FA83" end="EAID_ABDB4F83_303C_49aa_86E4_C7A6A9388FE0"/>
 					<Dependency xmi:id="EAID_727947BB_24E3_4f23_AB2D_F11A323AD4DB" start="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" end="EAID_ABDB4F83_303C_49aa_86E4_C7A6A9388FE0"/>
 				</links>
 			</element>
 			<element xmi:idref="EAPK_86DA858F_073B_49ae_8133_6704576FF802" xmi:type="uml:Package" name="catalogue response" scope="public">
-				<model package2="EAID_86DA858F_073B_49ae_8133_6704576FF802" package="EAPK_2C5CFA6C_02C3_4fc3_9AA8_74318B172290" tpos="2" ea_localid="214" ea_eleType="package"/>
+				<model package2="EAID_86DA858F_073B_49ae_8133_6704576FF802" package="EAPK_2C5CFA6C_02C3_4fc3_9AA8_74318B172290" tpos="0" ea_localid="214" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2023-09-27 16:21:53" modified="2023-09-27 16:21:53" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
@@ -4266,15 +4493,15 @@
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="Catalogue"/>
-				<packageproperties version="1.0" tpos="2"/>
+				<packageproperties version="1.0"/>
 				<paths/>
 				<times created="2023-09-27 16:21:53" modified="2023-09-27 16:21:53"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
 			</element>
-			<element xmi:idref="EAPK_434C478A_1DD4_4dbc_BC16_6DA0B0A6546B" xmi:type="uml:Package" name="diagrams" scope="public">
-				<model package2="EAID_434C478A_1DD4_4dbc_BC16_6DA0B0A6546B" package="EAPK_86DA858F_073B_49ae_8133_6704576FF802" tpos="1" ea_localid="240" ea_eleType="package"/>
+			<element xmi:idref="EAPK_227C7135_4084_44ed_B4B1_94E1D2E98D9B" xmi:type="uml:Package" name="diagrams" scope="public">
+				<model package2="EAID_227C7135_4084_44ed_B4B1_94E1D2E98D9B" package="EAPK_86DA858F_073B_49ae_8133_6704576FF802" tpos="1" ea_localid="272" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 12:57:55" modified="2024-03-18 12:57:55" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 13:21:41" modified="2024-07-23 13:21:41" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4282,13 +4509,13 @@
 				<extendedProperties tagged="0" package_name="catalogue response"/>
 				<packageproperties version="1.0" tpos="1"/>
 				<paths/>
-				<times created="2024-03-18 12:57:55" modified="2024-03-18 12:57:55"/>
+				<times created="2024-07-23 13:21:41" modified="2024-07-23 13:21:41"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
-			<element xmi:idref="EAPK_8B4601F4_9768_420f_8279_29494481FDD5" xmi:type="uml:Package" name="classes" scope="public">
-				<model package2="EAID_8B4601F4_9768_420f_8279_29494481FDD5" package="EAPK_86DA858F_073B_49ae_8133_6704576FF802" tpos="2" ea_localid="241" ea_eleType="package"/>
+			<element xmi:idref="EAPK_DD84FBD9_2B0D_41ac_A97A_C15CEBDF855D" xmi:type="uml:Package" name="classes" scope="public">
+				<model package2="EAID_DD84FBD9_2B0D_41ac_A97A_C15CEBDF855D" package="EAPK_86DA858F_073B_49ae_8133_6704576FF802" tpos="2" ea_localid="273" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 12:58:05" modified="2024-03-18 12:58:10" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 13:21:48" modified="2024-07-23 13:21:48" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4296,13 +4523,13 @@
 				<extendedProperties tagged="0" package_name="catalogue response"/>
 				<packageproperties version="1.0" tpos="2"/>
 				<paths/>
-				<times created="2024-03-18 12:58:05" modified="2024-03-18 12:58:05"/>
+				<times created="2024-07-23 13:21:48" modified="2024-07-23 13:21:48"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAID_02622AF6_D00A_4f62_ACF8_3ACA0F78EFF3" xmi:type="uml:Class" name="epo-cat:CatalogueResponse" scope="public">
-				<model package="EAPK_8B4601F4_9768_420f_8279_29494481FDD5" tpos="0" ea_localid="3242" ea_eleType="element"/>
+				<model package="EAPK_DD84FBD9_2B0D_41ac_A97A_C15CEBDF855D" tpos="0" ea_localid="3242" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-09-27 16:22:27" modified="2024-03-18 12:58:16" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-09-27 16:22:27" modified="2024-07-23 13:21:54" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4318,9 +4545,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_84590049_CB31_46ad_9E29_90E679D32C10" xmi:type="uml:Class" name="epo-cat:CatalogueResponseInformation" scope="public">
-				<model package="EAPK_8B4601F4_9768_420f_8279_29494481FDD5" tpos="0" ea_localid="3244" ea_eleType="element"/>
+				<model package="EAPK_DD84FBD9_2B0D_41ac_A97A_C15CEBDF855D" tpos="0" ea_localid="3244" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-09-27 16:30:58" modified="2024-03-18 12:58:16" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-09-27 16:30:58" modified="2024-07-23 13:21:54" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4334,9 +4561,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_025C0172_297F_4458_9268_2B10478B6736" xmi:type="uml:Class" name="epo-cat:CatalogueResponseLine" scope="public">
-				<model package="EAPK_8B4601F4_9768_420f_8279_29494481FDD5" tpos="0" ea_localid="3243" ea_eleType="element"/>
+				<model package="EAPK_DD84FBD9_2B0D_41ac_A97A_C15CEBDF855D" tpos="0" ea_localid="3243" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-09-27 16:22:51" modified="2024-03-18 12:58:17" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-09-27 16:22:51" modified="2024-07-23 13:21:54" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4350,7 +4577,7 @@
 				</links>
 			</element>
 			<element xmi:idref="EAPK_BC521AF3_1D7F_46b3_B0B7_5DEC1EE5E3EF" xmi:type="uml:Package" name="datatype" scope="public">
-				<model package2="EAID_BC521AF3_1D7F_46b3_B0B7_5DEC1EE5E3EF" package="EAPK_2C5CFA6C_02C3_4fc3_9AA8_74318B172290" tpos="3" ea_localid="159" ea_eleType="package"/>
+				<model package2="EAID_BC521AF3_1D7F_46b3_B0B7_5DEC1EE5E3EF" package="EAPK_2C5CFA6C_02C3_4fc3_9AA8_74318B172290" tpos="2" ea_localid="159" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
 				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:18:28" modified="2022-04-29 20:24:39" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
@@ -4358,7 +4585,7 @@
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="Catalogue"/>
-				<packageproperties version="1.0" tpos="3"/>
+				<packageproperties version="1.0" tpos="2"/>
 				<paths/>
 				<times created="2022-04-29 20:18:28" modified="2022-04-29 20:24:39" lastloaddate="2022-07-22 16:22:39" lastsavedate="2022-07-22 16:22:39"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" batchsave="0" batchload="0" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
@@ -4421,20 +4648,88 @@
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="datatype"/>
-			</element>
-			<element xmi:idref="EAID_2D6DF6F1_E0C7_46d0_BECB_8C5DF8DE3A0B" xmi:type="uml:DataType" name="xsd:integer" scope="public">
-				<model package="EAPK_BC521AF3_1D7F_46b3_B0B7_5DEC1EE5E3EF" tpos="0" ea_localid="1979" ea_eleType="element"/>
-				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:25:33" modified="2022-04-29 20:25:38" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
-				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+			<element xmi:idref="EAID_2D6DF6F1_E0C7_46d0_BECB_8C5DF8DE3A0B" xmi:type="uml:DataType" name="xsd:integer" scope="public">
+				<model package="EAPK_BC521AF3_1D7F_46b3_B0B7_5DEC1EE5E3EF" tpos="0" ea_localid="1979" ea_eleType="element"/>
+				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:25:33" modified="2022-04-29 20:25:38" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+		</elements>
+		<connectors>
+			<connector xmi:idref="EAID_3AF5D51C_E1E0_4756_A8FB_A636173FB8C1">
+				<source xmi:idref="EAID_05BF87EB_40D1_4fbc_98CF_2F9920D6FA83">
+					<model ea_localid="3025" type="Note"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ABDB4F83_303C_49aa_86E4_C7A6A9388FE0">
+					<model ea_localid="1800" type="Enumeration" name="at-voc-new:transaction-conditions"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4631"/>
+				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
 				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_6E211308_0015_4c99_8D6E_D6623AF6D2FF">
+				<source xmi:idref="EAID_05BF87EB_40D1_4fbc_98CF_2F9920D6FA83">
+					<model ea_localid="3025" type="Note"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_AEFD9686_5D49_4105_AEBB_8004EBB7007F">
+					<model ea_localid="1799" type="Enumeration" name="at-voc-new:orderable-unit"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4632"/>
+				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="datatype"/>
-			</element>
-		</elements>
-		<connectors>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_89FDF957_97A3_47f3_98F1_B3229B558EC4">
 				<source xmi:idref="EAID_7C89A04E_6BCC_4cb8_B4DC_76817402265D">
 					<model ea_localid="1970" type="ProxyConnector" name="ProxyConnector"/>
@@ -4468,6 +4763,40 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_57270DB3_8BAB_4bd4_9420_41F9921B71EF">
+				<source xmi:idref="EAID_BCDEE6F5_A44E_454a_A6FD_F7B270D8DE17">
+					<model ea_localid="1621" type="Note"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_B0937CD2_46D2_48d7_849F_409BCB726909">
+					<model ea_localid="1620" type="Enumeration" name="at-voc-new:dangerous-goods-list"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="2736"/>
+				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_0F0A4585_C0E2_4438_81E0_5F41FAE01E73">
 				<source xmi:idref="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A">
 					<model ea_localid="2585" type="Class" name="epo-cat:InformationHub"/>
@@ -4639,6 +4968,40 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_6906866E_320E_4e58_A7DD_49C8A3F9638B">
+				<source xmi:idref="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48">
+					<model ea_localid="3599" type="Class" name="epo-inv:PaymentInstructionsInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A">
+					<model ea_localid="2585" type="Class" name="epo-cat:InformationHub"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5342"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_74FDD051_8991_4328_BB5F_DB2625DE81D1">
 				<source xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8">
 					<model ea_localid="2023" type="Class" name="epo-ful:ShipmentInformation"/>
@@ -4775,6 +5138,74 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_DCA67557_A587_48db_87FC_5179F7A10647">
+				<source xmi:idref="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D">
+					<model ea_localid="3601" type="Class" name="epo-inv:CreditTransferInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A">
+					<model ea_localid="2585" type="Class" name="epo-cat:InformationHub"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5439"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_E1227B02_660A_4a25_9EF1_B1E472EB8A4A">
+				<source xmi:idref="EAID_D2275688_DA87_4409_B1D5_7AAEA8D7B844">
+					<model ea_localid="3608" type="Class" name="epo-inv:PaymentCardInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A">
+					<model ea_localid="2585" type="Class" name="epo-cat:InformationHub"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5440"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_F38D2FE9_AA8F_4ecb_A19A_9A7A0B30CF7E">
 				<source xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4">
 					<model ea_localid="2818" type="Class" name="epo-ord:TaxInformation"/>
@@ -5015,6 +5446,40 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_CF00A26F_CB76_4971_854A_CE68DE5CB673">
+				<source xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+					<model ea_localid="3581" type="Class" name="epo-inv:InvoiceLine"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7">
+					<model ea_localid="2584" type="Class" name="epo-cat:Line"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5329"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_233516AD_8114_473d_B8A6_42826FC39635">
 				<source xmi:idref="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B">
 					<model ea_localid="3099" type="Class" name="epo-cat:PostAwardDocument"/>
@@ -5149,6 +5614,40 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_387C6C7A_CC14_4b5e_BAB7_F3D1FB910F35">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B">
+					<model ea_localid="3099" type="Class" name="epo-cat:PostAwardDocument"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5328"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_51057DA3_81A5_4e16_A7F9_22D9EFCB1693">
 				<source xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0">
 					<model ea_localid="1056" type="Class" name="epo-cat:Catalogue"/>
@@ -5376,13 +5875,48 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2760"/>
+				<model ea_localid="2760"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-cat:hasBrand"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_363E463C_04A8_41ba_94C0_F1ACF5EF8818">
+				<source xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831">
+					<model ea_localid="1960" type="Class" name="epo-cat:ChargeInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+					<model ea_localid="3581" type="Class" name="epo-inv:InvoiceLine"/>
+					<role name="epo-inv:isSpecificToInvoiceLine" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5358"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:hasBrand"/>
+				<labels rb="0..*" rt="+epo-inv:isSpecificToInvoiceLine"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -5527,6 +6061,76 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_6AA08C54_54FE_402e_8B58_8804E01D8889">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831">
+					<model ea_localid="1960" type="Class" name="epo-cat:ChargeInformation"/>
+					<role name="epo-cat:specifiesChargeInformation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5357"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-cat:specifiesChargeInformation"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_6DA6B6C9_7964_4102_A413_050778056B72">
+				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
+					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831">
+					<model ea_localid="1960" type="Class" name="epo-cat:ChargeInformation"/>
+					<role name="epo-ful:hasFreightCharge" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5401"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The total cost for moving the goods.&#xA;&#xA;WG approval 18/06/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-ful:hasFreightCharge"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_7A1163CB_9C26_4b4f_BCD6_23ABF38C12BE">
 				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
 					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
@@ -6047,6 +6651,41 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_47E28283_E9BB_4790_9AB4_37A6F31DF36A">
+				<source xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
+					<model ea_localid="1831" type="Class" name="epo-cat:Price"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasGrossMonetaryValue" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5422"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-ord:hasGrossMonetaryValue"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_6D569FED_815F_45f4_87EA_C0E83DC5C9AF">
 				<source xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
 					<model ea_localid="1831" type="Class" name="epo-cat:Price"/>
@@ -6255,6 +6894,41 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_02BBBEAA_ED71_4eaf_B786_4BBE7F52C5D5">
+				<source xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+					<model ea_localid="3581" type="Class" name="epo-inv:InvoiceLine"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
+					<model ea_localid="1831" type="Class" name="epo-cat:Price"/>
+					<role name="epo-cat:hasPrice" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5385"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1..*" rt="+epo-cat:hasPrice"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_1F2E5010_8DA9_46f5_A0D6_59757CEC226D">
 				<source xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A">
 					<model ea_localid="2037" type="Class" name="epo-ord:OrderLine"/>
@@ -6270,7 +6944,7 @@
 				<target xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
 					<model ea_localid="1831" type="Class" name="epo-cat:Price"/>
 					<role name="epo-cat:hasPrice" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -6284,7 +6958,7 @@
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:hasPrice"/>
+				<labels rb="0..*" rt="+epo-cat:hasPrice"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -7279,13 +7953,13 @@
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation value="The source country of the product or service.&#xA;&#xA;Additional Information:&#xA;&#xA;The country of origin can be provided by  the buyer as a requirement or by the tenderer information of the item to be provided.&#xA;&#xA;WG Approval 07/01/2020&#xA;"/>
+					<documentation value="&#xA;"/>
 					<xrefs/>
 					<tags/>
 				</target>
 				<model ea_localid="2642"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation/>
+				<documentation value="The source country of the product or service.&#xA;&#xA;Additional Information:&#xA;&#xA;The country of origin can be provided by  the buyer as a requirement or by the tenderer information of the item to be provided.&#xA;&#xA;WG Approval 07/01/2020"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-cat:hasCountryOfOrigin"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -7468,6 +8142,41 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_52CB7369_B0C2_4acc_A513_76150076F808">
+				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
+					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-inv:hasItemClassificationIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5423"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-inv:hasItemClassificationIdentifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_574DB5D8_4929_4670_9014_608B3C5534ED">
 				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
 					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
@@ -8275,44 +8984,49 @@
 		<profiles/>
 		<diagrams>
 			<diagram xmi:id="EAID_F9772628_760B_4fc2_93CE_AA8849709931">
-				<model package="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172" localID="125" owner="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172" tpos="1"/>
+				<model package="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2" localID="125" owner="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2" tpos="1"/>
 				<properties name="catalogue" type="Logical"/>
-				<project author="paula" version="1.0" created="2021-03-23 15:02:56" modified="2023-09-27 16:57:03"/>
+				<project author="paula" version="1.0" created="2021-03-23 15:02:56" modified="2024-07-11 13:50:52"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=558E816A;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=8E789C4E;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
 					<element geometry="Left=1044;Top=267;Right=1173;Bottom=308;" subject="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" seqno="1" style="DUID=2361CE95;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1292;Top=258;Right=1382;Bottom=318;" subject="EAID_C3684D7C_E07D_415a_B935_B52376928738" seqno="2" style="DUID=FEBDD185;"/>
-					<element geometry="Left=699;Top=313;Right=783;Bottom=357;" subject="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" seqno="3" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=79C78D09;"/>
-					<element geometry="Left=664;Top=587;Right=883;Bottom=657;" subject="EAID_96B284C4_E759_4bad_9655_04521F703750" seqno="4" style="DUID=A8EF34D7;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=535;Top=587;Right=625;Bottom=657;" subject="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" seqno="5" style="DUID=20F6A736;NSL=0;"/>
-					<element geometry="Left=535;Top=488;Right=625;Bottom=553;" subject="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62" seqno="6" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=6DFF0708;"/>
-					<element geometry="Left=1529;Top=217;Right=1745;Bottom=357;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="7" style="DUID=37C2F8C4;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1750;Top=449;Right=1996;Bottom=681;" subject="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" seqno="8" style="DUID=867CF2B1;"/>
-					<element geometry="Left=1430;Top=803;Right=1655;Bottom=873;" subject="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" seqno="9" style="DUID=32B33171;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=2165;Top=466;Right=2301;Bottom=516;" subject="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" seqno="10" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;AttPub=0;AttCustom=0;OpCustom=0;RzO=1;DUID=AF71A47B;"/>
-					<element geometry="Left=2188;Top=535;Right=2278;Bottom=595;" subject="EAID_B0937CD2_46D2_48d7_849F_409BCB726909" seqno="11" style="DUID=16248F6B;"/>
-					<element geometry="Left=1425;Top=449;Right=1515;Bottom=509;" subject="EAID_AEFD9686_5D49_4105_AEBB_8004EBB7007F" seqno="12" style="DUID=1042ECC9;"/>
-					<element geometry="Left=1286;Top=449;Right=1376;Bottom=509;" subject="EAID_ABDB4F83_303C_49aa_86E4_C7A6A9388FE0" seqno="13" style="DUID=46F9B6C8;"/>
-					<element geometry="Left=1828;Top=823;Right=1958;Bottom=893;" subject="EAID_A3E8B06E_AAC4_4ee6_8057_BBB2E7E570FE" seqno="14" style="DUID=62E4F7EF;"/>
-					<element geometry="Left=1220;Top=70;Right=1415;Bottom=233;" subject="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" seqno="15" style="DUID=ACDC49D7;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=2188;Top=619;Right=2278;Bottom=679;" subject="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12" seqno="16" style="DUID=735B8480;"/>
-					<element geometry="Left=2128;Top=737;Right=2278;Bottom=777;" subject="EAID_823E0E4B_F4B6_4255_AE97_5140BE6021A2" seqno="17" style="DUID=4909A0BB;"/>
-					<element geometry="Left=869;Top=96;Right=1088;Bottom=207;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="18" style="DUID=A69866DA;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=532;Top=394;Right=628;Bottom=459;" subject="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6" seqno="19" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=EA30341A;"/>
-					<element geometry="Left=532;Top=300;Right=622;Bottom=370;" subject="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" seqno="20" style="DUID=AAA821D2;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=625;Top=893;Right=740;Bottom=955;" subject="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD" seqno="21" style="DUID=67334F3F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=931;Top=9;Right=1027;Bottom=44;" subject="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" seqno="22" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=59B49E79;"/>
-					<element geometry="Left=2061;Top=233;Right=2284;Bottom=308;" subject="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E" seqno="23" style="DUID=90D7888D;"/>
-					<element geometry="Left=936;Top=374;Right=1215;Bottom=487;" subject="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" seqno="24" style="DUID=07349A0C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1244;Top=583;Right=1552;Bottom=707;" subject="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" seqno="25" style="DUID=231BBFE9;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=953;Top=693;Right=1165;Bottom=820;" subject="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" seqno="26" style="DUID=9075831F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1822;Top=89;Right=1977;Bottom=129;" subject="EAID_0B2ADA0F_0895_4cee_BF7A_BF9E5E76BDCC" seqno="27" style="DUID=E2865D92;"/>
-					<element geometry="Left=1681;Top=823;Right=1811;Bottom=893;" subject="EAID_09632AAB_48D4_4308_9EFD_D1D4C65E36F5" seqno="28" style="DUID=1EFDB7CD;"/>
-					<element geometry="SX=-118;SY=0;EX=0;EY=-5;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=132:CY=14:OX=4:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=953:-525$;" subject="EAID_52428053_29BF_4efe_807B_B6FA3BB29BF5" style="Mode=3;EOID=6DFF0708;SOID=07349A0C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="Left=1346;Top=357;Right=1461;Bottom=412;" subject="EAID_05BF87EB_40D1_4fbc_98CF_2F9920D6FA83" seqno="2" style="DUID=492C897E;"/>
+					<element geometry="Left=1292;Top=258;Right=1382;Bottom=318;" subject="EAID_C3684D7C_E07D_415a_B935_B52376928738" seqno="3" style="DUID=FEBDD185;"/>
+					<element geometry="Left=699;Top=313;Right=783;Bottom=357;" subject="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" seqno="4" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=79C78D09;"/>
+					<element geometry="Left=664;Top=587;Right=883;Bottom=657;" subject="EAID_96B284C4_E759_4bad_9655_04521F703750" seqno="5" style="DUID=A8EF34D7;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=535;Top=587;Right=625;Bottom=657;" subject="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" seqno="6" style="DUID=20F6A736;NSL=0;"/>
+					<element geometry="Left=535;Top=488;Right=625;Bottom=553;" subject="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62" seqno="7" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=6DFF0708;"/>
+					<element geometry="Left=1529;Top=217;Right=1745;Bottom=357;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="8" style="DUID=37C2F8C4;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1750;Top=449;Right=1996;Bottom=681;" subject="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" seqno="9" style="DUID=867CF2B1;"/>
+					<element geometry="Left=1430;Top=803;Right=1655;Bottom=873;" subject="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" seqno="10" style="DUID=32B33171;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=2165;Top=466;Right=2301;Bottom=516;" subject="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" seqno="11" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;AttPub=0;AttCustom=0;OpCustom=0;RzO=1;DUID=AF71A47B;"/>
+					<element geometry="Left=2337;Top=530;Right=2522;Bottom=600;" subject="EAID_BCDEE6F5_A44E_454a_A6FD_F7B270D8DE17" seqno="12" style="DUID=25C576E2;"/>
+					<element geometry="Left=2188;Top=535;Right=2278;Bottom=595;" subject="EAID_B0937CD2_46D2_48d7_849F_409BCB726909" seqno="13" style="DUID=16248F6B;"/>
+					<element geometry="Left=1425;Top=449;Right=1515;Bottom=509;" subject="EAID_AEFD9686_5D49_4105_AEBB_8004EBB7007F" seqno="14" style="DUID=1042ECC9;"/>
+					<element geometry="Left=1286;Top=449;Right=1376;Bottom=509;" subject="EAID_ABDB4F83_303C_49aa_86E4_C7A6A9388FE0" seqno="15" style="DUID=46F9B6C8;"/>
+					<element geometry="Left=1828;Top=823;Right=1958;Bottom=893;" subject="EAID_A3E8B06E_AAC4_4ee6_8057_BBB2E7E570FE" seqno="16" style="DUID=62E4F7EF;"/>
+					<element geometry="Left=1220;Top=70;Right=1415;Bottom=233;" subject="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" seqno="17" style="DUID=ACDC49D7;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=2188;Top=619;Right=2278;Bottom=679;" subject="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12" seqno="18" style="DUID=735B8480;"/>
+					<element geometry="Left=2128;Top=737;Right=2278;Bottom=777;" subject="EAID_823E0E4B_F4B6_4255_AE97_5140BE6021A2" seqno="19" style="DUID=4909A0BB;"/>
+					<element geometry="Left=2371;Top=703;Right=2486;Bottom=803;" subject="EAID_7C2498F5_4923_4199_A897_66E923299404" seqno="20" style="DUID=DF16104A;"/>
+					<element geometry="Left=869;Top=96;Right=1088;Bottom=207;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="21" style="DUID=A69866DA;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=532;Top=394;Right=628;Bottom=459;" subject="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6" seqno="22" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=EA30341A;"/>
+					<element geometry="Left=532;Top=300;Right=622;Bottom=370;" subject="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" seqno="23" style="DUID=AAA821D2;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=625;Top=893;Right=740;Bottom=955;" subject="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD" seqno="24" style="DUID=67334F3F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=931;Top=9;Right=1027;Bottom=44;" subject="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" seqno="25" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=59B49E79;"/>
+					<element geometry="Left=2061;Top=233;Right=2284;Bottom=308;" subject="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E" seqno="26" style="DUID=90D7888D;"/>
+					<element geometry="Left=936;Top=374;Right=1215;Bottom=487;" subject="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" seqno="27" style="DUID=07349A0C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1244;Top=583;Right=1552;Bottom=707;" subject="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" seqno="28" style="DUID=231BBFE9;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=953;Top=693;Right=1165;Bottom=820;" subject="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" seqno="29" style="DUID=9075831F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1822;Top=78;Right=1977;Bottom=118;" subject="EAID_0B2ADA0F_0895_4cee_BF7A_BF9E5E76BDCC" seqno="30" style="DUID=E2865D92;"/>
+					<element geometry="Left=1681;Top=823;Right=1811;Bottom=893;" subject="EAID_09632AAB_48D4_4308_9EFD_D1D4C65E36F5" seqno="31" style="DUID=1EFDB7CD;"/>
+					<element geometry="SX=0;SY=-20;EX=0;EY=-2;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=-1:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9BD8157E_3EB6_44da_84E5_92EF1E2753B3" style="Mode=3;EOID=EA30341A;SOID=07349A0C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-26;SY=0;EX=0;EY=-18;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=4:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1847:-305$;" subject="EAID_15464872_BFB6_40bb_84F1_8A3969FE662E" style="Mode=3;EOID=37C2F8C4;SOID=867CF2B1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=19;EX=-84;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=66:OY=27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1553:-546$;" subject="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA" style="Mode=3;EOID=37C2F8C4;SOID=867CF2B1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=0;SY=48;EX=-18;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=121:CY=14:OX=65:OY=63:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=12:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1619:-517$;" subject="EAID_E507D198_1A41_4b43_873A_F9E88411186D" style="Mode=3;EOID=37C2F8C4;SOID=867CF2B1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=1973;SCTR.TOP=-533;SCTR.RIGHT=2041;SCTR.BOTTOM=-518;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1996:-533$2041:-533$2041:-518$1996:-518$;" subject="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24" style="Mode=3;EOID=867CF2B1;SOID=867CF2B1;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=1973;SCTR.TOP=-461;SCTR.RIGHT=2021;SCTR.BOTTOM=-446;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1996:-461$2021:-461$2021:-446$1973:-446$1973:-449$;" subject="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F" style="Mode=3;EOID=867CF2B1;SOID=867CF2B1;Color=-1;LWidth=0;Hidden=1;"/>
@@ -8323,10 +9037,10 @@
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=93:CY=14:OX=60:OY=-27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9EDDC1AB_FC05_462d_A479_433862DD01D8" style="Mode=3;EOID=9075831F;SOID=07349A0C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-118;SY=0;EX=0;EY=3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=80:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=2:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=953:-332$;" subject="EAID_6089809C_E481_4fb3_9090_B37DC376C605" style="Mode=3;EOID=79C78D09;SOID=07349A0C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-68;SY=0;EX=0;EY=-3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=81:CY=14:OX=8:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1003:-625$;" subject="EAID_C00C71CA_F2D3_48ca_8D27_E3F34E3AF36B" style="Mode=3;EOID=A8EF34D7;SOID=07349A0C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=44;SY=0;EX=0;EY=31;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=27:OX=36:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1115:-607$;" subject="EAID_9DBEA51D_27BB_47b3_9536_602D5F0E8782" style="Mode=3;EOID=231BBFE9;SOID=07349A0C;Color=-1;LWidth=0;TREE=OS;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=38;SY=0;EX=0;EY=-61;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1146:-212$;" subject="EAID_618070AC_783D_48ae_9723_9C69BB0EB7B4" style="Mode=3;EOID=ACDC49D7;SOID=2361CE95;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=-20;EX=0;EY=-2;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=-1:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9BD8157E_3EB6_44da_84E5_92EF1E2753B3" style="Mode=3;EOID=EA30341A;SOID=07349A0C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=-69;EX=63;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=64:CY=27:OX=90:OY=-40:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1605:-634$;" subject="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65" style="Mode=3;EOID=32B33171;SOID=867CF2B1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=15;EY=4;SX=-118;SY=4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=141:CY=14:OX=72:OY=27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_BC94D054_08DB_4bb5_A279_498213B45F8E" style="Mode=3;EOID=A69866DA;SOID=07349A0C;Color=-1;LWidth=0;TREE=OS;Hidden=0;"/>
+					<element geometry="SX=61;SY=-35;EX=61;EY=-20;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=137:CY=14:OX=9:OY=-10:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F5E9960A_D7AE_4887_A89B_4A966BB6C9D3" style="Mode=3;EOID=4909A0BB;SOID=867CF2B1;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-118;SY=0;EX=0;EY=-5;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=132:CY=14:OX=4:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=953:-525$;" subject="EAID_52428053_29BF_4efe_807B_B6FA3BB29BF5" style="Mode=3;EOID=6DFF0708;SOID=07349A0C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_97C17D51_4DF6_4979_B308_C0F08C743DCF" style="Mode=3;EOID=ACDC49D7;SOID=A69866DA;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_FD687C05_7D35_48ab_B0AA_8C6787D5DF46" style="Mode=3;EOID=A8EF34D7;SOID=A69866DA;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_3EC00346_DC8E_4fd4_8A9A_9A4173CBD283" style="Mode=3;EOID=A8EF34D7;SOID=A69866DA;Color=-1;LWidth=0;Hidden=1;"/>
@@ -8338,11 +9052,13 @@
 					<element geometry="SX=85;SY=0;EX=-59;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=114:CY=27:OX=109:OY=-41:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-32:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F475E438_48A3_41f5_A736_268C91FF8AF2" style="Mode=3;EOID=32B33171;SOID=231BBFE9;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-111;SY=0;EX=0;EY=-20;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=101:CY=27:OX=4:OY=-24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=8:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1287:-776$;" subject="EAID_8FF88923_D9FB_4937_B866_FABECBC1DB55" style="Mode=3;EOID=9075831F;SOID=231BBFE9;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=114:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_233516AD_8114_473d_B8A6_42826FC39635" style="Mode=3;EOID=FEBDD185;SOID=2361CE95;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EX=15;EY=4;SX=-118;SY=4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=141:CY=14:OX=72:OY=27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_BC94D054_08DB_4bb5_A279_498213B45F8E" style="Mode=3;EOID=A69866DA;SOID=07349A0C;Color=-1;LWidth=0;TREE=OS;Hidden=0;"/>
-					<element geometry="EDGE=3;SX=0;SY=0;EX=0;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_DE55F8F3_DEA7_4350_A7EC_23ACD7626ADE" style="Mode=3;EOID=20F6A736;SOID=6DFF0708;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=44;SY=0;EX=0;EY=31;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=27:OX=36:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1115:-607$;" subject="EAID_9DBEA51D_27BB_47b3_9536_602D5F0E8782" style="Mode=3;EOID=231BBFE9;SOID=07349A0C;Color=-1;LWidth=0;TREE=OS;Hidden=0;"/>
+					<element geometry="EDGE=4;SX=4;SY=0;EX=4;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A88E2729_62D9_493c_8105_4D93D49DFA8A" style="Mode=3;EOID=AAA821D2;SOID=79C78D09;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=15;EX=0;EY=8;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=495:-909$495:-327$;" subject="EAID_D2C94CC0_A14F_4c9c_B4C0_912C9C11EC4E" style="Mode=3;EOID=AAA821D2;SOID=67334F3F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=-19;EX=32;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=50:OY=-23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2536:-943$2536:-43$1669:-43$;" subject="EAID_31D80540_9E04_44d6_B0B4_339ED74111CC" style="Mode=3;EOID=37C2F8C4;SOID=67334F3F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-9;SY=0;EX=1;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1890:-21$1109:-21$;" subject="EAID_7EFC644F_3191_4d57_B035_AE5068C30238" style="Mode=3;EOID=2361CE95;SOID=E2865D92;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6E211308_0015_4c99_8D6E_D6623AF6D2FF" style="Mode=3;EOID=1042ECC9;SOID=492C897E;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_3AF5D51C_E1E0_4756_A8FB_A636173FB8C1" style="Mode=3;EOID=46F9B6C8;SOID=492C897E;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=1385;SCTR.TOP=-87;SCTR.RIGHT=1425;SCTR.BOTTOM=-49;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=109:OY=-23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=1415:-87$1425:-87$1425:-49$1385:-49$1385:-70$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=ACDC49D7;SOID=ACDC49D7;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=4;SCTR.LEFT=1172;SCTR.TOP=-120;SCTR.RIGHT=1232;SCTR.BOTTOM=-75;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=-4:OY=-9:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=1220:-75$1172:-75$1172:-120$1220:-120$;" subject="EAID_39F3583F_0D40_4e9f_8018_10297955785C" style="Mode=3;EOID=ACDC49D7;SOID=ACDC49D7;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=1273;SCTR.TOP=-78;SCTR.RIGHT=1322;SCTR.BOTTOM=-45;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=87:OY=-25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=1322:-70$1322:-45$1273:-45$1273:-70$;" subject="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9" style="Mode=3;EOID=ACDC49D7;SOID=ACDC49D7;Color=-1;LWidth=0;Hidden=0;"/>
@@ -8350,31 +9066,31 @@
 					<element geometry="SX=82;SY=0;EX=0;EY=-13;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=-29:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1394:-300$;" subject="EAID_3AA2C83C_532C_460c_99CE_63F041A42F06" style="Mode=3;EOID=37C2F8C4;SOID=ACDC49D7;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_0B89904B_56C2_4154_BC18_F6B8F5B8635B" style="Mode=3;EOID=AAA821D2;SOID=EA30341A;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;EX=2;EY=16;SX=2;SY=16;$LLB=;LLT=;LMT=;LMB=;LRT=CX=69:CY=14:OX=16:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_ACCA405B_7FF7_41ad_9ACB_A1015C643C97" style="Mode=3;EOID=37C2F8C4;SOID=90D7888D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=-20;EX=84;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=62:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=1:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1957:-290$;" subject="EAID_65A0DAC3_2E18_40c1_BB08_B80EA400868A" style="Mode=3;EOID=867CF2B1;SOID=90D7888D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=19;EX=-84;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=66:OY=27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1553:-546$;" subject="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA" style="Mode=3;EOID=37C2F8C4;SOID=867CF2B1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-69;EX=63;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=64:CY=27:OX=90:OY=-40:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1605:-634$;" subject="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65" style="Mode=3;EOID=32B33171;SOID=867CF2B1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_57270DB3_8BAB_4bd4_9420_41F9921B71EF" style="Mode=3;EOID=16248F6B;SOID=25C576E2;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=116;SY=73;EX=6;EY=-1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=118:CY=14:OX=-19:OY=-7:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_056C94FE_E7B7_428e_B87E_F0795660EA2B" style="Mode=3;EOID=AF71A47B;SOID=867CF2B1;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BD5C98D5_43D4_41be_9C21_84470056CF01" style="Mode=3;EOID=20F6A736;SOID=A8EF34D7;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-26;SY=0;EX=0;EY=-18;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=4:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1847:-305$;" subject="EAID_15464872_BFB6_40bb_84F1_8A3969FE662E" style="Mode=3;EOID=37C2F8C4;SOID=867CF2B1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=3;SX=0;SY=0;EX=0;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_DE55F8F3_DEA7_4350_A7EC_23ACD7626ADE" style="Mode=3;EOID=20F6A736;SOID=6DFF0708;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-48;SY=0;EX=0;EY=-50;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=69:CY=14:OX=13:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1825:-337$;" subject="EAID_BBC722BA_3236_4fcb_B51A_14A66F3D627C" style="Mode=3;EOID=37C2F8C4;SOID=867CF2B1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=4;SY=0;EX=0;EY=-17;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=135:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=1877:-168$;" subject="EAID_F7CADBEA_BE8C_41f0_8070_7102E73439C9" style="Mode=3;EOID=ACDC49D7;SOID=867CF2B1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=4;SY=0;EX=0;EY=-8;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=135:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1877:-159$;" subject="EAID_F7CADBEA_BE8C_41f0_8070_7102E73439C9" style="Mode=3;EOID=ACDC49D7;SOID=867CF2B1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=159:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_52CB7369_B0C2_4acc_A513_76150076F808" style="Mode=3;EOID=37C2F8C4;SOID=867CF2B1;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=77;EX=43;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=52:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1680:-488$;" subject="EAID_ECEFDC69_19B4_47d7_A201_D8391B5C67DF" style="Mode=3;EOID=37C2F8C4;SOID=867CF2B1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=112;SY=4;EX=11;EY=4;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=158:CY=14:OX=-25:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-1:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9E47E1C8_547C_4dfc_AE71_4354D7B1ADDB" style="Mode=3;EOID=16248F6B;SOID=867CF2B1;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=101;SY=0;EX=0;EY=10;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=108:CY=14:OX=5:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=19:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1974:-914$;" subject="EAID_F58320C5_899E_4f5f_971B_BF5DE149A892" style="Mode=3;EOID=67334F3F;SOID=867CF2B1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=1973;SCTR.TOP=-492;SCTR.RIGHT=2022;SCTR.BOTTOM=-468;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1996:-492$2022:-492$2022:-468$1996:-468$;" subject="EAID_AF2B738F_531D_4495_9397_CE5771200854" style="Mode=3;EOID=867CF2B1;SOID=867CF2B1;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=3;SCTR.LEFT=1900;SCTR.TOP=-773;SCTR.RIGHT=1931;SCTR.BOTTOM=-680;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1900:-681$1900:-773$1931:-773$1931:-681$;" subject="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991" style="Mode=3;EOID=867CF2B1;SOID=867CF2B1;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=1973;SCTR.TOP=-663;SCTR.RIGHT=2076;SCTR.BOTTOM=-589;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1996:-663$2076:-663$2076:-589$1996:-589$;" subject="EAID_574DB5D8_4929_4670_9014_608B3C5534ED" style="Mode=3;EOID=867CF2B1;SOID=867CF2B1;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SX=0;SY=0;EX=15;EY=3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=60:OY=20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_455C76C8_B834_46d5_A5CA_93F12F0E5824" style="Mode=3;EOID=E2865D92;SOID=867CF2B1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=61;SY=-35;EX=61;EY=-20;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=137:CY=14:OX=9:OY=-10:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F5E9960A_D7AE_4887_A89B_4A966BB6C9D3" style="Mode=3;EOID=4909A0BB;SOID=867CF2B1;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=116;SY=73;EX=6;EY=-1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=118:CY=14:OX=-19:OY=-7:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_056C94FE_E7B7_428e_B87E_F0795660EA2B" style="Mode=3;EOID=AF71A47B;SOID=867CF2B1;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=15;EY=3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=62:OY=15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_455C76C8_B834_46d5_A5CA_93F12F0E5824" style="Mode=3;EOID=E2865D92;SOID=867CF2B1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_910BFAB5_C09F_48c2_A281_70A523440BFB" style="Mode=3;EOID=AAA821D2;SOID=59B49E79;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="EDGE=4;SX=4;SY=0;EX=4;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A88E2729_62D9_493c_8105_4D93D49DFA8A" style="Mode=3;EOID=AAA821D2;SOID=79C78D09;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=-20;EX=84;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=62:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=1:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1957:-290$;" subject="EAID_65A0DAC3_2E18_40c1_BB08_B80EA400868A" style="Mode=3;EOID=867CF2B1;SOID=90D7888D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_DE493AFE_2122_4b99_950A_737EC632B3C5">
-				<model package="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172" localID="335" owner="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172" tpos="2"/>
+				<model package="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2" localID="335" owner="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2" tpos="2"/>
 				<properties name="catalogue item price" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-05-05 15:42:01" modified="2023-09-11 17:58:03"/>
+				<project author="lps" version="1.0" created="2022-05-05 15:42:01" modified="2024-07-11 13:50:24"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=791;DocSize.cy=1134;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=FA5225D6;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=11D678E1;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
@@ -8389,25 +9105,26 @@
 					<element geometry="Left=94;Top=212;Right=357;Bottom=336;" subject="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" seqno="8" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=8F22F41A;"/>
 					<element geometry="Left=855;Top=221;Right=1122;Bottom=319;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="9" style="DUID=3DAAA05F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=300;Top=377;Right=476;Bottom=462;" subject="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" seqno="10" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=CAD898C4;"/>
-					<element geometry="SX=72;SY=0;EX=0;EY=-4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=92:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=670:-395$;" subject="EAID_A4EABD09_62ED_4add_B6AB_525BE36FDC06" style="Mode=3;EOID=60F3C4AF;SOID=15E1967E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-93;SY=-2;EX=22;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=107:CY=14:OX=54:OY=20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9EA3B8C3_695C_4b42_8481_D40EEC904171" style="Mode=3;EOID=6FBF5514;SOID=15E1967E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=39;SY=0;EX=0;EY=-1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=-4:OY=-5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=637:-468$;" subject="EAID_45B983F5_7502_49f2_984C_17FF6E47F8F9" style="Mode=3;EOID=F9EC50EB;SOID=15E1967E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-7;SY=1;EX=-7;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=127:CY=14:OX=75:OY=37:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1F622DE3_2DEE_491f_A5F1_B592E89F9030" style="Mode=3;EOID=6FBF5514;SOID=15E1967E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=64;SY=5;EX=46;EY=5;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=162:CY=14:OX=117:OY=16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_A0FABF7A_1814_4dd4_BD97_28BD0C9F2F49" style="Mode=3;EOID=6FBF5514;SOID=15E1967E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=8;SY=-4;EX=8;EY=-4;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=130:CY=14:OX=-2:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7" style="Mode=3;EOID=3DAAA05F;SOID=15E1967E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;SX=-21;SY=0;EX=0;EY=-19;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=9:OY=-7:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=577:-438$;" subject="EAID_6D569FED_815F_45f4_87EA_C0E83DC5C9AF" style="Mode=3;EOID=CAD898C4;SOID=15E1967E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=32;EX=-47;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=61:OY=23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=827:-242$;" subject="EAID_DF35A308_9DDF_4d5b_980E_9D85403496D0" style="Mode=3;EOID=8356A18B;SOID=15E1967E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=-15;EX=0;EY=-15;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=140:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_5E6E2C47_4590_4730_B50C_8F40D73778CB" style="Mode=3;EOID=15E1967E;SOID=8F22F41A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-3;SY=19;EX=-3;EY=19;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=72:CY=14:OX=-20:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=5:OY=-28:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3C28A6D1_3F44_48a1_A013_1A7BA2859AFA" style="Mode=3;EOID=15E1967E;SOID=8F22F41A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-5;SY=0;EX=0;EY=-35;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=220:CY=14:OX=-5:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=213:-121$;" subject="EAID_E93A74BB_614F_4b1c_AE59_F45CD626BB7A" style="Mode=3;EOID=6FBF5514;SOID=8F22F41A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-90;SY=0;EX=0;EY=7;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=152:CY=14:OX=-13:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=128:-79$;" subject="EAID_F475E438_48A3_41f5_A736_268C91FF8AF2" style="Mode=3;EOID=6FBF5514;SOID=8F22F41A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=3;SX=-23;SY=0;EX=0;EY=-5;$LLB=;LLT=;LMT=;LMB=;LRT=CX=139:CY=14:OX=-25:OY=-8:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=202:-424$;" subject="EAID_8FF88923_D9FB_4937_B866_FABECBC1DB55" style="Mode=3;EOID=CAD898C4;SOID=8F22F41A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_FE0B0FB5_E0B6_41e2_AA82_ECF06C845021" style="Mode=3;EOID=F9EC50EB;SOID=EBA4E0F4;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;SX=-23;SY=0;EX=0;EY=-5;$LLB=;LLT=;LMT=;LMB=;LRT=CX=139:CY=14:OX=-25:OY=-8:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=202:-424$;" subject="EAID_8FF88923_D9FB_4937_B866_FABECBC1DB55" style="Mode=3;EOID=CAD898C4;SOID=8F22F41A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-90;SY=0;EX=0;EY=7;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=152:CY=14:OX=-13:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=128:-79$;" subject="EAID_F475E438_48A3_41f5_A736_268C91FF8AF2" style="Mode=3;EOID=6FBF5514;SOID=8F22F41A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-5;SY=0;EX=0;EY=-35;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=220:CY=14:OX=-5:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=213:-121$;" subject="EAID_E93A74BB_614F_4b1c_AE59_F45CD626BB7A" style="Mode=3;EOID=6FBF5514;SOID=8F22F41A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-3;SY=19;EX=-3;EY=19;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=72:CY=14:OX=-20:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=5:OY=-28:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3C28A6D1_3F44_48a1_A013_1A7BA2859AFA" style="Mode=3;EOID=15E1967E;SOID=8F22F41A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=62:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_90566F74_64BC_49c8_8076_1ECB982268EE" style="Mode=3;EOID=8DA398C6;SOID=EBA4E0F4;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=32;EX=-47;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=61:OY=23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=827:-242$;" subject="EAID_DF35A308_9DDF_4d5b_980E_9D85403496D0" style="Mode=3;EOID=8356A18B;SOID=15E1967E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=4;SY=-19;EX=4;EY=-37;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=139:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_47E28283_E9BB_4790_9AB4_37A6F31DF36A" style="Mode=3;EOID=3DAAA05F;SOID=15E1967E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=6;SY=9;EX=6;EY=9;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=130:CY=14:OX=-8:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7" style="Mode=3;EOID=3DAAA05F;SOID=15E1967E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=64;SY=5;EX=46;EY=5;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=162:CY=14:OX=117:OY=16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_A0FABF7A_1814_4dd4_BD97_28BD0C9F2F49" style="Mode=3;EOID=6FBF5514;SOID=15E1967E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-7;SY=1;EX=-7;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=127:CY=14:OX=75:OY=37:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1F622DE3_2DEE_491f_A5F1_B592E89F9030" style="Mode=3;EOID=6FBF5514;SOID=15E1967E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=39;SY=0;EX=0;EY=-1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=-4:OY=-5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=637:-468$;" subject="EAID_45B983F5_7502_49f2_984C_17FF6E47F8F9" style="Mode=3;EOID=F9EC50EB;SOID=15E1967E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-93;SY=-2;EX=22;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=107:CY=14:OX=54:OY=20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9EA3B8C3_695C_4b42_8481_D40EEC904171" style="Mode=3;EOID=6FBF5514;SOID=15E1967E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=72;SY=0;EX=0;EY=-4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=92:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=670:-395$;" subject="EAID_A4EABD09_62ED_4add_B6AB_525BE36FDC06" style="Mode=3;EOID=60F3C4AF;SOID=15E1967E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-15;EX=0;EY=-15;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=140:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_5E6E2C47_4590_4730_B50C_8F40D73778CB" style="Mode=3;EOID=15E1967E;SOID=8F22F41A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_6D3D469D_BFB6_4096_A024_D98FF37504B4">
-				<model package="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172" localID="345" owner="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172" tpos="5"/>
+				<model package="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2" localID="345" owner="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2" tpos="5"/>
 				<properties name="item relations" type="Logical"/>
 				<project author="lps" version="1.0" created="2022-05-19 14:56:33" modified="2024-03-12 15:26:07"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=791;DocSize.cy=1134;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
@@ -8448,7 +9165,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_82AEC70B_C506_4fe9_9828_22C4B82B893A">
-				<model package="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172" localID="349" owner="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172" tpos="4"/>
+				<model package="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2" localID="349" owner="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2" tpos="4"/>
 				<properties name="catalogue update" type="Logical"/>
 				<project author="andreea" version="1.0" created="2022-06-16 16:17:13" modified="2023-09-01 17:11:56"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
@@ -8476,7 +9193,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_EEFF3272_C785_42be_B2BD_2FB6B7CDF603">
-				<model package="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172" localID="353" owner="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172" tpos="6"/>
+				<model package="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2" localID="353" owner="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2" tpos="6"/>
 				<properties name="item labels" type="Logical"/>
 				<project author="andreea" version="1.0" created="2022-07-11 20:36:17" modified="2024-03-12 15:27:02"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
@@ -8519,11 +9236,11 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_88441576_E11C_4349_95BE_00842656A68E">
-				<model package="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172" localID="355" owner="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172" tpos="8"/>
+				<model package="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2" localID="355" owner="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2" tpos="8"/>
 				<properties name="tax category" type="Logical"/>
-				<project author="andreea" version="1.0" created="2022-07-14 17:12:00" modified="2024-03-12 15:28:21"/>
+				<project author="andreea" version="1.0" created="2022-07-14 17:12:00" modified="2024-07-23 10:34:33"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=96F20ADC;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=45485686;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
@@ -8553,13 +9270,14 @@
 					<element geometry="EX=-75;EY=0;SX=0;SY=-28;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85:CY=14:OX=41:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=991:-101$;" subject="EAID_87123434_C2AD_43de_925D_13E9A7667A18" style="Mode=3;EOID=E8457672;SOID=88818D0A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=5;EX=13;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=70:OY=-15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1079:-68$;" subject="EAID_470D1B16_C07B_4868_91B2_799578663395" style="Mode=3;EOID=E8457672;SOID=88818D0A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=135:CY=14:OX=68:OY=-23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9DBEA51D_27BB_47b3_9536_602D5F0E8782" style="Mode=3;EOID=097556B8;SOID=0112FBA4;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=-17;EX=-36;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=130:CY=14:OX=84:OY=30:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1030:-616$;" subject="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7" style="Mode=3;EOID=E8457672;SOID=49A174C3;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-16;EX=-34;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=130:CY=14:OX=84:OY=30:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1032:-615$;" subject="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7" style="Mode=3;EOID=E8457672;SOID=49A174C3;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=22;EX=-6;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=144:CY=14:OX=52:OY=28:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=555:-577$;" subject="EAID_4F4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38" style="Mode=3;EOID=D1BF8A3E;SOID=49A174C3;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-30;EX=73;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=139:CY=14:OX=109:OY=59:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1139:-629$;" subject="EAID_47E28283_E9BB_4790_9AB4_37A6F31DF36A" style="Mode=3;EOID=E8457672;SOID=49A174C3;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-3;SY=4;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=128:CY=14:OX=-1:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9D9C4956_D3A6_47cd_966E_C37D023DC755" style="Mode=3;EOID=D1BF8A3E;SOID=097556B8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_C09EF9D1_F3B2_4fbe_B445_53E5FCEE7EBC">
-				<model package="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172" localID="445" owner="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172" tpos="3"/>
+				<model package="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2" localID="445" owner="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2" tpos="3"/>
 				<properties name="catalogue item tax schema" type="Logical"/>
 				<project author="andreea" version="1.0" created="2023-04-24 11:26:45" modified="2023-09-01 17:32:41"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
@@ -8576,29 +9294,30 @@
 					<element geometry="Left=653;Top=50;Right=899;Bottom=190;" subject="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" seqno="6" style="DUID=08B4A918;"/>
 					<element geometry="Left=1006;Top=310;Right=1096;Bottom=370;" subject="EAID_33A89700_846B_47cb_93D9_9D4729194EA6" seqno="7" style="DUID=AE9CAEDD;"/>
 					<element geometry="Left=1006;Top=246;Right=1096;Bottom=306;" subject="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A" seqno="8" style="DUID=FEE62572;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;Path=;" subject="EAID_47E28283_E9BB_4790_9AB4_37A6F31DF36A" style=";Hidden=0;"/>
+					<element geometry="SX=-1;SY=-30;EX=-1;EY=1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=-1:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4D92CD55_08CD_4d21_806C_38F93CA90719" style="Mode=3;EOID=AE9CAEDD;SOID=35662F97;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=57;SY=-3;EX=57;EY=-3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85:CY=14:OX=47:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_87123434_C2AD_43de_925D_13E9A7667A18" style="Mode=3;EOID=9765D7A2;SOID=35662F97;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-50;SY=-3;EX=-50;EY=-3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=48:OY=-16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_470D1B16_C07B_4868_91B2_799578663395" style="Mode=3;EOID=9765D7A2;SOID=35662F97;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=32;SY=0;EX=62;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=72:CY=14:OX=41:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=3:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3C28A6D1_3F44_48a1_A013_1A7BA2859AFA" style="Mode=3;EOID=7A57AE25;SOID=9610B733;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=91;SY=1;EX=-88;EY=1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=140:CY=14:OX=75:OY=-22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_5E6E2C47_4590_4730_B50C_8F40D73778CB" style="Mode=3;EOID=7A57AE25;SOID=9610B733;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=33;EX=0;EY=1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=2:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=4:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0D4101FD_7720_417c_B62C_6F674CDB3888" style="Mode=3;EOID=FEE62572;SOID=35662F97;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=130:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7" style="Mode=3;EOID=9765D7A2;SOID=7A57AE25;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=66:OY=-22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3570E246_3BA3_4795_8084_FD257C99FB89" style="Mode=2;EOID=35662F97;SOID=08B4A918;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=798;SCTR.TOP=-51;SCTR.RIGHT=829;SCTR.BOTTOM=143;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=829:-50$829:143$798:143$798:-50$;" subject="EAID_AF2B738F_531D_4495_9397_CE5771200854" style="Mode=3;EOID=08B4A918;SOID=08B4A918;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=798;SCTR.TOP=-51;SCTR.RIGHT=829;SCTR.BOTTOM=143;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=829:-50$829:143$798:143$798:-50$;" subject="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991" style="Mode=3;EOID=08B4A918;SOID=08B4A918;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=798;SCTR.TOP=-51;SCTR.RIGHT=829;SCTR.BOTTOM=143;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=829:-50$829:143$798:143$798:-50$;" subject="EAID_574DB5D8_4929_4670_9014_608B3C5534ED" style="Mode=3;EOID=08B4A918;SOID=08B4A918;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=798;SCTR.TOP=-51;SCTR.RIGHT=829;SCTR.BOTTOM=143;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=829:-50$829:143$798:143$798:-50$;" subject="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24" style="Mode=3;EOID=08B4A918;SOID=08B4A918;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=798;SCTR.TOP=-51;SCTR.RIGHT=829;SCTR.BOTTOM=143;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=829:-50$829:143$798:143$798:-50$;" subject="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F" style="Mode=3;EOID=08B4A918;SOID=08B4A918;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=92:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807" style="Mode=3;EOID=08B4A918;SOID=772E0362;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=130:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7" style="Mode=3;EOID=9765D7A2;SOID=7A57AE25;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=798;SCTR.TOP=-51;SCTR.RIGHT=829;SCTR.BOTTOM=143;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=829:-50$829:143$798:143$798:-50$;" subject="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F" style="Mode=3;EOID=08B4A918;SOID=08B4A918;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=798;SCTR.TOP=-51;SCTR.RIGHT=829;SCTR.BOTTOM=143;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=829:-50$829:143$798:143$798:-50$;" subject="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24" style="Mode=3;EOID=08B4A918;SOID=08B4A918;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=798;SCTR.TOP=-51;SCTR.RIGHT=829;SCTR.BOTTOM=143;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=829:-50$829:143$798:143$798:-50$;" subject="EAID_574DB5D8_4929_4670_9014_608B3C5534ED" style="Mode=3;EOID=08B4A918;SOID=08B4A918;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=798;SCTR.TOP=-51;SCTR.RIGHT=829;SCTR.BOTTOM=143;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=829:-50$829:143$798:143$798:-50$;" subject="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991" style="Mode=3;EOID=08B4A918;SOID=08B4A918;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=798;SCTR.TOP=-51;SCTR.RIGHT=829;SCTR.BOTTOM=143;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=829:-50$829:143$798:143$798:-50$;" subject="EAID_AF2B738F_531D_4495_9397_CE5771200854" style="Mode=3;EOID=08B4A918;SOID=08B4A918;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C33C0B35_4ADE_463d_BD51_7717D3E67FCB" style="Mode=2;EOID=772E0362;SOID=9610B733;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=91;SY=1;EX=-88;EY=1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=140:CY=14:OX=75:OY=-22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_5E6E2C47_4590_4730_B50C_8F40D73778CB" style="Mode=3;EOID=7A57AE25;SOID=9610B733;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=32;SY=0;EX=62;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=72:CY=14:OX=41:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=3:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3C28A6D1_3F44_48a1_A013_1A7BA2859AFA" style="Mode=3;EOID=7A57AE25;SOID=9610B733;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-50;SY=-3;EX=-50;EY=-3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=48:OY=-16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_470D1B16_C07B_4868_91B2_799578663395" style="Mode=3;EOID=9765D7A2;SOID=35662F97;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=57;SY=-3;EX=57;EY=-3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85:CY=14:OX=47:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_87123434_C2AD_43de_925D_13E9A7667A18" style="Mode=3;EOID=9765D7A2;SOID=35662F97;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-1;SY=-30;EX=-1;EY=1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=-1:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4D92CD55_08CD_4d21_806C_38F93CA90719" style="Mode=3;EOID=AE9CAEDD;SOID=35662F97;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=33;EX=0;EY=1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=2:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=4:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0D4101FD_7720_417c_B62C_6F674CDB3888" style="Mode=3;EOID=FEE62572;SOID=35662F97;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_65F8E249_BC06_44fd_84A6_7925DA2E8A7C">
-				<model package="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172" localID="491" owner="EAPK_57A8B2BC_7751_4b29_A492_7095D1A01172" tpos="7"/>
+				<model package="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2" localID="491" owner="EAPK_CCFFC2FC_7939_4c14_B459_E2CD3131E7B2" tpos="7"/>
 				<properties name="item and goods item" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-09-27 16:42:05" modified="2023-09-27 16:53:09"/>
+				<project author="andreea" version="1.0" created="2023-09-27 16:42:05" modified="2024-07-23 10:34:09"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=1B4E9002;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=FAA7CA8C;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
@@ -8610,50 +9329,51 @@
 					<element geometry="Left=994;Top=267;Right=1084;Bottom=337;" subject="EAID_C215EC75_82FD_45d3_832A_B3989A897692" seqno="5" style="DUID=1FD3820D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=521;Top=230;Right=728;Bottom=374;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="6" style="DUID=5E12FF12;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=904;Top=442;Right=1175;Bottom=512;" subject="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" seqno="7" style="DUID=A0CE2038;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=539;Top=442;Right=710;Bottom=512;" subject="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" seqno="8" style="DUID=94799E09;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=509;Top=442;Right=741;Bottom=512;" subject="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" seqno="8" style="DUID=94799E09;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=494;Top=577;Right=757;Bottom=701;" subject="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" seqno="9" style="DUID=34A678E9;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=135:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_95D24239_8F4D_44c8_97D1_1C26296607DA" style="Mode=3;EOID=5ABED9E7;SOID=A0CE2038;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SX=0;SY=2;EX=-19;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=152:CY=14:OX=138:OY=8:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1355:-637$;" subject="EAID_F475E438_48A3_41f5_A736_268C91FF8AF2" style="Mode=3;EOID=5ABED9E7;SOID=34A678E9;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_95D24239_8F4D_44c8_97D1_1C26296607DA" style="Mode=3;EOID=5ABED9E7;SOID=A0CE2038;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=66;SY=-2;EX=67;EY=-2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=104:CY=14:OX=92:OY=-104:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_2ECAEC7F_2186_4280_A2C0_6DC585D1EE96" style="Mode=3;EOID=5ABED9E7;SOID=2728A2CC;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=93;SY=0;EX=94;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=93:OY=-103:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0167DB54_9519_42f6_BD3B_F46B589F376C" style="Mode=3;EOID=5ABED9E7;SOID=2728A2CC;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=114:CY=14:OX=60:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7EAB192B_82DE_4520_A51F_2425A6DBF32F" style="Mode=3;EOID=1FD3820D;SOID=4A754C43;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=979;SCTR.TOP=-143;SCTR.RIGHT=1044;SCTR.BOTTOM=-113;$LLB=;LLT=;LMT=;LMB=;LRT=CX=122:CY=14:OX=151:OY=-6:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=1044:-142$1044:-113$979:-113$979:-142$;" subject="EAID_A219EBC4_BBC6_421b_A4B4_978BEF67A273" style="Mode=3;EOID=4A754C43;SOID=4A754C43;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_61578ED8_0C54_435b_A73F_AD86550D22E1" style="Mode=3;EOID=2728A2CC;SOID=4A754C43;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=82:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_51A6863A_1079_4af7_AE53_091E3E0514AF" style="Mode=3;EOID=5E12FF12;SOID=1FD3820D;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EX=1;EY=0;SX=-4;SY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=37:OY=-21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1371:-102$625:-102$;" subject="EAID_DA6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D" style="Mode=3;EOID=5E12FF12;SOID=2728A2CC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=2;EX=-19;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1355:-637$;" subject="EAID_F475E438_48A3_41f5_A736_268C91FF8AF2" style="Mode=3;EOID=5ABED9E7;SOID=34A678E9;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A88D0B55_1D01_4b73_B27A_8F69BE5B1455" style="Mode=3;EOID=94799E09;SOID=A0CE2038;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-60;SY=6;EX=-59;EY=6;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=150:CY=14:OX=141:OY=-155:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_C5E4577A_5BDB_4176_9418_BB9B2E957222" style="Mode=3;EOID=5ABED9E7;SOID=2728A2CC;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=133:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_65E8EC44_CB4C_4aa9_8218_75D01ED44538" style="Mode=3;EOID=5ABED9E7;SOID=A0CE2038;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=-32;SY=-1;EX=-31;EY=-1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=96:CY=14:OX=88:OY=-98:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_FA2388C8_1471_4d6b_9B9F_2E0BBE858668" style="Mode=3;EOID=5ABED9E7;SOID=2728A2CC;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_65E8EC44_CB4C_4aa9_8218_75D01ED44538" style="Mode=3;EOID=5ABED9E7;SOID=A0CE2038;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=43:OY=23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044" style="Mode=3;EOID=5E12FF12;SOID=94799E09;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=1;EX=0;EY=-57;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=92:CY=14:OX=58:OY=19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=224:-476$;" subject="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807" style="Mode=3;EOID=FADB2BBB;SOID=94799E09;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=1;EX=-1;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=92:CY=14:OX=58:OY=19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=224:-476$;" subject="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807" style="Mode=3;EOID=FADB2BBB;SOID=94799E09;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C33C0B35_4ADE_463d_BD51_7717D3E67FCB" style="Mode=3;EOID=94799E09;SOID=34A678E9;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=2;EX=144;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=107:CY=14:OX=59:OY=18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1183:-637$;" subject="EAID_1FEA3AE7_155D_492a_ADD5_430BD3FAB4A8" style="Mode=3;EOID=4A754C43;SOID=34A678E9;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=-54;EX=33;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=220:CY=14:OX=204:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1407:-693$;" subject="EAID_E93A74BB_614F_4b1c_AE59_F45CD626BB7A" style="Mode=3;EOID=5ABED9E7;SOID=34A678E9;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
+					<element geometry="SX=0;SY=-54;EX=33;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1407:-693$;" subject="EAID_E93A74BB_614F_4b1c_AE59_F45CD626BB7A" style="Mode=3;EOID=5ABED9E7;SOID=34A678E9;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=123:CY=14:OX=73:OY=-30:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D57BCA2B_F949_4607_84FB_38E506A895B7" style="Mode=3;EOID=A0CE2038;SOID=1FD3820D;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=347;SCTR.TOP=-271;SCTR.RIGHT=378;SCTR.BOTTOM=-256;$LLB=;LLT=;LMT=;LMB=;LRT=CX=71:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=348:-271$378:-271$378:-256$348:-256$;" subject="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24" style="Mode=3;EOID=FADB2BBB;SOID=FADB2BBB;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SX=-1;SY=49;EX=-1;EY=49;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=-16:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_ECEFDC69_19B4_47d7_A201_D8391B5C67DF" style="Mode=3;EOID=5E12FF12;SOID=FADB2BBB;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=347;SCTR.TOP=-271;SCTR.RIGHT=378;SCTR.BOTTOM=-256;$LLB=;LLT=;LMT=;LMB=;LRT=CX=154:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=348:-271$378:-271$378:-256$348:-256$;" subject="EAID_AF2B738F_531D_4495_9397_CE5771200854" style="Mode=3;EOID=FADB2BBB;SOID=FADB2BBB;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=347;SCTR.TOP=-271;SCTR.RIGHT=378;SCTR.BOTTOM=-256;$LLB=;LLT=CX=72:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LMT=;LMB=;LRT=CX=91:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=348:-271$378:-271$378:-256$348:-256$;" subject="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991" style="Mode=3;EOID=FADB2BBB;SOID=FADB2BBB;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=347;SCTR.TOP=-271;SCTR.RIGHT=378;SCTR.BOTTOM=-256;$LLB=;LLT=;LMT=;LMB=;LRT=CX=130:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=348:-271$378:-271$378:-256$348:-256$;" subject="EAID_574DB5D8_4929_4670_9014_608B3C5534ED" style="Mode=3;EOID=FADB2BBB;SOID=FADB2BBB;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65" style="Mode=3;EOID=5ABED9E7;SOID=FADB2BBB;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SX=1;SY=24;EX=1;EY=24;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=-19:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_15464872_BFB6_40bb_84F1_8A3969FE662E" style="Mode=3;EOID=5E12FF12;SOID=FADB2BBB;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=66;SY=-2;EX=67;EY=-2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=104:CY=14:OX=92:OY=-104:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_2ECAEC7F_2186_4280_A2C0_6DC585D1EE96" style="Mode=3;EOID=5ABED9E7;SOID=2728A2CC;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=7;SY=-54;EX=7;EY=-54;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=121:CY=14:OX=-23:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_E507D198_1A41_4b43_873A_F9E88411186D" style="Mode=3;EOID=5E12FF12;SOID=FADB2BBB;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=3;SY=-27;EX=3;EY=-27;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=69:CY=14:OX=-21:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_BBC722BA_3236_4fcb_B51A_14A66F3D627C" style="Mode=3;EOID=5E12FF12;SOID=FADB2BBB;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=347;SCTR.TOP=-271;SCTR.RIGHT=378;SCTR.BOTTOM=-256;$LLB=;LLT=;LMT=;LMB=;LRT=CX=69:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=348:-271$378:-271$378:-256$348:-256$;" subject="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F" style="Mode=3;EOID=FADB2BBB;SOID=FADB2BBB;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=159:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_52CB7369_B0C2_4acc_A513_76150076F808" style="Mode=3;EOID=5E12FF12;SOID=FADB2BBB;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-1;SY=49;EX=-1;EY=49;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=-16:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_ECEFDC69_19B4_47d7_A201_D8391B5C67DF" style="Mode=3;EOID=5E12FF12;SOID=FADB2BBB;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=347;SCTR.TOP=-271;SCTR.RIGHT=378;SCTR.BOTTOM=-256;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=348:-271$378:-271$378:-256$348:-256$;" subject="EAID_AF2B738F_531D_4495_9397_CE5771200854" style="Mode=3;EOID=FADB2BBB;SOID=FADB2BBB;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=347;SCTR.TOP=-271;SCTR.RIGHT=378;SCTR.BOTTOM=-256;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=348:-271$378:-271$378:-256$348:-256$;" subject="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991" style="Mode=3;EOID=FADB2BBB;SOID=FADB2BBB;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=347;SCTR.TOP=-271;SCTR.RIGHT=378;SCTR.BOTTOM=-256;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=348:-271$378:-271$378:-256$348:-256$;" subject="EAID_574DB5D8_4929_4670_9014_608B3C5534ED" style="Mode=3;EOID=FADB2BBB;SOID=FADB2BBB;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65" style="Mode=3;EOID=5ABED9E7;SOID=FADB2BBB;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EX=1;EY=0;SX=-4;SY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=37:OY=-21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1371:-102$625:-102$;" subject="EAID_DA6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D" style="Mode=3;EOID=5E12FF12;SOID=2728A2CC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-1;EX=0;EY=-1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=-20:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA" style="Mode=3;EOID=5E12FF12;SOID=FADB2BBB;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-60;SY=6;EX=-59;EY=6;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=150:CY=14:OX=141:OY=-155:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_C5E4577A_5BDB_4176_9418_BB9B2E957222" style="Mode=3;EOID=5ABED9E7;SOID=2728A2CC;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=347;SCTR.TOP=-271;SCTR.RIGHT=378;SCTR.BOTTOM=-256;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=348:-271$378:-271$378:-256$348:-256$;" subject="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24" style="Mode=3;EOID=FADB2BBB;SOID=FADB2BBB;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=347;SCTR.TOP=-271;SCTR.RIGHT=378;SCTR.BOTTOM=-256;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=348:-271$378:-271$378:-256$348:-256$;" subject="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F" style="Mode=3;EOID=FADB2BBB;SOID=FADB2BBB;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=-89;SY=0;EX=-88;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=75:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_770594A4_09FD_4b6e_8D27_8D44BA5CA36A" style="Mode=3;EOID=5ABED9E7;SOID=2728A2CC;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=9;SY=1;EX=10;EY=1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=77:CY=14:OX=67:OY=-89:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_87DEA454_B158_4e44_91D6_F1D258049A37" style="Mode=3;EOID=5ABED9E7;SOID=2728A2CC;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-13;SY=0;EX=-12;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=78:CY=14:OX=70:OY=-78:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0F1AB34D_EA8C_44fb_B232_AA4B138F066B" style="Mode=3;EOID=5ABED9E7;SOID=2728A2CC;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=35;SY=-3;EX=36;EY=-3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=94:CY=14:OX=86:OY=-103:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_05490F76_8D40_4d74_97D4_F3871039E80A" style="Mode=3;EOID=5ABED9E7;SOID=2728A2CC;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-32;SY=-1;EX=-31;EY=-1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=96:CY=14:OX=88:OY=-98:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_FA2388C8_1471_4d6b_9B9F_2E0BBE858668" style="Mode=3;EOID=5ABED9E7;SOID=2728A2CC;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=-1;EX=0;EY=-1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=-20:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA" style="Mode=3;EOID=5E12FF12;SOID=FADB2BBB;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=3;SY=-27;EX=3;EY=-27;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=69:CY=14:OX=-21:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_BBC722BA_3236_4fcb_B51A_14A66F3D627C" style="Mode=3;EOID=5E12FF12;SOID=FADB2BBB;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=1;SY=24;EX=1;EY=24;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=-19:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_15464872_BFB6_40bb_84F1_8A3969FE662E" style="Mode=3;EOID=5E12FF12;SOID=FADB2BBB;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_01F32084_0DB4_45c2_B38D_9F359540A08C">
 				<model package="EAPK_539436E9_1B11_4461_B549_9B764CC4DB6A" localID="401" owner="EAPK_539436E9_1B11_4461_B549_9B764CC4DB6A"/>
 				<properties name="post award object harmonisation" type="Logical"/>
-				<project author="lps" version="1.0" created="2023-01-23 17:51:48" modified="2024-03-12 15:30:02"/>
+				<project author="lps" version="1.0" created="2023-01-23 17:51:48" modified="2024-07-23 10:35:05"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=791;DocSize.cy=1134;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=C5B77E84;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=D74003CA;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
@@ -8662,27 +9382,28 @@
 					<element geometry="Left=112;Top=572;Right=383;Bottom=642;" subject="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" seqno="2" style="DUID=4DA8219C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=789;Top=551;Right=1052;Bottom=665;" subject="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" seqno="3" style="DUID=1036BB38;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1015;Top=78;Right=1231;Bottom=218;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="4" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=95A890E3;"/>
-					<element geometry="Left=505;Top=278;Right=662;Bottom=331;" subject="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A" seqno="5" style="DUID=610541B9;"/>
+					<element geometry="Left=504;Top=278;Right=661;Bottom=331;" subject="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A" seqno="5" style="DUID=610541B9;"/>
 					<element geometry="Left=1197;Top=339;Right=1443;Bottom=571;" subject="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" seqno="6" style="DUID=DCE51368;NSL=0;"/>
-					<element geometry="Left=497;Top=419;Right=668;Bottom=490;" subject="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" seqno="7" style="DUID=A3F6F114;"/>
-					<element geometry="EDGE=4;SX=0;SY=85;EX=41;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=121:CY=14:OX=98:OY=29:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=12:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1164:-370$;" subject="EAID_E507D198_1A41_4b43_873A_F9E88411186D" style="Mode=3;EOID=95A890E3;SOID=DCE51368;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B0259612_87E6_4f34_A3AA_B5B7E513AEA0" style="Mode=3;EOID=81272805;SOID=4DA8219C;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=-10;SY=0;EX=0;EY=-2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=237:-456$;" subject="EAID_A88D0B55_1D01_4b73_B27A_8F69BE5B1455" style="Mode=3;EOID=A3F6F114;SOID=4DA8219C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="Left=466;Top=420;Right=698;Bottom=491;" subject="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" seqno="7" style="DUID=A3F6F114;"/>
+					<element geometry="SX=0;SY=33;EX=-57;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=66:OY=27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1066:-422$;" subject="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA" style="Mode=3;EOID=95A890E3;SOID=DCE51368;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B0259612_87E6_4f34_A3AA_B5B7E513AEA0" style="Mode=3;EOID=81272805;SOID=4DA8219C;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-10;SY=0;EX=0;EY=-2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=237:-457$;" subject="EAID_A88D0B55_1D01_4b73_B27A_8F69BE5B1455" style="Mode=3;EOID=A3F6F114;SOID=4DA8219C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=129:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_082B76C7_EF6B_4c76_8A07_9FF99AC0CF07" style="Mode=3;EOID=1036BB38;SOID=81272805;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_AA589EDA_B26B_44c3_BCCC_37421BA960DE" style="Mode=3;EOID=A3F6F114;SOID=81272805;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=71;SY=-2;EX=-3;EY=-29;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=92:CY=14:OX=-2:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807" style="Mode=3;EOID=DCE51368;SOID=A3F6F114;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=2;SX=0;SY=24;EX=-94;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=30:OY=54:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1029:-430$;" subject="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044" style="Mode=3;EOID=95A890E3;SOID=A3F6F114;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=-9;SY=0;EX=0;EY=-24;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=911:-478$;" subject="EAID_C33C0B35_4ADE_463d_BD51_7717D3E67FCB" style="Mode=3;EOID=A3F6F114;SOID=1036BB38;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=32;EX=0;EY=47;EDGE=2;SCTR.LEFT=1420;SCTR.TOP=-423;SCTR.RIGHT=1488;SCTR.BOTTOM=-408;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1443:-423$1488:-423$1488:-408$1443:-408$;" subject="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24" style="Mode=3;EOID=DCE51368;SOID=DCE51368;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
+					<element geometry="EDGE=2;SX=0;SY=24;EX=-94;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=30:OY=54:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1029:-431$;" subject="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044" style="Mode=3;EOID=95A890E3;SOID=A3F6F114;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=104;EX=100;EY=0;EDGE=2;SCTR.LEFT=1420;SCTR.TOP=-351;SCTR.RIGHT=1468;SCTR.BOTTOM=-336;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1443:-351$1468:-351$1468:-336$1420:-336$1420:-339$;" subject="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F" style="Mode=3;EOID=DCE51368;SOID=DCE51368;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
+					<element geometry="EDGE=1;SX=-9;SY=0;EX=0;EY=-24;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=911:-479$;" subject="EAID_C33C0B35_4ADE_463d_BD51_7717D3E67FCB" style="Mode=3;EOID=A3F6F114;SOID=1036BB38;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=4;SX=0;SY=85;EX=41;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=121:CY=14:OX=98:OY=29:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=12:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1164:-370$;" subject="EAID_E507D198_1A41_4b43_873A_F9E88411186D" style="Mode=3;EOID=95A890E3;SOID=DCE51368;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=2;EX=-3;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=101:CY=14:OX=47:OY=-34:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_AB038715_CD52_4521_96D4_FF2138630244" style="Mode=3;EOID=A3F6F114;SOID=610541B9;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=33;EX=-57;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=66:OY=27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1066:-422$;" subject="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA" style="Mode=3;EOID=95A890E3;SOID=DCE51368;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=62;EX=-6;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=66:OY=57:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1117:-393$;" subject="EAID_15464872_BFB6_40bb_84F1_8A3969FE662E" style="Mode=3;EOID=95A890E3;SOID=DCE51368;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=-98;EX=0;EY=-24;EDGE=2;SCTR.LEFT=1420;SCTR.TOP=-553;SCTR.RIGHT=1523;SCTR.BOTTOM=-479;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1443:-553$1523:-553$1523:-479$1443:-479$;" subject="EAID_574DB5D8_4929_4670_9014_608B3C5534ED" style="Mode=3;EOID=DCE51368;SOID=DCE51368;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="SCTR=1;SCME=1;SX=27;SY=0;EX=58;EY=0;EDGE=3;SCTR.LEFT=1347;SCTR.TOP=-663;SCTR.RIGHT=1378;SCTR.BOTTOM=-570;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1347:-571$1347:-663$1378:-663$1378:-571$;" subject="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991" style="Mode=3;EOID=DCE51368;SOID=DCE51368;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=73;EX=0;EY=97;EDGE=2;SCTR.LEFT=1420;SCTR.TOP=-382;SCTR.RIGHT=1469;SCTR.BOTTOM=-358;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1443:-382$1469:-382$1469:-358$1443:-358$;" subject="EAID_AF2B738F_531D_4495_9397_CE5771200854" style="Mode=3;EOID=DCE51368;SOID=DCE51368;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="SX=14;SY=0;EX=0;EY=-35;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=17:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1334:-183$;" subject="EAID_ECEFDC69_19B4_47d7_A201_D8391B5C67DF" style="Mode=3;EOID=95A890E3;SOID=DCE51368;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-1;EX=0;EY=-1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=159:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_52CB7369_B0C2_4acc_A513_76150076F808" style="Mode=3;EOID=95A890E3;SOID=DCE51368;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=1;SX=-12;SY=0;EX=0;EY=-70;$LLB=;LLT=;LMT=;LMB=;LRT=CX=69:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1308:-218$;" subject="EAID_BBC722BA_3236_4fcb_B51A_14A66F3D627C" style="Mode=3;EOID=95A890E3;SOID=DCE51368;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=104;EX=100;EY=0;EDGE=2;SCTR.LEFT=1420;SCTR.TOP=-351;SCTR.RIGHT=1468;SCTR.BOTTOM=-336;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1443:-351$1468:-351$1468:-336$1420:-336$1420:-339$;" subject="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F" style="Mode=3;EOID=DCE51368;SOID=DCE51368;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=32;EX=0;EY=47;EDGE=2;SCTR.LEFT=1420;SCTR.TOP=-423;SCTR.RIGHT=1488;SCTR.BOTTOM=-408;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1443:-423$1488:-423$1488:-408$1443:-408$;" subject="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24" style="Mode=3;EOID=DCE51368;SOID=DCE51368;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_3FA45701_A0C1_4c43_928C_2F5C3CC87AE2">
@@ -8718,7 +9439,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_B63F4E60_55FB_4b37_BB14_8B508813D89D">
-				<model package="EAPK_434C478A_1DD4_4dbc_BC16_6DA0B0A6546B" localID="490" owner="EAPK_434C478A_1DD4_4dbc_BC16_6DA0B0A6546B"/>
+				<model package="EAPK_227C7135_4084_44ed_B4B1_94E1D2E98D9B" localID="490" owner="EAPK_227C7135_4084_44ed_B4B1_94E1D2E98D9B"/>
 				<properties name="catalogue response" type="Logical"/>
 				<project author="andreea" version="1.0" created="2023-09-27 16:22:12" modified="2023-09-27 16:33:05"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
diff --git a/implementation/eContract/model2owl-config/config-parameters.xsl b/implementation/eContract/model2owl-config/config-parameters.xsl
index 27465f34..11783d46 100644
--- a/implementation/eContract/model2owl-config/config-parameters.xsl
+++ b/implementation/eContract/model2owl-config/config-parameters.xsl
@@ -122,11 +122,11 @@
     <!--    owl:incompatibleWith -->
     <xsl:variable name="incompatibleWith" select="'3.1.0'"/>
     <!--    owl:versionInfo -->
-    <xsl:variable name="versionInfo" select="'4.1.0'"/>
+    <xsl:variable name="versionInfo" select="'4.2.0'"/>
     <!--    bibo:status-->
     <xsl:variable name="ontologyStatus" select="'Semantic Specification Release'"/>
     <!--    owl:priorVersion -->
-    <xsl:variable name="priorVersion" select="'4.0.2'"/>
+    <xsl:variable name="priorVersion" select="'4.1.0'"/>
     <!--    vann:preferredNamespaceUri -->
     <xsl:variable name="preferredNamespaceUri" select="'http://data.europa.eu/a4g/ontology#'"/>
     <!--    vann:preferredNamespacePrefix -->
diff --git a/implementation/eContract/model2owl-config/namespaces.xml b/implementation/eContract/model2owl-config/namespaces.xml
index 5d0b5b60..843fbe43 100644
--- a/implementation/eContract/model2owl-config/namespaces.xml
+++ b/implementation/eContract/model2owl-config/namespaces.xml
@@ -21,6 +21,7 @@
     <prefix name="epo-ful" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-acc" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-sub" value="http://data.europa.eu/a4g/ontology#"/>
+    <prefix name="epo-inv" value="http://data.europa.eu/a4g/ontology#"/>
 
     <prefix name="nuts" value="http://data.europa.eu/nuts/"/>
     <prefix name="espd" value="https://github.com/ESPD/ESPD-EDM/"/>
diff --git a/implementation/eContract/xmi_conceptual_model/eContract.xml b/implementation/eContract/xmi_conceptual_model/eContract.xml
index 8e6496ab..ea2e4180 100644
--- a/implementation/eContract/xmi_conceptual_model/eContract.xml
+++ b/implementation/eContract/xmi_conceptual_model/eContract.xml
@@ -4,12 +4,12 @@
 	<uml:Model xmi:type="uml:Model" name="EA_Model">
 		<packagedElement xmi:type="uml:Package" xmi:id="EAPK_DEA61189_FE20_4c3e_86D3_781A9FE24B0A" name="Contract">
 			<packagedElement xmi:type="uml:Package" xmi:id="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" name="contract">
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1" name="diagrams">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C" name="diagrams">
 					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_FE63C543_57D9_47e9_8ACC_7BD5B211C594" body="only to be used in the last section of standard form 20">
 						<annotatedElement xmi:idref="EAID_2729D2D0_C843_497f_B19D_1727246FC1BD"/>
 					</ownedComment>
 				</packagedElement>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_58816F03_1038_48b7_9554_B169832124AC" name="classes">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_7862159D_DEAB_4dc0_8393_25C5F20C297A" name="classes">
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F" name="epo-con:ContractAmendment">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst29D2D0_C843_497f_B19D_1727246FC1BD" name="epo:updatesContractValue" association="EAID_2729D2D0_C843_497f_B19D_1727246FC1BD">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
@@ -128,7 +128,7 @@
 				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_14241140_2F4C_4084_BE6A_EFA5D96ED74A" name="xsd:integer"/>
 			</packagedElement>
 		</packagedElement>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_C8C827E4_665B_43db_A783_8FBB5CAF08BE" isFrame="false" modelElement="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_C8C827E4_665B_43db_A783_8FBB5CAF08BE" isFrame="false" modelElement="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C8C827E4_665B_43db_B8A4_6F969F59938C" modelElement="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_665B_43db_B8A4_6F969F59938C" text="epo:Notice"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_665B_43db_B8A4_6F969F59938C" x="35" y="92" width="245" height="163"/>
@@ -236,7 +236,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_665B_43db_B319_1174DD83D564" x="247" y="434"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_790B14E6_1661_4ff0_BC3F_6B02144147E0" isFrame="false" modelElement="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_790B14E6_1661_4ff0_BC3F_6B02144147E0" isFrame="false" modelElement="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_790B14E6_1661_4ff0_8372_75A07B6AB066" modelElement="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1661_4ff0_8372_75A07B6AB066" text="epo:Contract"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1661_4ff0_8372_75A07B6AB066" x="755" y="455" width="219" height="98"/>
@@ -689,7 +689,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1661_4ff0_8D4A_95B9DD217458" x="959" y="1047"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_2C0665CA_A78A_491e_88BC_180C3572A077" isFrame="false" modelElement="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_2C0665CA_A78A_491e_88BC_180C3572A077" isFrame="false" modelElement="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2C0665CA_A78A_491e_8372_75A07B6AB066" modelElement="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_A78A_491e_8372_75A07B6AB066" text="epo:Contract"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A78A_491e_8372_75A07B6AB066" x="532" y="75" width="219" height="98"/>
@@ -760,7 +760,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_A78A_491e_8C14_7C6DA83E8A46" x="532" y="103"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_3ABE52BE_CE2B_411b_8587_0CE199619F12" isFrame="false" modelElement="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_3ABE52BE_CE2B_411b_8587_0CE199619F12" isFrame="false" modelElement="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_3ABE52BE_CE2B_411b_A416_3E77939F9B7A" modelElement="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_CE2B_411b_A416_3E77939F9B7A" text="epo:LotAwardOutcome"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_CE2B_411b_A416_3E77939F9B7A" x="717" y="442" width="273" height="83"/>
@@ -949,7 +949,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_CE2B_411b_94BC_1C90816E0487" x="559" y="409"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_542CAED6_F3AE_44e3_9F8A_CD66B8D4E2A7" isFrame="false" modelElement="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_542CAED6_F3AE_44e3_9F8A_CD66B8D4E2A7" isFrame="false" modelElement="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_542CAED6_F3AE_44e3_8372_75A07B6AB066" modelElement="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_F3AE_44e3_8372_75A07B6AB066" text="epo:Contract"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F3AE_44e3_8372_75A07B6AB066" x="968" y="238" width="219" height="113"/>
@@ -980,7 +980,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_542CAED6_F3AE_44e3_9313_58C4BB4EB1A7" modelElement="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_F3AE_44e3_9313_58C4BB4EB1A7" text="epo-cat:Line"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F3AE_44e3_9313_58C4BB4EB1A7" x="164" y="644" width="171" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F3AE_44e3_9313_58C4BB4EB1A7" x="164" y="644" width="232" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_542CAED6_F3AE_44e3_B200_94202420C754" modelElement="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_F3AE_44e3_B200_94202420C754" text="epo-cat:Item"/>
@@ -1240,13 +1240,13 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_542CAED6_F3AE_44e3_BD03_7B202CFA4807" source="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" target="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" modelElement="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3AE_44e3_BD03_7B202CFA4807" text="+epo-cat:specifiesItem" modelElement="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3AE_44e3_BD03_7B202CFA4807" x="195" y="910" width="92" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3AE_44e3_BD03_7B202CFA4807" x="161" y="910" width="92" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3AE_44e3_BD03_7B202CFA4807" text="1" modelElement="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3AE_44e3_BD03_7B202CFA4807" x="257" y="934" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3AE_44e3_BD03_7B202CFA4807" x="223" y="934" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3AE_44e3_BD03_7B202CFA4807" x="249" y="714"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3AE_44e3_BD03_7B202CFA4807" x="249" y="952"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3AE_44e3_BD03_7B202CFA4807" x="215" y="714"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3AE_44e3_BD03_7B202CFA4807" x="215" y="952"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_542CAED6_F3AE_44e3_A8BC_8FBCF102380D" source="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" target="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3" modelElement="EAID_30CBA4D5_2CA0_4043_A8BC_8FBCF102380D">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3AE_44e3_A8BC_8FBCF102380D" x="935" y="925"/>
@@ -1312,7 +1312,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_F3AE_44e3_A715_C0AF0EF80B65" x="827" y="925"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_18EBC143_4E14_4922_BD6F_14875E8F79FE" isFrame="false" modelElement="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_18EBC143_4E14_4922_BD6F_14875E8F79FE" isFrame="false" modelElement="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_18EBC143_4E14_4922_B200_94202420C754" modelElement="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4E14_4922_B200_94202420C754" text="epo-cat:Item"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4E14_4922_B200_94202420C754" x="231" y="346" width="246" height="140"/>
@@ -1452,7 +1452,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4E14_4922_8E1A_EF574D760E6F" x="658" y="287"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_AC6531EC_BF50_48e1_BAB3_75F8F68D5092" isFrame="false" modelElement="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_AC6531EC_BF50_48e1_BAB3_75F8F68D5092" isFrame="false" modelElement="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_AC6531EC_BF50_48e1_8372_75A07B6AB066" modelElement="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_BF50_48e1_8372_75A07B6AB066" text="epo:Contract"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_BF50_48e1_8372_75A07B6AB066" x="464" y="332" width="219" height="98"/>
@@ -1585,7 +1585,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BF50_48e1_B217_F52FFB1CAD53" x="604" y="261"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_FBEEEA5A_5887_4162_8717_4D8A5551405C" isFrame="false" modelElement="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_FBEEEA5A_5887_4162_8717_4D8A5551405C" isFrame="false" modelElement="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_FBEEEA5A_5887_4162_8372_75A07B6AB066" modelElement="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5887_4162_8372_75A07B6AB066" text="epo:Contract"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5887_4162_8372_75A07B6AB066" x="710" y="289" width="219" height="98"/>
@@ -1822,7 +1822,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5887_4162_8461_8385AB23B103" x="819" y="505"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_BD365BA4_FB8A_4fc3_8D9D_5445218300B9" isFrame="false" modelElement="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_BD365BA4_FB8A_4fc3_8D9D_5445218300B9" isFrame="false" modelElement="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BD365BA4_FB8A_4fc3_8372_75A07B6AB066" modelElement="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_FB8A_4fc3_8372_75A07B6AB066" text="epo:Contract"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_FB8A_4fc3_8372_75A07B6AB066" x="407" y="116" width="298" height="149"/>
@@ -2038,7 +2038,7 @@
 	<xmi:Extension extender="Enterprise Architect" extenderID="6.5">
 		<elements>
 			<element xmi:idref="EAPK_DEA61189_FE20_4c3e_86D3_781A9FE24B0A">
-				<packageproperties version="1.0" tpos="5"/>
+				<packageproperties version="1.0" tpos="6"/>
 				<paths/>
 				<times created="2023-03-21 00:00:00" modified="2023-03-21 00:00:00"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;"/>
@@ -2057,10 +2057,10 @@
 				<times created="2023-03-21 10:52:36" modified="2023-03-21 10:52:36"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
 			</element>
-			<element xmi:idref="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1" xmi:type="uml:Package" name="diagrams" scope="public">
-				<model package2="EAID_E279371D_4C53_4e66_9DA4_9DE0ACD112D1" package="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" tpos="1" ea_localid="253" ea_eleType="package"/>
+			<element xmi:idref="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C" xmi:type="uml:Package" name="diagrams" scope="public">
+				<model package2="EAID_07552A0B_12BD_4a70_8E41_E7C3CDEA005C" package="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" tpos="1" ea_localid="247" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 13:03:01" modified="2024-03-18 13:03:01" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:43:19" modified="2024-07-23 11:43:19" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -2068,11 +2068,11 @@
 				<extendedProperties tagged="0" package_name="contract"/>
 				<packageproperties version="1.0" tpos="1"/>
 				<paths/>
-				<times created="2024-03-18 13:03:01" modified="2024-03-18 13:03:01"/>
+				<times created="2024-07-23 11:43:19" modified="2024-07-23 11:43:19"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAID_FE63C543_57D9_47e9_8ACC_7BD5B211C594" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1" tpos="0" ea_localid="3076" ea_eleType="element"/>
+				<model package="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C" tpos="0" ea_localid="3076" ea_eleType="element"/>
 				<properties documentation="only to be used in the last section of standard form 20" isSpecification="false" sType="Note" nType="1" scope="public"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2023-06-29 16:24:41" modified="2023-06-29 16:25:02" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
@@ -2081,10 +2081,10 @@
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams" relatedlinks="idref1=EAID_2729D2D0_C843_497f_B19D_1727246FC1BD;"/>
 			</element>
-			<element xmi:idref="EAPK_58816F03_1038_48b7_9554_B169832124AC" xmi:type="uml:Package" name="classes" scope="public">
-				<model package2="EAID_58816F03_1038_48b7_9554_B169832124AC" package="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" tpos="2" ea_localid="254" ea_eleType="package"/>
+			<element xmi:idref="EAPK_7862159D_DEAB_4dc0_8393_25C5F20C297A" xmi:type="uml:Package" name="classes" scope="public">
+				<model package2="EAID_7862159D_DEAB_4dc0_8393_25C5F20C297A" package="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" tpos="2" ea_localid="248" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 13:03:16" modified="2024-03-18 13:03:16" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:43:30" modified="2024-07-23 11:43:30" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -2092,13 +2092,13 @@
 				<extendedProperties tagged="0" package_name="contract"/>
 				<packageproperties version="1.0" tpos="2"/>
 				<paths/>
-				<times created="2024-03-18 13:03:16" modified="2024-03-18 13:03:16"/>
+				<times created="2024-07-23 11:43:30" modified="2024-07-23 11:43:30"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F" xmi:type="uml:Class" name="epo-con:ContractAmendment" scope="public">
-				<model package="EAPK_58816F03_1038_48b7_9554_B169832124AC" tpos="0" ea_localid="3087" ea_eleType="element"/>
+				<model package="EAPK_7862159D_DEAB_4dc0_8393_25C5F20C297A" tpos="0" ea_localid="3087" ea_eleType="element"/>
 				<properties documentation="A change to an existing Contract that is agreed by the contracting parties." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-07-05 16:35:49" modified="2024-03-18 13:03:23" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-07-05 16:35:49" modified="2024-07-23 11:43:37" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -2113,9 +2113,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7" xmi:type="uml:Class" name="epo-con:ContractModificationInformation" scope="public">
-				<model package="EAPK_58816F03_1038_48b7_9554_B169832124AC" tpos="0" ea_localid="3086" ea_eleType="element"/>
+				<model package="EAPK_7862159D_DEAB_4dc0_8393_25C5F20C297A" tpos="0" ea_localid="3086" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-07-04 15:07:45" modified="2024-03-18 13:03:23" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-07-04 15:07:45" modified="2024-07-23 11:43:37" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -2161,9 +2161,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31" xmi:type="uml:Class" name="epo-con:Deliverable" scope="public">
-				<model package="EAPK_58816F03_1038_48b7_9554_B169832124AC" tpos="0" ea_localid="2905" ea_eleType="element"/>
+				<model package="EAPK_7862159D_DEAB_4dc0_8393_25C5F20C297A" tpos="0" ea_localid="2905" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-04-11 16:27:52" modified="2024-03-18 13:03:23" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-04-11 16:27:52" modified="2024-07-23 11:43:37" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -2688,7 +2688,7 @@
 		<profiles/>
 		<diagrams>
 			<diagram xmi:id="EAID_C8C827E4_665B_43db_A783_8FBB5CAF08BE">
-				<model package="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1" localID="331" owner="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1" tpos="8"/>
+				<model package="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C" localID="331" owner="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C" tpos="8"/>
 				<properties name="contract modification eForm" type="Logical"/>
 				<project author="lps" version="1.0" created="2022-04-28 21:56:35" modified="2024-03-13 16:12:34"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=791;DocSize.cy=1134;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
@@ -2716,7 +2716,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_790B14E6_1661_4ff0_BC3F_6B02144147E0">
-				<model package="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1" localID="426" owner="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1" tpos="1"/>
+				<model package="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C" localID="426" owner="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C" tpos="1"/>
 				<properties name="contract" type="Logical"/>
 				<project author="andreea" version="1.0" created="2023-03-21 10:52:42" modified="2024-03-13 16:10:48"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
@@ -2793,7 +2793,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_2C0665CA_A78A_491e_88BC_180C3572A077">
-				<model package="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1" localID="427" owner="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1" tpos="1"/>
+				<model package="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C" localID="427" owner="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C" tpos="1"/>
 				<properties name="contract hierarchy" type="Logical"/>
 				<project author="andreea" version="1.0" created="2023-03-21 14:26:15" modified="2024-03-13 16:11:08"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
@@ -2818,7 +2818,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_3ABE52BE_CE2B_411b_8587_0CE199619F12">
-				<model package="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1" localID="428" owner="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1" tpos="3"/>
+				<model package="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C" localID="428" owner="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C" tpos="3"/>
 				<properties name="contract and lot" type="Logical"/>
 				<project author="andreea" version="1.0" created="2023-03-21 16:53:03" modified="2024-03-13 16:11:50"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
@@ -2854,11 +2854,11 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_542CAED6_F3AE_44e3_9F8A_CD66B8D4E2A7">
-				<model package="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1" localID="437" owner="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1" tpos="6"/>
+				<model package="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C" localID="437" owner="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C" tpos="6"/>
 				<properties name="contract amount and quantity" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-04-04 11:37:25" modified="2023-09-11 18:29:12"/>
+				<project author="andreea" version="1.0" created="2023-04-04 11:37:25" modified="2024-07-23 10:19:10"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=35ABBECF;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=607DDADB;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
@@ -2869,7 +2869,7 @@
 					<element geometry="Left=1432;Top=699;Right=1705;Bottom=796;" subject="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" seqno="4" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=D273674B;"/>
 					<element geometry="Left=890;Top=969;Right=980;Bottom=1029;" subject="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3" seqno="5" style="DUID=10883CF2;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=126;Top=952;Right=372;Bottom=1064;" subject="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" seqno="6" style="DUID=70217196;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=164;Top=644;Right=335;Bottom=714;" subject="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" seqno="7" style="DUID=D35E4000;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=164;Top=644;Right=396;Bottom=714;" subject="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" seqno="7" style="DUID=D35E4000;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=775;Top=855;Right=980;Bottom=925;" subject="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" seqno="8" style="DUID=E1A9DB97;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=546;Top=855;Right=636;Bottom=925;" subject="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" seqno="9" style="DUID=6E4BDEE6;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=504;Top=260;Right=679;Bottom=331;" subject="EAID_1D470B74_66C6_4e95_82A9_28C6309EBB94" seqno="10" style="DUID=11E5D1AB;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
@@ -2906,7 +2906,7 @@
 					<element geometry="EDGE=2;SX=2;SY=-61;EX=2;EY=-61;$LLB=;LLT=;LMT=;LMB=;LRT=CX=116:CY=14:OX=-37:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_C753CDC6_88B6_449b_B44C_0F56A31472A7" style="Mode=3;EOID=DA0B5F10;SOID=AF7598AB;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=371;SCTR.TOP=-977;SCTR.RIGHT=402;SCTR.BOTTOM=-962;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=372:-977$402:-977$402:-962$372:-962$;" subject="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24" style="Mode=3;EOID=70217196;SOID=70217196;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=2;SX=1;SY=-86;EX=1;EY=-86;$LLB=;LLT=;LMT=;LMB=;LRT=CX=123:CY=14:OX=-36:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_C3F576CC_0DFC_40d6_86C4_6F47177DB0C6" style="Mode=3;EOID=DA0B5F10;SOID=AF7598AB;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=92:CY=14:OX=45:OY=-24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807" style="Mode=3;EOID=70217196;SOID=D35E4000;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;EX=-62;EY=-13;SX=-62;SY=-13;$LLB=;LLT=;LMT=;LMB=;LRT=CX=92:CY=14:OX=45:OY=-24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807" style="Mode=3;EOID=70217196;SOID=D35E4000;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;SX=14;SY=4;EX=15;EY=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=74:CY=14:OX=44:OY=-13:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_30CBA4D5_2CA0_4043_A8BC_8FBCF102380D" style="Mode=3;EOID=10883CF2;SOID=E1A9DB97;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=-17;EX=0;EY=-35;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=298:-907$;" subject="EAID_AA589EDA_B26B_44c3_BCCC_37421BA960DE" style="Mode=3;EOID=D35E4000;SOID=6E4BDEE6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0AC5D04E_7364_4118_9D94_CE93A68B3CF9" style="Mode=3;EOID=E1A9DB97;SOID=6E4BDEE6;Color=-1;LWidth=0;Hidden=0;"/>
@@ -2917,7 +2917,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_18EBC143_4E14_4922_BD6F_14875E8F79FE">
-				<model package="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1" localID="441" owner="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1" tpos="4"/>
+				<model package="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C" localID="441" owner="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C" tpos="4"/>
 				<properties name="contract deliverable" type="Logical"/>
 				<project author="andreea" version="1.0" created="2023-04-11 16:26:14" modified="2023-09-11 18:27:05"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
@@ -2956,7 +2956,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_AC6531EC_BF50_48e1_BAB3_75F8F68D5092">
-				<model package="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1" localID="442" owner="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1" tpos="2"/>
+				<model package="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C" localID="442" owner="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C" tpos="2"/>
 				<properties name="contract roles" type="Logical"/>
 				<project author="andreea" version="1.0" created="2023-04-11 17:04:01" modified="2024-03-13 16:11:29"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
@@ -2985,7 +2985,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_FBEEEA5A_5887_4162_8717_4D8A5551405C">
-				<model package="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1" localID="460" owner="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1" tpos="7"/>
+				<model package="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C" localID="460" owner="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C" tpos="7"/>
 				<properties name="contract modification std form" type="Logical"/>
 				<project author="andreea" version="1.0" created="2023-05-11 16:40:42" modified="2024-03-13 16:12:16"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
@@ -3037,7 +3037,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_BD365BA4_FB8A_4fc3_8D9D_5445218300B9">
-				<model package="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1" localID="461" owner="EAPK_E279371D_4C53_4e66_9DA4_9DE0ACD112D1" tpos="5"/>
+				<model package="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C" localID="461" owner="EAPK_07552A0B_12BD_4a70_8E41_E7C3CDEA005C" tpos="5"/>
 				<properties name="contract documents" type="Logical"/>
 				<project author="andreea" version="1.0" created="2023-05-22 12:13:10" modified="2023-09-11 18:28:50"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
diff --git a/implementation/eFulfilment/model2owl-config/config-parameters.xsl b/implementation/eFulfilment/model2owl-config/config-parameters.xsl
index af7f9a37..59214a6f 100644
--- a/implementation/eFulfilment/model2owl-config/config-parameters.xsl
+++ b/implementation/eFulfilment/model2owl-config/config-parameters.xsl
@@ -122,11 +122,11 @@
     <!--    owl:incompatibleWith -->
     <xsl:variable name="incompatibleWith" select="'3.1.0'"/>
     <!--    owl:versionInfo -->
-    <xsl:variable name="versionInfo" select="'4.1.0'"/>
+    <xsl:variable name="versionInfo" select="'4.2.0'"/>
     <!--    bibo:status-->
     <xsl:variable name="ontologyStatus" select="'Semantic Specification Release'"/>
     <!--    owl:priorVersion -->
-    <xsl:variable name="priorVersion" select="'4.0.2'"/>
+    <xsl:variable name="priorVersion" select="'4.1.0'"/>
     <!--    vann:preferredNamespaceUri -->
     <xsl:variable name="preferredNamespaceUri" select="'http://data.europa.eu/a4g/ontology#'"/>
     <!--    vann:preferredNamespacePrefix -->
diff --git a/implementation/eFulfilment/model2owl-config/namespaces.xml b/implementation/eFulfilment/model2owl-config/namespaces.xml
index 31dd8e3a..8cc203c5 100644
--- a/implementation/eFulfilment/model2owl-config/namespaces.xml
+++ b/implementation/eFulfilment/model2owl-config/namespaces.xml
@@ -21,6 +21,7 @@
     <prefix name="epo-ful" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-acc" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-sub" value="http://data.europa.eu/a4g/ontology#"/>
+    <prefix name="epo-inv" value="http://data.europa.eu/a4g/ontology#"/>
 
     <prefix name="nuts" value="http://data.europa.eu/nuts/"/>
     <prefix name="espd" value="https://github.com/ESPD/ESPD-EDM/"/>
diff --git a/implementation/eFulfilment/xmi_conceptual_model/eFulfilment.xml b/implementation/eFulfilment/xmi_conceptual_model/eFulfilment.xml
index 776c2b33..d4c8d30b 100644
--- a/implementation/eFulfilment/xmi_conceptual_model/eFulfilment.xml
+++ b/implementation/eFulfilment/xmi_conceptual_model/eFulfilment.xml
@@ -4,12 +4,49 @@
 	<uml:Model xmi:type="uml:Model" name="EA_Model">
 		<packagedElement xmi:type="uml:Package" xmi:id="EAPK_C5E3D6A4_38B2_4388_A589_2A55A094F6B3" name="Fulfilment">
 			<packagedElement xmi:type="uml:Package" xmi:id="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" name="despatch advice">
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_9F90CA42_2AD5_4086_8537_A3D0531D27FD" name="diagrams">
-					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_27ECEEC8_871D_4826_8EA1_8E10F63A1500" body="isReturnable attribute needs to be checked on whether it is useful or not.">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" name="diagrams">
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_ED784F3F_23C1_491d_A870_BC4A0B51E6B7" body="to be removed from future ePO version">
+						<annotatedElement xmi:idref="EAID_9F290187_06CC_4af8_83C9_F475091E0C14"/>
+						<annotatedElement xmi:idref="EAID_7DD90B0C_4D89_4d64_AC1D_F32A308572D4"/>
+					</ownedComment>
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_D8A8B96C_BD80_4776_8875_507427F96AF2" body="to remove epo-ful:hasVehicleDescription">
+						<annotatedElement xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+					</ownedComment>
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_D5D11C8E_0306_4f62_986A_C58347A2EB63" body="to be removed in a future ePO version">
+						<annotatedElement xmi:idref="EAID_5009F883_10B2_4e9c_96A3_A1F92BE8EA63"/>
+						<annotatedElement xmi:idref="EAID_2E9FE66A_E025_4563_9A59_461990838D96"/>
+						<annotatedElement xmi:idref="EAID_053FA551_E0F4_4d8a_9787_DB2496C70148"/>
+					</ownedComment>
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_D25408FD_102C_45ac_8B0F_E2AD6B66BE37" body="proposal to be removed in the future ePO version">
+						<annotatedElement xmi:idref="EAID_79AEE9C5_EA86_424b_9486_C235014D3693"/>
+						<annotatedElement xmi:idref="EAID_9D8A2FCD_752D_45a9_9023_77697592FF3C"/>
+					</ownedComment>
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_C94A7466_0773_451f_8CF7_C481027E03FA" body="proposal to be removed in the future ePO version">
+						<annotatedElement xmi:idref="EAID_79AEE9C5_EA86_424b_9486_C235014D3693"/>
+						<annotatedElement xmi:idref="EAID_9D8A2FCD_752D_45a9_9023_77697592FF3C"/>
+						<annotatedElement xmi:idref="EAID_EA77B614_F9B2_464f_9F87_43543F10AEA4"/>
+					</ownedComment>
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_AFF2FF49_6801_472a_B12C_681ECC691BB8" body="we should re-use epo-ord:hasShippingMark instead of epo-ful:hasShippingMark.">
+						<annotatedElement xmi:idref="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE"/>
+					</ownedComment>
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_864B4AE7_D2C6_4c67_93BC_19F9D69F8197" body="to be removed in a future ePO version and to re-use epo-ful:hasDeclaredStatisticalValue instead.">
+						<annotatedElement xmi:idref="EAID_569C582B_2F50_4a11_B7B6_50CA2F0A9B94"/>
+					</ownedComment>
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_78B45A5F_C144_44a4_AA5E_1F31B11EAC62" body="to be removed from future ePO version&#xA;">
+						<annotatedElement xmi:idref="EAID_45480564_D6B2_41da_8694_DC63D52825C1"/>
+						<annotatedElement xmi:idref="EAID_75378C4F_ABAD_440f_8E1B_502A7CDA0486"/>
+					</ownedComment>
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_37B4C249_5774_4d78_8572_20C458910F29" body="This class was wrongly named and has been replaced by epo-ful:NotificationReceiver. It will be removed in the next major release. &#xA;">
+						<annotatedElement xmi:idref="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184"/>
+					</ownedComment>
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_27ECEEC8_871D_4826_8EA1_8E10F63A1500" body="isReturnable attribute should be removed in a future release.">
 						<annotatedElement xmi:idref="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA"/>
 					</ownedComment>
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_0A77CA66_1049_4c72_8493_0DB77A3F5DD2" body="used for rail car identifier.&#xA;">
+						<annotatedElement xmi:idref="EAID_77553B39_DB4D_4388_9D1B_8C8E24EB522C"/>
+					</ownedComment>
 				</packagedElement>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_8F63D40D_7F22_4ec4_8775_4576642A2A08" name="classes">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_CA125651_CFD9_48ea_99C3_25D0C029AD03" name="classes">
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_BB1AAA4C_E66B_4fde_A0B6_1A30FC13503B" name="epo-ful:TemperatureSpecification">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_A3FFD06D_B4CC_4c60_9D01_BAAA3CCE5A27" name="dct:description">
 							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000001_B4CC_4c60_9D01_BAAA3CCE5A27" value="0"/>
@@ -424,7 +461,7 @@
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_61578ED8_0C54_435b_A73F_AD86550D22E1" general="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstAB192B_82DE_4520_A51F_2425A6DBF32F" name="epo-ful:containsGoodsItem" association="EAID_7EAB192B_82DE_4520_A51F_2425A6DBF32F">
 							<type xmi:idref="EAID_C215EC75_82FD_45d3_832A_B3989A897692"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000065__82DE_4520_A51F_2425A6DBF32F" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000065__82DE_4520_A51F_2425A6DBF32F" value="0"/>
 							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000066__82DE_4520_A51F_2425A6DBF32F" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst19EBC4_BBC6_421b_A4B4_978BEF67A273" name="epo-ful:containsPackage" association="EAID_A219EBC4_BBC6_421b_A4B4_978BEF67A273">
@@ -577,90 +614,115 @@
 							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000103__E025_4563_9A59_461990838D96" value="0"/>
 							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000104__E025_4563_9A59_461990838D96" value="1"/>
 						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst284C1D_C098_4082_BE39_99AFCAAF2C1F" name="epo-ful:hasDespatcherConsignmentID" association="EAID_36284C1D_C098_4082_BE39_99AFCAAF2C1F">
+							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000105__C098_4082_BE39_99AFCAAF2C1F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000106__C098_4082_BE39_99AFCAAF2C1F" value="1"/>
+						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst454BB2_FC26_49ad_948C_F84C001C68E4" name="epo:specifiesNotifier" association="EAID_3C454BB2_FC26_49ad_948C_F84C001C68E4">
 							<type xmi:idref="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000105__FC26_49ad_948C_F84C001C68E4" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000106__FC26_49ad_948C_F84C001C68E4" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000107__FC26_49ad_948C_F84C001C68E4" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000108__FC26_49ad_948C_F84C001C68E4" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst54F6F9_658D_40fe_9D16_D79F46DB945C" name="epo-ful:hasNetWeight" association="EAID_3D54F6F9_658D_40fe_9D16_D79F46DB945C">
 							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000107__658D_40fe_9D16_D79F46DB945C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000108__658D_40fe_9D16_D79F46DB945C" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000109__658D_40fe_9D16_D79F46DB945C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000110__658D_40fe_9D16_D79F46DB945C" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst480564_D6B2_41da_8694_DC63D52825C1" name="epo-ful:hasChargeableWeight" association="EAID_45480564_D6B2_41da_8694_DC63D52825C1">
 							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000109__D6B2_41da_8694_DC63D52825C1" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000110__D6B2_41da_8694_DC63D52825C1" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000111__D6B2_41da_8694_DC63D52825C1" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000112__D6B2_41da_8694_DC63D52825C1" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst018782_9090_4ec2_95E6_BC660BB6F161" name="epo:specifiesFreightForwarder" association="EAID_4D018782_9090_4ec2_95E6_BC660BB6F161">
 							<type xmi:idref="EAID_CE66C7F9_83F7_479f_89C7_9BC5ACC1EEFB"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000111__9090_4ec2_95E6_BC660BB6F161" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000112__9090_4ec2_95E6_BC660BB6F161" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000113__9090_4ec2_95E6_BC660BB6F161" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000114__9090_4ec2_95E6_BC660BB6F161" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst09F883_10B2_4e9c_96A3_A1F92BE8EA63" name="epo-ful:hasConsignmentFreeOnBoardValue" association="EAID_5009F883_10B2_4e9c_96A3_A1F92BE8EA63">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000113__10B2_4e9c_96A3_A1F92BE8EA63" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000114__10B2_4e9c_96A3_A1F92BE8EA63" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000115__10B2_4e9c_96A3_A1F92BE8EA63" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000116__10B2_4e9c_96A3_A1F92BE8EA63" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst9C582B_2F50_4a11_B7B6_50CA2F0A9B94" name="epo-ful:hasConsignmentDeclaredStatisticsValue" association="EAID_569C582B_2F50_4a11_B7B6_50CA2F0A9B94">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000115__2F50_4a11_B7B6_50CA2F0A9B94" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000116__2F50_4a11_B7B6_50CA2F0A9B94" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000117__2F50_4a11_B7B6_50CA2F0A9B94" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000118__2F50_4a11_B7B6_50CA2F0A9B94" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst5BD66A_585D_4646_9A7B_894EA99DED44" name="epo-ful:hasTransportHandlingUnitQuantity" association="EAID_5C5BD66A_585D_4646_9A7B_894EA99DED44">
 							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000117__585D_4646_9A7B_894EA99DED44" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000118__585D_4646_9A7B_894EA99DED44" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000119__585D_4646_9A7B_894EA99DED44" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000120__585D_4646_9A7B_894EA99DED44" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstA6B6C9_7964_4102_A413_050778056B72" name="epo-ful:hasFreightCharge" association="EAID_6DA6B6C9_7964_4102_A413_050778056B72">
+							<type xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000121__7964_4102_A413_050778056B72" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000122__7964_4102_A413_050778056B72" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE249AD_BE82_405c_AC1C_956CD538804F" name="epo-ful:hasLoadingMeter" association="EAID_73E249AD_BE82_405c_AC1C_956CD538804F">
+							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000123__BE82_405c_AC1C_956CD538804F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000124__BE82_405c_AC1C_956CD538804F" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst378C4F_ABAD_440f_8E1B_502A7CDA0486" name="epo-ful:hasLoadingLength" association="EAID_75378C4F_ABAD_440f_8E1B_502A7CDA0486">
 							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000119__ABAD_440f_8E1B_502A7CDA0486" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000120__ABAD_440f_8E1B_502A7CDA0486" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000125__ABAD_440f_8E1B_502A7CDA0486" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000126__ABAD_440f_8E1B_502A7CDA0486" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst3AAD71_420E_40ee_B221_B2A54F890D2D" name="epo-ful:hasMainCarriageShipmentStage" association="EAID_783AAD71_420E_40ee_B221_B2A54F890D2D">
 							<type xmi:idref="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000121__420E_40ee_B221_B2A54F890D2D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000122__420E_40ee_B221_B2A54F890D2D" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000127__420E_40ee_B221_B2A54F890D2D" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000128__420E_40ee_B221_B2A54F890D2D" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstD90B0C_4D89_4d64_AC1D_F32A308572D4" name="epo-ful:hasFreightForwarderConsignmentID" association="EAID_7DD90B0C_4D89_4d64_AC1D_F32A308572D4">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000123__4D89_4d64_AC1D_F32A308572D4" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000124__4D89_4d64_AC1D_F32A308572D4" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000129__4D89_4d64_AC1D_F32A308572D4" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000130__4D89_4d64_AC1D_F32A308572D4" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst56C81B_B46D_49ef_B3BF_333FDA416F39" name="epo-ful:hasGrossVolume" association="EAID_8C56C81B_B46D_49ef_B3BF_333FDA416F39">
 							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000125__B46D_49ef_B3BF_333FDA416F39" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000126__B46D_49ef_B3BF_333FDA416F39" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000131__B46D_49ef_B3BF_333FDA416F39" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000132__B46D_49ef_B3BF_333FDA416F39" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst290187_06CC_4af8_83C9_F475091E0C14" name="epo-ful:hasCarrierConsignmentID" association="EAID_9F290187_06CC_4af8_83C9_F475091E0C14">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000127__06CC_4af8_83C9_F475091E0C14" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000128__06CC_4af8_83C9_F475091E0C14" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000133__06CC_4af8_83C9_F475091E0C14" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000134__06CC_4af8_83C9_F475091E0C14" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst665A13_AEF0_4cf6_ACC2_F2FE3A90C76A" name="epo-ful:containsTransportHandlingUnit" association="EAID_A0665A13_AEF0_4cf6_ACC2_F2FE3A90C76A">
 							<type xmi:idref="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000129__AEF0_4cf6_ACC2_F2FE3A90C76A" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000130__AEF0_4cf6_ACC2_F2FE3A90C76A" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000135__AEF0_4cf6_ACC2_F2FE3A90C76A" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000136__AEF0_4cf6_ACC2_F2FE3A90C76A" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst87E36F_7CEB_4668_B1A5_01DDEE025D3A" name="epo-ful:hasDeclaredStatisticalValue" association="EAID_A287E36F_7CEB_4668_B1A5_01DDEE025D3A">
+							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000137__7CEB_4668_B1A5_01DDEE025D3A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000138__7CEB_4668_B1A5_01DDEE025D3A" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst66B869_99C4_4539_8CD9_ECD02C462F1D" name="epo:specifiesNotificationReceiver" association="EAID_C466B869_99C4_4539_8CD9_ECD02C462F1D">
+							<type xmi:idref="EAID_0D5BCA5B_42CB_4202_9453_012E0A141952"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000139__99C4_4539_8CD9_ECD02C462F1D" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000140__99C4_4539_8CD9_ECD02C462F1D" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstCD32F8_8180_4939_A987_53BA66264912" name="epo-ful:hasConsigneeConsignmentID" association="EAID_F3CD32F8_8180_4939_A987_53BA66264912">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000131__8180_4939_A987_53BA66264912" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000132__8180_4939_A987_53BA66264912" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000141__8180_4939_A987_53BA66264912" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000142__8180_4939_A987_53BA66264912" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst3A2AAD_C014_4fa4_88EE_23DE2339DB3C" name="epo-ful:hasTotalGoodsItemQuantity" association="EAID_F93A2AAD_C014_4fa4_88EE_23DE2339DB3C">
 							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000133__C014_4fa4_88EE_23DE2339DB3C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000134__C014_4fa4_88EE_23DE2339DB3C" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000143__C014_4fa4_88EE_23DE2339DB3C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000144__C014_4fa4_88EE_23DE2339DB3C" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF5CFA7_D31A_4c48_80EF_346FB3152195" name="epo-ful:hasGrossWeight" association="EAID_F9F5CFA7_D31A_4c48_80EF_346FB3152195">
 							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000135__D31A_4c48_80EF_346FB3152195" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000136__D31A_4c48_80EF_346FB3152195" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000145__D31A_4c48_80EF_346FB3152195" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000146__D31A_4c48_80EF_346FB3152195" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstFFE3B6_925B_4b80_A519_F160F8927173" name="epo-ful:hasRequestedPickUpInformation" association="EAID_FBFFE3B6_925B_4b80_A519_F160F8927173">
 							<type xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000137__925B_4b80_A519_F160F8927173" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000138__925B_4b80_A519_F160F8927173" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000147__925B_4b80_A519_F160F8927173" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000148__925B_4b80_A519_F160F8927173" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_053FA551_E0F4_4d8a_9787_DB2496C70148">
@@ -684,6 +746,13 @@
 							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_36284C1D_C098_4082_BE39_99AFCAAF2C1F">
+						<memberEnd xmi:idref="EAID_dst284C1D_C098_4082_BE39_99AFCAAF2C1F"/>
+						<memberEnd xmi:idref="EAID_src284C1D_C098_4082_BE39_99AFCAAF2C1F"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src284C1D_C098_4082_BE39_99AFCAAF2C1F" association="EAID_36284C1D_C098_4082_BE39_99AFCAAF2C1F">
+							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3D54F6F9_658D_40fe_9D16_D79F46DB945C">
 						<memberEnd xmi:idref="EAID_dst54F6F9_658D_40fe_9D16_D79F46DB945C"/>
 						<memberEnd xmi:idref="EAID_src54F6F9_658D_40fe_9D16_D79F46DB945C"/>
@@ -719,6 +788,20 @@
 							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6DA6B6C9_7964_4102_A413_050778056B72">
+						<memberEnd xmi:idref="EAID_dstA6B6C9_7964_4102_A413_050778056B72"/>
+						<memberEnd xmi:idref="EAID_srcA6B6C9_7964_4102_A413_050778056B72"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA6B6C9_7964_4102_A413_050778056B72" association="EAID_6DA6B6C9_7964_4102_A413_050778056B72">
+							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_73E249AD_BE82_405c_AC1C_956CD538804F">
+						<memberEnd xmi:idref="EAID_dstE249AD_BE82_405c_AC1C_956CD538804F"/>
+						<memberEnd xmi:idref="EAID_srcE249AD_BE82_405c_AC1C_956CD538804F"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE249AD_BE82_405c_AC1C_956CD538804F" association="EAID_73E249AD_BE82_405c_AC1C_956CD538804F">
+							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_75378C4F_ABAD_440f_8E1B_502A7CDA0486">
 						<memberEnd xmi:idref="EAID_dst378C4F_ABAD_440f_8E1B_502A7CDA0486"/>
 						<memberEnd xmi:idref="EAID_src378C4F_ABAD_440f_8E1B_502A7CDA0486"/>
@@ -755,6 +838,20 @@
 							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A287E36F_7CEB_4668_B1A5_01DDEE025D3A">
+						<memberEnd xmi:idref="EAID_dst87E36F_7CEB_4668_B1A5_01DDEE025D3A"/>
+						<memberEnd xmi:idref="EAID_src87E36F_7CEB_4668_B1A5_01DDEE025D3A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src87E36F_7CEB_4668_B1A5_01DDEE025D3A" association="EAID_A287E36F_7CEB_4668_B1A5_01DDEE025D3A">
+							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C466B869_99C4_4539_8CD9_ECD02C462F1D">
+						<memberEnd xmi:idref="EAID_dst66B869_99C4_4539_8CD9_ECD02C462F1D"/>
+						<memberEnd xmi:idref="EAID_src66B869_99C4_4539_8CD9_ECD02C462F1D"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src66B869_99C4_4539_8CD9_ECD02C462F1D" association="EAID_C466B869_99C4_4539_8CD9_ECD02C462F1D">
+							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F3CD32F8_8180_4939_A987_53BA66264912">
 						<memberEnd xmi:idref="EAID_dstCD32F8_8180_4939_A987_53BA66264912"/>
 						<memberEnd xmi:idref="EAID_srcCD32F8_8180_4939_A987_53BA66264912"/>
@@ -790,32 +887,35 @@
 							<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_0D5BCA5B_42CB_4202_9453_012E0A141952" name="epo-ful:NotificationReceiver">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_0E005307_D7E7_4c2a_B693_817916BDFA4B" general="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" name="epo-ful:DespatchLine">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_B772CC17_2873_4964_9C08_D45EC3DCC68F" name="epo-ful:hasOutstandingQuantityReason">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000139_2873_4964_9C08_D45EC3DCC68F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000140_2873_4964_9C08_D45EC3DCC68F" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000149_2873_4964_9C08_D45EC3DCC68F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000150_2873_4964_9C08_D45EC3DCC68F" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE8EC44_CB4C_4aa9_8218_75D01ED44538" name="epo-ful:hasDespatchedQuantity" association="EAID_65E8EC44_CB4C_4aa9_8218_75D01ED44538">
 							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000141__CB4C_4aa9_8218_75D01ED44538" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000142__CB4C_4aa9_8218_75D01ED44538" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000151__CB4C_4aa9_8218_75D01ED44538" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000152__CB4C_4aa9_8218_75D01ED44538" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstDD570C_FEF5_4342_A009_CBC3D19B20B5" name="epo-ful:hasAssociatedDocument" association="EAID_6ADD570C_FEF5_4342_A009_CBC3D19B20B5">
 							<type xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000143__FEF5_4342_A009_CBC3D19B20B5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000144__FEF5_4342_A009_CBC3D19B20B5" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000153__FEF5_4342_A009_CBC3D19B20B5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000154__FEF5_4342_A009_CBC3D19B20B5" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstD24239_8F4D_44c8_97D1_1C26296607DA" name="epo-ful:hasOutstandingQuantity" association="EAID_95D24239_8F4D_44c8_97D1_1C26296607DA">
 							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000145__8F4D_44c8_97D1_1C26296607DA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000146__8F4D_44c8_97D1_1C26296607DA" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000155__8F4D_44c8_97D1_1C26296607DA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000156__8F4D_44c8_97D1_1C26296607DA" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_A88D0B55_1D01_4b73_B27A_8F69BE5B1455" general="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst259612_87E6_4f34_A3AA_B5B7E513AEA0" name="epo-ful:refersToOrderLine" association="EAID_B0259612_87E6_4f34_A3AA_B5B7E513AEA0">
 							<type xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000147__87E6_4f34_A3AA_B5B7E513AEA0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000148__87E6_4f34_A3AA_B5B7E513AEA0" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000157__87E6_4f34_A3AA_B5B7E513AEA0" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000158__87E6_4f34_A3AA_B5B7E513AEA0" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_65E8EC44_CB4C_4aa9_8218_75D01ED44538">
@@ -876,25 +976,25 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE" name="epo-ful:TransportHandlingUnit">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_9415F538_3385_43d5_ACA4_5CECFE7F5116" name="epo-ful:hasShippingMark">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000149_3385_43d5_ACA4_5CECFE7F5116" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000150_3385_43d5_ACA4_5CECFE7F5116" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000159_3385_43d5_ACA4_5CECFE7F5116" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000160_3385_43d5_ACA4_5CECFE7F5116" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_45AF7447_212B_4746_92CC_AC97100E9D83" name="epo-ful:hasHandlingInstruction">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000151_212B_4746_92CC_AC97100E9D83" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000152_212B_4746_92CC_AC97100E9D83" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000161_212B_4746_92CC_AC97100E9D83" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000162_212B_4746_92CC_AC97100E9D83" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_2AB47C99_7B9A_495c_838D_198E22FE4C02" general="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst907E97_8458_42ef_B2AC_3DB623B8AA78" name="epo-ful:usesTransportEquipment" association="EAID_A3907E97_8458_42ef_B2AC_3DB623B8AA78">
 							<type xmi:idref="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000153__8458_42ef_B2AC_3DB623B8AA78" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000154__8458_42ef_B2AC_3DB623B8AA78" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000163__8458_42ef_B2AC_3DB623B8AA78" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000164__8458_42ef_B2AC_3DB623B8AA78" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst77B614_F9B2_464f_9F87_43543F10AEA4" name="epo-ful:transportsItemFrom" association="EAID_EA77B614_F9B2_464f_9F87_43543F10AEA4">
 							<type xmi:idref="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000155__F9B2_464f_9F87_43543F10AEA4" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000156__F9B2_464f_9F87_43543F10AEA4" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000165__F9B2_464f_9F87_43543F10AEA4" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000166__F9B2_464f_9F87_43543F10AEA4" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_27E9E48A_CCBA_48c3_A27B_53F4397FF22D" supplier="EAID_894938CF_E95C_498c_9C4C_0FD3115E2A2A" client="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE"/>
@@ -907,40 +1007,45 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" name="epo-ful:ShipmentInformation">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_2BA699ED_5F72_4730_9D8B_AE6943FFEA19" name="epo-ful:despatchDate">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000157_5F72_4730_9D8B_AE6943FFEA19" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000158_5F72_4730_9D8B_AE6943FFEA19" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000167_5F72_4730_9D8B_AE6943FFEA19" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000168_5F72_4730_9D8B_AE6943FFEA19" value="1"/>
 							<type xmi:idref="EAJava_xsd_dateTime"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_28AF8CA1_35B0_4391_9102_7B982687C5DB" name="dct:description">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000159_35B0_4391_9102_7B982687C5DB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000160_35B0_4391_9102_7B982687C5DB" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000169_35B0_4391_9102_7B982687C5DB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000170_35B0_4391_9102_7B982687C5DB" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstC78626_167C_4c06_AF8A_1D37420731A9" name="epo-ful:hasEstimatedDeliveryPeriod" association="EAID_11C78626_167C_4c06_AF8A_1D37420731A9">
 							<type xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000161__167C_4c06_AF8A_1D37420731A9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000162__167C_4c06_AF8A_1D37420731A9" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000171__167C_4c06_AF8A_1D37420731A9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000172__167C_4c06_AF8A_1D37420731A9" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst930003_5665_43a6_9887_A78953BBB2E2" name="epo-ful:hasDespatchPeriod" association="EAID_3A930003_5665_43a6_9887_A78953BBB2E2">
+							<type xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000173__5665_43a6_9887_A78953BBB2E2" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000174__5665_43a6_9887_A78953BBB2E2" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_74FDD051_8991_4328_BB5F_DB2625DE81D1" general="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstBA1AAD_DA48_4953_9445_B3D0C269B4E6" name="epo-ful:refersToDeliveryInformation" association="EAID_B9BA1AAD_DA48_4953_9445_B3D0C269B4E6">
 							<type xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000163__DA48_4953_9445_B3D0C269B4E6" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000164__DA48_4953_9445_B3D0C269B4E6" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000175__DA48_4953_9445_B3D0C269B4E6" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000176__DA48_4953_9445_B3D0C269B4E6" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstC433B7_9297_4921_9069_80DF68AD408A" name="adms:identifier" association="EAID_C7C433B7_9297_4921_9069_80DF68AD408A">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000165__9297_4921_9069_80DF68AD408A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000166__9297_4921_9069_80DF68AD408A" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000177__9297_4921_9069_80DF68AD408A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000178__9297_4921_9069_80DF68AD408A" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst3AAA5F_2719_4ea3_8E3F_AB7111A1C8C8" name="epo-ful:specifiesPlaceOfDespatch" association="EAID_F53AAA5F_2719_4ea3_8E3F_AB7111A1C8C8">
 							<type xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000167__2719_4ea3_8E3F_AB7111A1C8C8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000168__2719_4ea3_8E3F_AB7111A1C8C8" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000179__2719_4ea3_8E3F_AB7111A1C8C8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000180__2719_4ea3_8E3F_AB7111A1C8C8" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst183E35_6937_4f66_AFD3_4B863C07ABEE" name="epo-ful:isSpecificToDespatchLine" association="EAID_FD183E35_6937_4f66_AFD3_4B863C07ABEE">
 							<type xmi:idref="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000169__6937_4f66_AFD3_4B863C07ABEE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000170__6937_4f66_AFD3_4B863C07ABEE" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000181__6937_4f66_AFD3_4B863C07ABEE" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000182__6937_4f66_AFD3_4B863C07ABEE" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_11C78626_167C_4c06_AF8A_1D37420731A9">
@@ -950,6 +1055,13 @@
 							<type xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3A930003_5665_43a6_9887_A78953BBB2E2">
+						<memberEnd xmi:idref="EAID_dst930003_5665_43a6_9887_A78953BBB2E2"/>
+						<memberEnd xmi:idref="EAID_src930003_5665_43a6_9887_A78953BBB2E2"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src930003_5665_43a6_9887_A78953BBB2E2" association="EAID_3A930003_5665_43a6_9887_A78953BBB2E2">
+							<type xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B9BA1AAD_DA48_4953_9445_B3D0C269B4E6">
 						<memberEnd xmi:idref="EAID_dstBA1AAD_DA48_4953_9445_B3D0C269B4E6"/>
 						<memberEnd xmi:idref="EAID_srcBA1AAD_DA48_4953_9445_B3D0C269B4E6"/>
@@ -1012,54 +1124,54 @@
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" name="epo-ful:DespatchAdvice">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstABFF05_AE37_4d14_9F45_D060A347AAB9" name="epo-ful:refersToOrder" association="EAID_05ABFF05_AE37_4d14_9F45_D060A347AAB9">
 							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000171__AE37_4d14_9F45_D060A347AAB9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000172__AE37_4d14_9F45_D060A347AAB9" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000183__AE37_4d14_9F45_D060A347AAB9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000184__AE37_4d14_9F45_D060A347AAB9" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst78D73E_7BA7_4bf0_9D36_DD776DFC8538" name="epo-ful:refersToShipmentAgreement" association="EAID_0A78D73E_7BA7_4bf0_9D36_DD776DFC8538">
 							<type xmi:idref="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000173__7BA7_4bf0_9D36_DD776DFC8538" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000174__7BA7_4bf0_9D36_DD776DFC8538" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000185__7BA7_4bf0_9D36_DD776DFC8538" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000186__7BA7_4bf0_9D36_DD776DFC8538" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst1E7032_36A3_4c8b_8FFF_C8B67B4CF87D" name="epo-ful:comprisesDespatchLine" association="EAID_121E7032_36A3_4c8b_8FFF_C8B67B4CF87D">
 							<type xmi:idref="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000175__36A3_4c8b_8FFF_C8B67B4CF87D" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000176__36A3_4c8b_8FFF_C8B67B4CF87D" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000187__36A3_4c8b_8FFF_C8B67B4CF87D" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000188__36A3_4c8b_8FFF_C8B67B4CF87D" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst127BB3_2702_45c1_99BF_B659211FD91B" name="epo-ful:hasAssociatedDocument" association="EAID_6A127BB3_2702_45c1_99BF_B659211FD91B">
 							<type xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000177__2702_45c1_99BF_B659211FD91B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000178__2702_45c1_99BF_B659211FD91B" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000189__2702_45c1_99BF_B659211FD91B" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000190__2702_45c1_99BF_B659211FD91B" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstAEE9C5_EA86_424b_9486_C235014D3693" name="epo-ful:specifiesShipment" association="EAID_79AEE9C5_EA86_424b_9486_C235014D3693">
 							<type xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000179__EA86_424b_9486_C235014D3693" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000180__EA86_424b_9486_C235014D3693" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000191__EA86_424b_9486_C235014D3693" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000192__EA86_424b_9486_C235014D3693" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst0FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD" name="epo-ful:specifiesConsignee" association="EAID_850FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD">
 							<type xmi:idref="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000181__6BCF_46e3_A7FC_2B4BAC3C8DBD" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000182__6BCF_46e3_A7FC_2B4BAC3C8DBD" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000193__6BCF_46e3_A7FC_2B4BAC3C8DBD" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000194__6BCF_46e3_A7FC_2B4BAC3C8DBD" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst042A72_F34F_4e88_A8B6_7BE5B0CB8B20" name="epo-ful:specifiesOriginator" association="EAID_95042A72_F34F_4e88_A8B6_7BE5B0CB8B20">
 							<type xmi:idref="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000183__F34F_4e88_A8B6_7BE5B0CB8B20" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000184__F34F_4e88_A8B6_7BE5B0CB8B20" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000195__F34F_4e88_A8B6_7BE5B0CB8B20" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000196__F34F_4e88_A8B6_7BE5B0CB8B20" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst8A2FCD_752D_45a9_9023_77697592FF3C" name="epo-ful:specifiesTransportHandlingUnits" association="EAID_9D8A2FCD_752D_45a9_9023_77697592FF3C">
 							<type xmi:idref="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000185__752D_45a9_9023_77697592FF3C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000186__752D_45a9_9023_77697592FF3C" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000197__752D_45a9_9023_77697592FF3C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000198__752D_45a9_9023_77697592FF3C" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstB12A9D_029A_4c46_9583_5FF42CA3E096" name="epo-ful:refersToConsignment" association="EAID_D6B12A9D_029A_4c46_9583_5FF42CA3E096">
 							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000187__029A_4c46_9583_5FF42CA3E096" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000188__029A_4c46_9583_5FF42CA3E096" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000199__029A_4c46_9583_5FF42CA3E096" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000200__029A_4c46_9583_5FF42CA3E096" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_D8E29289_C54A_4d5e_987B_AEF828189A10" general="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst1C243F_824F_48fd_8601_BEA52AB5E730" name="epo-ful:specifiesDespatcher" association="EAID_E91C243F_824F_48fd_8601_BEA52AB5E730">
 							<type xmi:idref="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000189__824F_48fd_8601_BEA52AB5E730" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000190__824F_48fd_8601_BEA52AB5E730" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000201__824F_48fd_8601_BEA52AB5E730" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000202__824F_48fd_8601_BEA52AB5E730" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_05ABFF05_AE37_4d14_9F45_D060A347AAB9">
@@ -1098,11 +1210,18 @@
 							<type xmi:idref="EAID_CF553CC8_8DC9_4ea2_B386_8ACB39A17657"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_FEAC08B7_4534_4c6e_98AB_31083434E530">
+						<memberEnd xmi:idref="EAID_dstAC08B7_4534_4c6e_98AB_31083434E530"/>
+						<memberEnd xmi:idref="EAID_srcAC08B7_4534_4c6e_98AB_31083434E530"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcAC08B7_4534_4c6e_98AB_31083434E530" association="EAID_FEAC08B7_4534_4c6e_98AB_31083434E530">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_78459D23_BCB4_42bb_83F6_F9D8F550B19D" name="epo-ful:Carrier">
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_70DB7081_2834_461e_8B11_0F74ABE52935" general="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
 					</packagedElement>
 				</packagedElement>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_B5BD11CB_9809_407e_B123_6EE35FBFE87D" name="controlled vocabularies">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_9CE0A2ED_E903_4870_AD9E_E55443EB3C37" name="controlled vocabularies">
 					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_D72442ED_835D_455e_970E_3D4CAF26A2F5" name="at-voc-new:allowance-charge-reason"/>
 					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_0648E479_6FDB_4549_8A77_989FA3BA7568" name="at-voc-new:despatch-advice-type"/>
 					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_274424DF_415D_400f_99C0_FDA108C74C7A" name="at-voc-new:document-status"/>
@@ -1115,49 +1234,49 @@
 				</packagedElement>
 			</packagedElement>
 			<packagedElement xmi:type="uml:Package" xmi:id="EAPK_4CC2B37F_7BB3_4a6e_9CF7_3F2F4EF6E5FA" name="receipt advice">
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_BA11696D_6ACD_40f7_958C_DB383E6E89FD" name="diagrams"/>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_A1BBED76_06B1_4690_961D_320A15D96F63" name="classes">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_007403A6_1B13_47c8_AAFD_D00C4DF6FA72" name="diagrams"/>
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_605F74FE_ACF9_4bc7_86DB_AB0A95C75961" name="classes">
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_CF553CC8_8DC9_4ea2_B386_8ACB39A17657" name="epo-ful:ReceiptAdvice">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF03EF4_6045_4f7b_92DB_999E7922ABBE" name="epo-ful:specifiesBuyer" association="EAID_0AF03EF4_6045_4f7b_92DB_999E7922ABBE">
 							<type xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000191__6045_4f7b_92DB_999E7922ABBE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000192__6045_4f7b_92DB_999E7922ABBE" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000203__6045_4f7b_92DB_999E7922ABBE" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000204__6045_4f7b_92DB_999E7922ABBE" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst1184D4_10A9_4e0f_B337_221A9AEF8009" name="epo-ful:specifiesDespatcher" association="EAID_411184D4_10A9_4e0f_B337_221A9AEF8009">
 							<type xmi:idref="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000193__10A9_4e0f_B337_221A9AEF8009" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000194__10A9_4e0f_B337_221A9AEF8009" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000205__10A9_4e0f_B337_221A9AEF8009" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000206__10A9_4e0f_B337_221A9AEF8009" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst63C83C_6869_4a08_BAC3_0D8EE5BAF10E" name="epo-ful:hasAssociatedDocument" association="EAID_6563C83C_6869_4a08_BAC3_0D8EE5BAF10E">
 							<type xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000195__6869_4a08_BAC3_0D8EE5BAF10E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000196__6869_4a08_BAC3_0D8EE5BAF10E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000207__6869_4a08_BAC3_0D8EE5BAF10E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000208__6869_4a08_BAC3_0D8EE5BAF10E" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_891D4ADA_5989_4b36_8188_44D7D99D8155" general="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstDF383B_4385_430e_B2D4_B5B5AAD55DB1" name="epo-ful:specifiesSeller" association="EAID_AEDF383B_4385_430e_B2D4_B5B5AAD55DB1">
 							<type xmi:idref="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000197__4385_430e_B2D4_B5B5AAD55DB1" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000198__4385_430e_B2D4_B5B5AAD55DB1" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000209__4385_430e_B2D4_B5B5AAD55DB1" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000210__4385_430e_B2D4_B5B5AAD55DB1" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstAD75A2_6A44_447c_856D_A5FD0F996EF5" name="epo-ful:isSubmittedForDespatchAdvice" association="EAID_B2AD75A2_6A44_447c_856D_A5FD0F996EF5">
 							<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000199__6A44_447c_856D_A5FD0F996EF5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000200__6A44_447c_856D_A5FD0F996EF5" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000211__6A44_447c_856D_A5FD0F996EF5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000212__6A44_447c_856D_A5FD0F996EF5" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst5725F2_3A5A_41f0_A09F_125FFFF898A6" name="epo-ful:specifiesConsignee" association="EAID_CE5725F2_3A5A_41f0_A09F_125FFFF898A6">
 							<type xmi:idref="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000201__3A5A_41f0_A09F_125FFFF898A6" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000202__3A5A_41f0_A09F_125FFFF898A6" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000213__3A5A_41f0_A09F_125FFFF898A6" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000214__3A5A_41f0_A09F_125FFFF898A6" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst360D2E_DB37_4dbc_9B8A_CD6511F7E73A" name="epo-ful:isSubmittedForShipment" association="EAID_E0360D2E_DB37_4dbc_9B8A_CD6511F7E73A">
 							<type xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000203__DB37_4dbc_9B8A_CD6511F7E73A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000204__DB37_4dbc_9B8A_CD6511F7E73A" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000215__DB37_4dbc_9B8A_CD6511F7E73A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000216__DB37_4dbc_9B8A_CD6511F7E73A" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst8552C5_C8B1_4583_9A9A_73A31F1E9982" name="epo-ful:comprisesReceiptAdviceLine" association="EAID_E28552C5_C8B1_4583_9A9A_73A31F1E9982">
 							<type xmi:idref="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000205__C8B1_4583_9A9A_73A31F1E9982" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000206__C8B1_4583_9A9A_73A31F1E9982" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000217__C8B1_4583_9A9A_73A31F1E9982" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000218__C8B1_4583_9A9A_73A31F1E9982" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0AF03EF4_6045_4f7b_92DB_999E7922ABBE">
@@ -1195,32 +1314,39 @@
 							<type xmi:idref="EAID_CF553CC8_8DC9_4ea2_B386_8ACB39A17657"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_FF0A4C18_97A9_450b_83FC_E7F2ADB8020E">
+						<memberEnd xmi:idref="EAID_dst0A4C18_97A9_450b_83FC_E7F2ADB8020E"/>
+						<memberEnd xmi:idref="EAID_src0A4C18_97A9_450b_83FC_E7F2ADB8020E"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0A4C18_97A9_450b_83FC_E7F2ADB8020E" association="EAID_FF0A4C18_97A9_450b_83FC_E7F2ADB8020E">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73" name="epo-ful:ReceiptAdviceLine">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstD3CF7A_4949_410c_A7E5_91AB91646B43" name="epo-ful:hasOversupplyQuantity" association="EAID_11D3CF7A_4949_410c_A7E5_91AB91646B43">
 							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000207__4949_410c_A7E5_91AB91646B43" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000208__4949_410c_A7E5_91AB91646B43" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000219__4949_410c_A7E5_91AB91646B43" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000220__4949_410c_A7E5_91AB91646B43" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstA4CF11_20FC_48b0_A739_471F732B8482" name="epo-ful:hasReceivedQuantity" association="EAID_4BA4CF11_20FC_48b0_A739_471F732B8482">
 							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000209__20FC_48b0_A739_471F732B8482" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000210__20FC_48b0_A739_471F732B8482" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000221__20FC_48b0_A739_471F732B8482" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000222__20FC_48b0_A739_471F732B8482" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst005691_B905_4be3_99BF_394E56A591CE" name="epo-ful:hasShortQuantity" association="EAID_76005691_B905_4be3_99BF_394E56A591CE">
 							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000211__B905_4be3_99BF_394E56A591CE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000212__B905_4be3_99BF_394E56A591CE" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000223__B905_4be3_99BF_394E56A591CE" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000224__B905_4be3_99BF_394E56A591CE" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_7E02D06B_2BDD_4b00_9F68_49C5442E779A" general="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF0448C_1741_4b38_9973_F506CB883BA2" name="epo-ful:hasRejectedQuantity" association="EAID_B4F0448C_1741_4b38_9973_F506CB883BA2">
 							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000213__1741_4b38_9973_F506CB883BA2" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000214__1741_4b38_9973_F506CB883BA2" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000225__1741_4b38_9973_F506CB883BA2" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000226__1741_4b38_9973_F506CB883BA2" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE16A91_624E_4d2e_AFA0_FA3356C995AA" name="epo-ful:isSubmittedForDespatchLine" association="EAID_D2E16A91_624E_4d2e_AFA0_FA3356C995AA">
 							<type xmi:idref="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000215__624E_4d2e_AFA0_FA3356C995AA" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000216__624E_4d2e_AFA0_FA3356C995AA" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000227__624E_4d2e_AFA0_FA3356C995AA" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000228__624E_4d2e_AFA0_FA3356C995AA" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_11D3CF7A_4949_410c_A7E5_91AB91646B43">
@@ -1255,7 +1381,7 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_F0627240_7676_48da_94AB_E81558C17923" supplier="EAID_EF1CEC2C_54A8_43cb_A898_39D1F9E0D575" client="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73"/>
 				</packagedElement>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_15F663CB_FEA6_49cb_90DC_5A04712F5F32" name="controlled vocabularies">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_E2C5F09D_C937_4f28_A34B_C5437AC869AD" name="controlled vocabularies">
 					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_EF1CEC2C_54A8_43cb_A898_39D1F9E0D575" name="at-voc-new:action-code"/>
 					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_E6D31017_87B9_4702_A97A_1C9D6F300741" name="at-voc-new:reject-reason"/>
 				</packagedElement>
@@ -1270,10 +1396,10 @@
 				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_77E91846_47FC_4974_BAF2_947AC44EEA52" name="xsd:integer"/>
 			</packagedElement>
 		</packagedElement>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_85FB2EE8_AEBD_45d4_92DD_8FC795FDE413" isFrame="false" modelElement="EAPK_9F90CA42_2AD5_4086_8537_A3D0531D27FD">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_85FB2EE8_AEBD_45d4_92DD_8FC795FDE413" isFrame="false" modelElement="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_85FB2EE8_AEBD_45d4_99EF_E09436BF89DC" modelElement="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AEBD_45d4_99EF_E09436BF89DC" text="epo-ful:DespatchLine"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AEBD_45d4_99EF_E09436BF89DC" x="501" y="259" width="271" height="65"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AEBD_45d4_99EF_E09436BF89DC" x="502" y="167" width="271" height="65"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_85FB2EE8_AEBD_45d4_B200_94202420C754" modelElement="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AEBD_45d4_B200_94202420C754" text="epo-cat:Item"/>
@@ -1281,11 +1407,11 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_85FB2EE8_AEBD_45d4_960F_C4C98C40706A" modelElement="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AEBD_45d4_960F_C4C98C40706A" text="epo-ord:OrderLine"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AEBD_45d4_960F_C4C98C40706A" x="889" y="270" width="90" height="44"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AEBD_45d4_960F_C4C98C40706A" x="892" y="186" width="90" height="28"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_85FB2EE8_AEBD_45d4_B82D_D1167BEF6A0C" modelElement="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AEBD_45d4_B82D_D1167BEF6A0C" text="epo-ord:Order"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AEBD_45d4_B82D_D1167BEF6A0C" x="815" y="368" width="239" height="75"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AEBD_45d4_B82D_D1167BEF6A0C" x="1123" y="161" width="239" height="75"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_85FB2EE8_AEBD_45d4_849F_409BCB726909" modelElement="EAID_B0937CD2_46D2_48d7_849F_409BCB726909">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_AEBD_45d4_849F_409BCB726909" text="enumeration"/>
@@ -1298,7 +1424,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_85FB2EE8_AEBD_45d4_A739_323DC2A3958E" modelElement="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AEBD_45d4_A739_323DC2A3958E" text="epo-cat:Batch"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AEBD_45d4_A739_323DC2A3958E" x="889" y="646" width="228" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AEBD_45d4_A739_323DC2A3958E" x="929" y="646" width="228" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_85FB2EE8_AEBD_45d4_8D25_BA714BA9C3EC" modelElement="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AEBD_45d4_8D25_BA714BA9C3EC" text="epo:Quantity"/>
@@ -1310,28 +1436,27 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_85FB2EE8_AEBD_45d4_B5B1_F96CAB80B7F4" modelElement="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AEBD_45d4_B5B1_F96CAB80B7F4" text="epo-cat:ItemProperty"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AEBD_45d4_B5B1_F96CAB80B7F4" x="645" y="646" width="219" height="90"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AEBD_45d4_B5B1_F96CAB80B7F4" x="645" y="646" width="243" height="90"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_85FB2EE8_AEBD_45d4_9313_58C4BB4EB1A7" modelElement="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AEBD_45d4_9313_58C4BB4EB1A7" text="epo-cat:Line"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AEBD_45d4_9313_58C4BB4EB1A7" x="550" y="149" width="171" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AEBD_45d4_9313_58C4BB4EB1A7" x="522" y="56" width="232" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_85FB2EE8_AEBD_45d4_AA65_095BEC507C12" modelElement="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_AEBD_45d4_AA65_095BEC507C12" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AEBD_45d4_AA65_095BEC507C12" text="at-voc-new:item-classification"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AEBD_45d4_AA65_095BEC507C12" x="592" y="349" width="90" height="60"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_AE71_4354D7B1ADDB" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_B0937CD2_46D2_48d7_849F_409BCB726909" modelElement="EAID_9E47E1C8_547C_4dfc_AE71_4354D7B1ADDB">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_AE71_4354D7B1ADDB" x="752" y="524"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_AE71_4354D7B1ADDB" x="914" y="524"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_85FB2EE8_AEBD_45d4_98CF_6753815E5C67" modelElement="EAID_05A42455_86E9_49a9_98CF_6753815E5C67">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AEBD_45d4_98CF_6753815E5C67" text="epo-ful:DespatchAdvice"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AEBD_45d4_98CF_6753815E5C67" x="874" y="419" width="124" height="42"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_B27A_8F69BE5B1455" source="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" target="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" modelElement="EAID_A88D0B55_1D01_4b73_B27A_8F69BE5B1455">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_B27A_8F69BE5B1455" x="636" y="259"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_B27A_8F69BE5B1455" x="636" y="219"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_85FB2EE8_AEBD_45d4_A77E_FE330B5E5FDE" modelElement="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AEBD_45d4_A77E_FE330B5E5FDE" text="epo-ful:TransportHandlingUnit"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AEBD_45d4_A77E_FE330B5E5FDE" x="818" y="290" width="235" height="70"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_A19A_C5D793FA14E3" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12" modelElement="EAID_7EF1D4F7_398F_4f04_A19A_C5D793FA14E3">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_A19A_C5D793FA14E3" x="635" y="452"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_A19A_C5D793FA14E3" x="635" y="409"/>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_85FB2EE8_AEBD_45d4_8CF7_C481027E03FA" modelElement="EAID_C94A7466_0773_451f_8CF7_C481027E03FA">
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AEBD_45d4_8CF7_C481027E03FA" x="1118" y="377" width="115" height="55"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_873A_F9E88411186D" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_E507D198_1A41_4b43_873A_F9E88411186D">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_873A_F9E88411186D" text="+epo:hasManufacturerItemID" modelElement="EAID_dst07D198_1A41_4b43_873A_F9E88411186D">
@@ -1344,6 +1469,48 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_873A_F9E88411186D" x="557" y="347"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEBD_45d4_873A_F9E88411186D" x="374" y="347"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_A3AA_B5B7E513AEA0" source="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" target="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" modelElement="EAID_B0259612_87E6_4f34_A3AA_B5B7E513AEA0">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_A3AA_B5B7E513AEA0" text="+epo-ful:refersToOrderLine" modelElement="EAID_dst259612_87E6_4f34_A3AA_B5B7E513AEA0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_A3AA_B5B7E513AEA0" x="781" y="181" width="109" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_A3AA_B5B7E513AEA0" text="1" modelElement="EAID_dst259612_87E6_4f34_A3AA_B5B7E513AEA0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_A3AA_B5B7E513AEA0" x="884" y="204" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_A3AA_B5B7E513AEA0" x="773" y="199"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_A3AA_B5B7E513AEA0" x="892" y="199"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_971B_BF5DE149A892" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD" modelElement="EAID_F58320C5_899E_4f5f_971B_BF5DE149A892">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_971B_BF5DE149A892" text="+epo-cat:hasManufacturer" modelElement="EAID_dst8320C5_899E_4f5f_971B_BF5DE149A892">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_971B_BF5DE149A892" x="325" y="549" width="108" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_971B_BF5DE149A892" text="0..1" modelElement="EAID_dst8320C5_899E_4f5f_971B_BF5DE149A892">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_971B_BF5DE149A892" x="325" y="575" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_971B_BF5DE149A892" x="506" y="570"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_971B_BF5DE149A892" x="322" y="570"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_A715_C0AF0EF80B65" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_A715_C0AF0EF80B65" text="+epo-cat:hasNetQuantity" modelElement="EAID_dst9E2AC7_4D59_4119_A715_C0AF0EF80B65">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_A715_C0AF0EF80B65" x="421" y="646" width="102" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_A715_C0AF0EF80B65" text="0..1" modelElement="EAID_dst9E2AC7_4D59_4119_A715_C0AF0EF80B65">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_A715_C0AF0EF80B65" x="417" y="669" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_A715_C0AF0EF80B65" x="559" y="592"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_A715_C0AF0EF80B65" x="559" y="664"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEBD_45d4_A715_C0AF0EF80B65" x="414" y="664"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_A201_D8391B5C67DF" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_ECEFDC69_19B4_47d7_A201_D8391B5C67DF">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_A201_D8391B5C67DF" text="+epo:hasBuyerItemID" modelElement="EAID_dstEFDC69_19B4_47d7_A201_D8391B5C67DF">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_A201_D8391B5C67DF" x="316" y="475" width="89" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_A201_D8391B5C67DF" text="0..1" modelElement="EAID_dstEFDC69_19B4_47d7_A201_D8391B5C67DF">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_A201_D8391B5C67DF" x="367" y="435" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_A201_D8391B5C67DF" x="506" y="495"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_A201_D8391B5C67DF" x="355" y="495"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEBD_45d4_A201_D8391B5C67DF" x="355" y="430"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_A49B_8791C8D7CBEA" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_A49B_8791C8D7CBEA" text="+epo:hasSellerItemID" modelElement="EAID_dst6B650B_17CC_499e_A49B_8791C8D7CBEA">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_A49B_8791C8D7CBEA" x="394" y="360" width="88" height="14"/>
@@ -1355,6 +1522,14 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_A49B_8791C8D7CBEA" x="538" y="375"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEBD_45d4_A49B_8791C8D7CBEA" x="374" y="375"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_A19A_C5D793FA14E3" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12" modelElement="EAID_7EF1D4F7_398F_4f04_A19A_C5D793FA14E3">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_A19A_C5D793FA14E3" x="635" y="452"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_A19A_C5D793FA14E3" x="635" y="409"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_B27A_8F69BE5B1455" source="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" target="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" modelElement="EAID_A88D0B55_1D01_4b73_B27A_8F69BE5B1455">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_B27A_8F69BE5B1455" x="638" y="167"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_B27A_8F69BE5B1455" x="638" y="126"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_84F1_8A3969FE662E" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_15464872_BFB6_40bb_84F1_8A3969FE662E">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_84F1_8A3969FE662E" text="+epo:hasItemStandardID" modelElement="EAID_dst464872_BFB6_40bb_84F1_8A3969FE662E">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_84F1_8A3969FE662E" x="249" y="455" width="102" height="14"/>
@@ -1366,84 +1541,108 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_84F1_8A3969FE662E" x="296" y="525"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEBD_45d4_84F1_8A3969FE662E" x="296" y="430"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_A715_C0AF0EF80B65" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_A715_C0AF0EF80B65" text="+epo-cat:hasNetQuantity" modelElement="EAID_dst9E2AC7_4D59_4119_A715_C0AF0EF80B65">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_A715_C0AF0EF80B65" x="421" y="646" width="102" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_BB08_B80EA400868A" source="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E" target="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" modelElement="EAID_65A0DAC3_2E18_40c1_BB08_B80EA400868A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_BB08_B80EA400868A" text="+epo-cat:isProductionOf" modelElement="EAID_dstA0DAC3_2E18_40c1_BB08_B80EA400868A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_BB08_B80EA400868A" x="755" y="557" width="97" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_A715_C0AF0EF80B65" text="0..1" modelElement="EAID_dst9E2AC7_4D59_4119_A715_C0AF0EF80B65">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_A715_C0AF0EF80B65" x="417" y="669" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_BB08_B80EA400868A" text="1" modelElement="EAID_dstA0DAC3_2E18_40c1_BB08_B80EA400868A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_BB08_B80EA400868A" x="755" y="580" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_A715_C0AF0EF80B65" x="559" y="592"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_A715_C0AF0EF80B65" x="559" y="664"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEBD_45d4_A715_C0AF0EF80B65" x="414" y="664"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_BB08_B80EA400868A" x="993" y="646"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_BB08_B80EA400868A" x="993" y="575"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEBD_45d4_BB08_B80EA400868A" x="752" y="575"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_A3AA_B5B7E513AEA0" source="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" target="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" modelElement="EAID_B0259612_87E6_4f34_A3AA_B5B7E513AEA0">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_A3AA_B5B7E513AEA0" text="+epo-ful:refersToOrderLine" modelElement="EAID_dst259612_87E6_4f34_A3AA_B5B7E513AEA0">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_A3AA_B5B7E513AEA0" x="778" y="273" width="109" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_9023_77697592FF3C" source="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" target="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE" modelElement="EAID_9D8A2FCD_752D_45a9_9023_77697592FF3C">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_9023_77697592FF3C" text="+epo-ful:specifiesTransportHandlingUnits" modelElement="EAID_dst8A2FCD_752D_45a9_9023_77697592FF3C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_9023_77697592FF3C" x="863" y="387" width="164" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_A3AA_B5B7E513AEA0" text="0..1" modelElement="EAID_dst259612_87E6_4f34_A3AA_B5B7E513AEA0">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_A3AA_B5B7E513AEA0" x="870" y="296" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_9023_77697592FF3C" text="0..*" modelElement="EAID_dst8A2FCD_752D_45a9_9023_77697592FF3C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_9023_77697592FF3C" x="947" y="365" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_A3AA_B5B7E513AEA0" x="772" y="291"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_A3AA_B5B7E513AEA0" x="889" y="291"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_9023_77697592FF3C" x="935" y="419"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_9023_77697592FF3C" x="935" y="360"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_971B_BF5DE149A892" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD" modelElement="EAID_F58320C5_899E_4f5f_971B_BF5DE149A892">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_971B_BF5DE149A892" text="+epo-cat:hasManufacturer" modelElement="EAID_dst8320C5_899E_4f5f_971B_BF5DE149A892">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_971B_BF5DE149A892" x="325" y="549" width="108" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_8FFF_C8B67B4CF87D" source="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" target="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" modelElement="EAID_121E7032_36A3_4c8b_8FFF_C8B67B4CF87D">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_8FFF_C8B67B4CF87D" text="+epo-ful:comprisesDespatchLine" modelElement="EAID_dst1E7032_36A3_4c8b_8FFF_C8B67B4CF87D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_8FFF_C8B67B4CF87D" x="654" y="260" width="130" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_971B_BF5DE149A892" text="0..1" modelElement="EAID_dst8320C5_899E_4f5f_971B_BF5DE149A892">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_971B_BF5DE149A892" x="325" y="575" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_8FFF_C8B67B4CF87D" text="1..*" modelElement="EAID_dst1E7032_36A3_4c8b_8FFF_C8B67B4CF87D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_8FFF_C8B67B4CF87D" x="729" y="237" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_971B_BF5DE149A892" x="506" y="570"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_971B_BF5DE149A892" x="322" y="570"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_8FFF_C8B67B4CF87D" x="874" y="435"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_8FFF_C8B67B4CF87D" x="717" y="435"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEBD_45d4_8FFF_C8B67B4CF87D" x="717" y="232"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_9F45_D060A347AAB9" source="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" target="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" modelElement="EAID_05ABFF05_AE37_4d14_9F45_D060A347AAB9">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_9F45_D060A347AAB9" text="+epo-ful:refersToOrder" modelElement="EAID_dstABFF05_AE37_4d14_9F45_D060A347AAB9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_9F45_D060A347AAB9" x="1200" y="261" width="93" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_9F45_D060A347AAB9" text="0..1" modelElement="EAID_dstABFF05_AE37_4d14_9F45_D060A347AAB9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_9F45_D060A347AAB9" x="1255" y="241" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_9F45_D060A347AAB9" x="998" y="437"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_9F45_D060A347AAB9" x="1243" y="437"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEBD_45d4_9F45_D060A347AAB9" x="1243" y="236"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_9551_9C0C13B80044" source="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_9551_9C0C13B80044" text="+adms:identifier" modelElement="EAID_dst87FBF1_89C8_4ed0_9551_9C0C13B80044">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_9551_9C0C13B80044" x="232" y="244" width="36" height="27"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_9551_9C0C13B80044" x="232" y="244" width="66" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_9551_9C0C13B80044" text="0..1" modelElement="EAID_dst87FBF1_89C8_4ed0_9551_9C0C13B80044">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_9551_9C0C13B80044" x="262" y="272" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_9551_9C0C13B80044" x="550" y="181"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_9551_9C0C13B80044" x="254" y="181"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_9551_9C0C13B80044" x="522" y="88"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_9551_9C0C13B80044" x="254" y="88"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEBD_45d4_9551_9C0C13B80044" x="254" y="290"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_A201_D8391B5C67DF" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_ECEFDC69_19B4_47d7_A201_D8391B5C67DF">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_A201_D8391B5C67DF" text="+epo:hasBuyerItemID" modelElement="EAID_dstEFDC69_19B4_47d7_A201_D8391B5C67DF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_A201_D8391B5C67DF" x="316" y="475" width="89" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_BD03_7B202CFA4807" source="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" target="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" modelElement="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_BD03_7B202CFA4807" text="+epo-cat:specifiesItem" modelElement="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_BD03_7B202CFA4807" x="771" y="469" width="92" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_A201_D8391B5C67DF" text="0..1" modelElement="EAID_dstEFDC69_19B4_47d7_A201_D8391B5C67DF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_A201_D8391B5C67DF" x="367" y="435" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_BD03_7B202CFA4807" text="1" modelElement="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_BD03_7B202CFA4807" x="755" y="491" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_A201_D8391B5C67DF" x="506" y="495"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_A201_D8391B5C67DF" x="355" y="495"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEBD_45d4_A201_D8391B5C67DF" x="355" y="430"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_BD03_7B202CFA4807" x="754" y="78"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_BD03_7B202CFA4807" x="1107" y="78"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEBD_45d4_BD03_7B202CFA4807" x="1107" y="486"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_AEBD_45d4_BD03_7B202CFA4807" x="752" y="486"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_B51A_14A66F3D627C" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_BBC722BA_3236_4fcb_B51A_14A66F3D627C">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_B51A_14A66F3D627C" text="+epo:hasSerialID" modelElement="EAID_dstC722BA_3236_4fcb_B51A_14A66F3D627C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_B51A_14A66F3D627C" x="409" y="392" width="69" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_AA00_34CA1CC60CA2" source="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_B9C9C412_36FA_46d5_AA00_34CA1CC60CA2">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_AA00_34CA1CC60CA2" text="+epo-cat:hasQualifiedValue" modelElement="EAID_dstC9C412_36FA_46d5_AA00_34CA1CC60CA2">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_AA00_34CA1CC60CA2" x="432" y="681" width="112" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_B51A_14A66F3D627C" text="0..1" modelElement="EAID_dstC722BA_3236_4fcb_B51A_14A66F3D627C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_B51A_14A66F3D627C" x="377" y="413" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_AA00_34CA1CC60CA2" text="0..1" modelElement="EAID_dstC9C412_36FA_46d5_AA00_34CA1CC60CA2">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_AA00_34CA1CC60CA2" x="417" y="709" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_B51A_14A66F3D627C" x="511" y="452"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_B51A_14A66F3D627C" x="511" y="408"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEBD_45d4_B51A_14A66F3D627C" x="374" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_AA00_34CA1CC60CA2" x="645" y="702"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_AA00_34CA1CC60CA2" x="414" y="702"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_BCCC_37421BA960DE" source="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" target="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" modelElement="EAID_AA589EDA_B26B_44c3_BCCC_37421BA960DE">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_BCCC_37421BA960DE" x="933" y="270"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_BCCC_37421BA960DE" x="933" y="192"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEBD_45d4_BCCC_37421BA960DE" x="721" y="192"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_AE71_4354D7B1ADDB" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_B0937CD2_46D2_48d7_849F_409BCB726909" modelElement="EAID_9E47E1C8_547C_4dfc_AE71_4354D7B1ADDB">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_AE71_4354D7B1ADDB" x="752" y="524"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_AE71_4354D7B1ADDB" x="914" y="524"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_8FE0_29F2F5CFCD7E" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" modelElement="EAID_46338F2C_8F52_4c58_8FE0_29F2F5CFCD7E">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_8FE0_29F2F5CFCD7E" text="+epo-ord:comprisesOrderLine" modelElement="EAID_dst338F2C_8F52_4c58_8FE0_29F2F5CFCD7E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_8FE0_29F2F5CFCD7E" x="873" y="341" width="119" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_9ACB_A1015C643C97" source="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_ACCA405B_7FF7_41ad_9ACB_A1015C643C97">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_9ACB_A1015C643C97" text="+epo:hasBatchID" modelElement="EAID_dstCA405B_7FF7_41ad_9ACB_A1015C643C97">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_9ACB_A1015C643C97" x="157" y="455" width="46" height="27"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_8FE0_29F2F5CFCD7E" text="1..*" modelElement="EAID_dst338F2C_8F52_4c58_8FE0_29F2F5CFCD7E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_8FE0_29F2F5CFCD7E" x="946" y="319" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_9ACB_A1015C643C97" text="0..1" modelElement="EAID_dstCA405B_7FF7_41ad_9ACB_A1015C643C97">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_9ACB_A1015C643C97" x="193" y="435" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_8FE0_29F2F5CFCD7E" x="934" y="368"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_8FE0_29F2F5CFCD7E" x="934" y="314"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_9ACB_A1015C643C97" x="997" y="716"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_9ACB_A1015C643C97" x="997" y="747"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEBD_45d4_9ACB_A1015C643C97" x="181" y="747"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_AEBD_45d4_9ACB_A1015C643C97" x="181" y="430"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_9F87_43543F10AEA4" source="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE" target="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" modelElement="EAID_EA77B614_F9B2_464f_9F87_43543F10AEA4">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_9F87_43543F10AEA4" text="+epo-ful:transportsItemFrom" modelElement="EAID_dst77B614_F9B2_464f_9F87_43543F10AEA4">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_9F87_43543F10AEA4" x="801" y="226" width="117" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_9F87_43543F10AEA4" text="1..*" modelElement="EAID_dst77B614_F9B2_464f_9F87_43543F10AEA4">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_9F87_43543F10AEA4" x="776" y="228" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_9F87_43543F10AEA4" x="932" y="290"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_9F87_43543F10AEA4" x="932" y="223"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEBD_45d4_9F87_43543F10AEA4" x="773" y="223"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_B0B4_339ED74111CC" source="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_31D80540_9E04_44d6_B0B4_339ED74111CC">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_B0B4_339ED74111CC" text="+epo:hasManufacturerID" modelElement="EAID_dstD80540_9E04_44d6_B0B4_339ED74111CC">
@@ -1455,66 +1654,47 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_B0B4_339ED74111CC" x="237" y="557"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_B0B4_339ED74111CC" x="237" y="430"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_BB08_B80EA400868A" source="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E" target="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" modelElement="EAID_65A0DAC3_2E18_40c1_BB08_B80EA400868A">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_BB08_B80EA400868A" text="+epo-cat:isProductionOf" modelElement="EAID_dstA0DAC3_2E18_40c1_BB08_B80EA400868A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_BB08_B80EA400868A" x="755" y="557" width="97" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_8FE0_29F2F5CFCD7E" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" modelElement="EAID_46338F2C_8F52_4c58_8FE0_29F2F5CFCD7E">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_8FE0_29F2F5CFCD7E" text="+epo-ord:comprisesOrderLine" modelElement="EAID_dst338F2C_8F52_4c58_8FE0_29F2F5CFCD7E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_8FE0_29F2F5CFCD7E" x="988" y="179" width="119" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_BB08_B80EA400868A" text="1" modelElement="EAID_dstA0DAC3_2E18_40c1_BB08_B80EA400868A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_BB08_B80EA400868A" x="755" y="580" width="6" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_8FE0_29F2F5CFCD7E" text="1..*" modelElement="EAID_dst338F2C_8F52_4c58_8FE0_29F2F5CFCD7E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_8FE0_29F2F5CFCD7E" x="985" y="204" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_BB08_B80EA400868A" x="993" y="646"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_BB08_B80EA400868A" x="993" y="575"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEBD_45d4_BB08_B80EA400868A" x="752" y="575"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_8FE0_29F2F5CFCD7E" x="1123" y="198"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_8FE0_29F2F5CFCD7E" x="982" y="199"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_9ACB_A1015C643C97" source="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_ACCA405B_7FF7_41ad_9ACB_A1015C643C97">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_9ACB_A1015C643C97" text="+epo:hasBatchID" modelElement="EAID_dstCA405B_7FF7_41ad_9ACB_A1015C643C97">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_9ACB_A1015C643C97" x="157" y="455" width="46" height="27"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_BCCC_37421BA960DE" source="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" target="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" modelElement="EAID_AA589EDA_B26B_44c3_BCCC_37421BA960DE">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_BCCC_37421BA960DE" x="936" y="186"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_BCCC_37421BA960DE" x="936" y="99"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEBD_45d4_BCCC_37421BA960DE" x="754" y="99"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_B51A_14A66F3D627C" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_BBC722BA_3236_4fcb_B51A_14A66F3D627C">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_B51A_14A66F3D627C" text="+epo:hasSerialID" modelElement="EAID_dstC722BA_3236_4fcb_B51A_14A66F3D627C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_B51A_14A66F3D627C" x="409" y="392" width="69" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_9ACB_A1015C643C97" text="0..1" modelElement="EAID_dstCA405B_7FF7_41ad_9ACB_A1015C643C97">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_9ACB_A1015C643C97" x="193" y="435" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_B51A_14A66F3D627C" text="0..1" modelElement="EAID_dstC722BA_3236_4fcb_B51A_14A66F3D627C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_B51A_14A66F3D627C" x="377" y="413" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_9ACB_A1015C643C97" x="997" y="716"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_9ACB_A1015C643C97" x="997" y="747"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEBD_45d4_9ACB_A1015C643C97" x="181" y="747"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_AEBD_45d4_9ACB_A1015C643C97" x="181" y="430"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_B51A_14A66F3D627C" x="511" y="452"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_B51A_14A66F3D627C" x="511" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEBD_45d4_B51A_14A66F3D627C" x="374" y="408"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_A80A_3CDDD84D3629" source="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" target="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" modelElement="EAID_0692BD51_5113_4e40_A80A_3CDDD84D3629">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_A80A_3CDDD84D3629" text="+epo-cat:describesItem" modelElement="EAID_dst92BD51_5113_4e40_A80A_3CDDD84D3629">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_A80A_3CDDD84D3629" x="648" y="613" width="95" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_A80A_3CDDD84D3629" x="657" y="613" width="95" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_A80A_3CDDD84D3629" text="1" modelElement="EAID_dst92BD51_5113_4e40_A80A_3CDDD84D3629">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_A80A_3CDDD84D3629" x="707" y="597" width="6" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_A80A_3CDDD84D3629" x="695" y="646"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_A80A_3CDDD84D3629" x="695" y="592"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_AA00_34CA1CC60CA2" source="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_B9C9C412_36FA_46d5_AA00_34CA1CC60CA2">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_AA00_34CA1CC60CA2" text="+epo-cat:hasQualifiedValue" modelElement="EAID_dstC9C412_36FA_46d5_AA00_34CA1CC60CA2">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_AA00_34CA1CC60CA2" x="432" y="680" width="112" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_AA00_34CA1CC60CA2" text="0..1" modelElement="EAID_dstC9C412_36FA_46d5_AA00_34CA1CC60CA2">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_AA00_34CA1CC60CA2" x="417" y="708" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_AA00_34CA1CC60CA2" x="645" y="701"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_AA00_34CA1CC60CA2" x="414" y="701"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_85FB2EE8_AEBD_45d4_BD03_7B202CFA4807" source="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" target="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" modelElement="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEBD_45d4_BD03_7B202CFA4807" text="+epo-cat:specifiesItem" modelElement="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEBD_45d4_BD03_7B202CFA4807" x="771" y="469" width="92" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_A80A_3CDDD84D3629" x="716" y="597" width="6" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_BD03_7B202CFA4807" text="1" modelElement="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_BD03_7B202CFA4807" x="755" y="491" width="6" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_BD03_7B202CFA4807" x="721" y="171"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_BD03_7B202CFA4807" x="1107" y="171"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEBD_45d4_BD03_7B202CFA4807" x="1107" y="486"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_AEBD_45d4_BD03_7B202CFA4807" x="752" y="486"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_A80A_3CDDD84D3629" x="704" y="646"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEBD_45d4_A80A_3CDDD84D3629" x="704" y="592"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_2B157CDB_0A9A_43f4_BB8C_F112D7DC954A" isFrame="false" modelElement="EAPK_9F90CA42_2AD5_4086_8537_A3D0531D27FD">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_2B157CDB_0A9A_43f4_BB8C_F112D7DC954A" isFrame="false" modelElement="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B157CDB_0A9A_43f4_98CF_6753815E5C67" modelElement="EAID_05A42455_86E9_49a9_98CF_6753815E5C67">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0A9A_43f4_98CF_6753815E5C67" text="epo-ful:DespatchAdvice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_98CF_6753815E5C67" x="656" y="421" width="121" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_98CF_6753815E5C67" x="649" y="421" width="121" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B157CDB_0A9A_43f4_99EF_E09436BF89DC" modelElement="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0A9A_43f4_99EF_E09436BF89DC" text="epo-ful:DespatchLine"/>
@@ -1522,7 +1702,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B157CDB_0A9A_43f4_B49F_D657B2ABC394" modelElement="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0A9A_43f4_B49F_D657B2ABC394" text="epo-ful:Consignment"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_B49F_D657B2ABC394" x="1030" y="633" width="255" height="127"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_B49F_D657B2ABC394" x="1031" y="633" width="255" height="127"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B157CDB_0A9A_43f4_83F6_F9D8F550B19D" modelElement="EAID_78459D23_BCB4_42bb_83F6_F9D8F550B19D">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0A9A_43f4_83F6_F9D8F550B19D" text="epo-ful:Carrier"/>
@@ -1542,7 +1722,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B157CDB_0A9A_43f4_AA1D_07C668B580AA" modelElement="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0A9A_43f4_AA1D_07C668B580AA" text="epo-ful:TransportEquipment"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_AA1D_07C668B580AA" x="285" y="808" width="210" height="88"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_AA1D_07C668B580AA" x="286" y="808" width="210" height="88"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B157CDB_0A9A_43f4_AD33_16377B8FE76B" modelElement="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0A9A_43f4_AD33_16377B8FE76B" text="epo-ful:Package"/>
@@ -1578,11 +1758,11 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B157CDB_0A9A_43f4_B505_7C2D920B97B9" modelElement="EAID_3C8EEF69_1346_4dbe_B505_7C2D920B97B9">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0A9A_43f4_B505_7C2D920B97B9" text="epo-ful:TransportEquipmentSeal"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_B505_7C2D920B97B9" x="314" y="671" width="152" height="51"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_B505_7C2D920B97B9" x="315" y="671" width="152" height="51"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B157CDB_0A9A_43f4_A889_D9AA2A5B456A" modelElement="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0A9A_43f4_A889_D9AA2A5B456A" text="epo-ord:DeliveryInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_A889_D9AA2A5B456A" x="1422" y="1112" width="226" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_A889_D9AA2A5B456A" x="1421" y="1112" width="226" height="85"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B157CDB_0A9A_43f4_A538_C3E64CC643BA" modelElement="EAID_9DC1B8F7_FF27_4120_A538_C3E64CC643BA">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_0A9A_43f4_A538_C3E64CC643BA" text="enumeration"/>
@@ -1597,11 +1777,11 @@
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B157CDB_0A9A_43f4_8E10_3AC087F5FF2A" modelElement="EAID_BA97F7F9_0B9C_4d96_8E10_3AC087F5FF2A">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_0A9A_43f4_8E10_3AC087F5FF2A" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0A9A_43f4_8E10_3AC087F5FF2A" text="at-voc-new:packaging-type"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_8E10_3AC087F5FF2A" x="530" y="896" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_8E10_3AC087F5FF2A" x="752" y="1109" width="90" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B157CDB_0A9A_43f4_832A_B3989A897692" modelElement="EAID_C215EC75_82FD_45d3_832A_B3989A897692">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0A9A_43f4_832A_B3989A897692" text="epo-ful:GoodsItem"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_832A_B3989A897692" x="298" y="987" width="251" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_832A_B3989A897692" x="266" y="987" width="251" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B157CDB_0A9A_43f4_9B44_2FCDD6AB5C9D" modelElement="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0A9A_43f4_9B44_2FCDD6AB5C9D" text="epo:MonetaryValue"/>
@@ -1618,7 +1798,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B157CDB_0A9A_43f4_80D1_768357F1472D" modelElement="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0A9A_43f4_80D1_768357F1472D" text="epo-ful:ShipmentAgreement"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_80D1_768357F1472D" x="648" y="633" width="137" height="49"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_80D1_768357F1472D" x="673" y="633" width="137" height="49"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B157CDB_0A9A_43f4_AAE9_7F444FFEA26A" modelElement="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_0A9A_43f4_AAE9_7F444FFEA26A" text="enumeration"/>
@@ -1641,11 +1821,11 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B157CDB_0A9A_43f4_9655_04521F703750" modelElement="EAID_96B284C4_E759_4bad_9655_04521F703750">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0A9A_43f4_9655_04521F703750" text="epo:Buyer"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_9655_04521F703750" x="429" y="509" width="219" height="85"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_9655_04521F703750" x="391" y="509" width="219" height="85"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B157CDB_0A9A_43f4_B8B3_4DB83EC94A01" modelElement="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0A9A_43f4_B8B3_4DB83EC94A01" text="epo-ord:Seller"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_B8B3_4DB83EC94A01" x="494" y="737" width="90" height="43"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_B8B3_4DB83EC94A01" x="481" y="737" width="90" height="43"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B157CDB_0A9A_43f4_99C0_FDA108C74C7A" modelElement="EAID_274424DF_415D_400f_99C0_FDA108C74C7A">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_0A9A_43f4_99C0_FDA108C74C7A" text="enumeration"/>
@@ -1655,7 +1835,7 @@
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B157CDB_0A9A_43f4_8A77_989FA3BA7568" modelElement="EAID_0648E479_6FDB_4549_8A77_989FA3BA7568">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_0A9A_43f4_8A77_989FA3BA7568" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0A9A_43f4_8A77_989FA3BA7568" text="at-voc-new:despatch-advice-type"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_8A77_989FA3BA7568" x="749" y="279" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_8A77_989FA3BA7568" x="756" y="301" width="90" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B157CDB_0A9A_43f4_9C4C_0FD3115E2A2A" modelElement="EAID_894938CF_E95C_498c_9C4C_0FD3115E2A2A">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_0A9A_43f4_9C4C_0FD3115E2A2A" text="enumeration"/>
@@ -1665,7 +1845,7 @@
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B157CDB_0A9A_43f4_BCDB_3E876216F668" modelElement="EAID_54C25D5B_33E1_4ec5_BCDB_3E876216F668">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_0A9A_43f4_BCDB_3E876216F668" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0A9A_43f4_BCDB_3E876216F668" text="at-voc-new:transport-means-type"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_BCDB_3E876216F668" x="2077" y="640" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_BCDB_3E876216F668" x="2075" y="640" width="90" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B157CDB_0A9A_43f4_86BE_1ACC9D34E843" modelElement="EAID_EA36CA1F_5963_4ff6_86BE_1ACC9D34E843">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0A9A_43f4_86BE_1ACC9D34E843" text="epo-ord:DeliveryAgreement"/>
@@ -1680,35 +1860,40 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B157CDB_0A9A_43f4_AFA8_D5DCED9D61C7" modelElement="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0A9A_43f4_AFA8_D5DCED9D61C7" text="dct:Location"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_AFA8_D5DCED9D61C7" x="1057" y="1112" width="200" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_AFA8_D5DCED9D61C7" x="1057" y="1119" width="200" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B157CDB_0A9A_43f4_83AB_E27B06BA632B" modelElement="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0A9A_43f4_83AB_E27B06BA632B" text="epo-cat:PostAwardDocument"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_83AB_E27B06BA632B" x="637" y="250" width="90" height="70"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_2B157CDB_0A9A_43f4_8875_507427F96AF2" modelElement="EAID_D8A8B96C_BD80_4776_8875_507427F96AF2">
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_8875_507427F96AF2" x="1296" y="800" width="115" height="55"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_2B157CDB_0A9A_43f4_B12C_681ECC691BB8" modelElement="EAID_AFF2FF49_6801_472a_B12C_681ECC691BB8">
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_B12C_681ECC691BB8" x="636" y="701" width="115" height="67"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_2B157CDB_0A9A_43f4_93BC_19F9D69F8197" modelElement="EAID_864B4AE7_D2C6_4c67_93BC_19F9D69F8197">
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_93BC_19F9D69F8197" x="736" y="184" width="131" height="79"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_2B157CDB_0A9A_43f4_986A_C58347A2EB63" modelElement="EAID_D5D11C8E_0306_4f62_986A_C58347A2EB63">
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_986A_C58347A2EB63" x="1050" y="329" width="115" height="55"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_2B157CDB_0A9A_43f4_8B0F_E2AD6B66BE37" modelElement="EAID_D25408FD_102C_45ac_8B0F_E2AD6B66BE37">
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0A9A_43f4_8B0F_E2AD6B66BE37" x="512" y="866" width="115" height="55"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_838D_198E22FE4C02" source="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE" target="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B" modelElement="EAID_2AB47C99_7B9A_495c_838D_198E22FE4C02">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_838D_198E22FE4C02" x="797" y="887"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_838D_198E22FE4C02" x="797" y="987"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_A519_F160F8927173" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" modelElement="EAID_FBFFE3B6_925B_4b80_A519_F160F8927173">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_A519_F160F8927173" text="+epo-ful:hasRequestedPickUpInformation" modelElement="EAID_dstFFE3B6_925B_4b80_A519_F160F8927173">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_A519_F160F8927173" x="1082" y="854" width="167" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_A519_F160F8927173" text="1" modelElement="EAID_dstFFE3B6_925B_4b80_A519_F160F8927173">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_A519_F160F8927173" x="1170" y="869" width="6" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_A519_F160F8927173" x="1162" y="760"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_A519_F160F8927173" x="1162" y="887"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_B221_B2A54F890D2D" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6" modelElement="EAID_783AAD71_420E_40ee_B221_B2A54F890D2D">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_B221_B2A54F890D2D" text="+epo-ful:hasMainCarriageShipmentStage" modelElement="EAID_dst3AAD71_420E_40ee_B221_B2A54F890D2D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_B221_B2A54F890D2D" x="1310" y="657" width="166" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_A4A1_7512C3E0591E" source="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6" target="EAID_78459D23_BCB4_42bb_83F6_F9D8F550B19D" modelElement="EAID_F48C13D8_6CDE_4da6_A4A1_7512C3E0591E">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_A4A1_7512C3E0591E" text="+epo:specifiesCarrier" modelElement="EAID_dst8C13D8_6CDE_4da6_A4A1_7512C3E0591E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_A4A1_7512C3E0591E" x="1524" y="609" width="84" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_B221_B2A54F890D2D" text="0..1" modelElement="EAID_dst3AAD71_420E_40ee_B221_B2A54F890D2D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_B221_B2A54F890D2D" x="1462" y="680" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_A4A1_7512C3E0591E" text="0..1" modelElement="EAID_dst8C13D8_6CDE_4da6_A4A1_7512C3E0591E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_A4A1_7512C3E0591E" x="1578" y="588" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_B221_B2A54F890D2D" x="1285" y="675"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_B221_B2A54F890D2D" x="1481" y="675"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_A4A1_7512C3E0591E" x="1566" y="655"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_A4A1_7512C3E0591E" x="1566" y="583"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_A9AC_93AD55744288" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6" modelElement="EAID_1D18BED8_E786_4a53_A9AC_93AD55744288">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_A9AC_93AD55744288" text="+epo-ful:hasPreCarriageShipmentStage" modelElement="EAID_dst18BED8_E786_4a53_A9AC_93AD55744288">
@@ -1717,53 +1902,81 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_A9AC_93AD55744288" text="0..*" modelElement="EAID_dst18BED8_E786_4a53_A9AC_93AD55744288">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_A9AC_93AD55744288" x="1462" y="731" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_A9AC_93AD55744288" x="1285" y="726"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_A9AC_93AD55744288" x="1286" y="726"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_A9AC_93AD55744288" x="1481" y="726"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_B940_8E07DDB6E493" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6" modelElement="EAID_22815C4E_A421_45ce_B940_8E07DDB6E493">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_B940_8E07DDB6E493" text="+epo-ful:hasOnCarriageShipmentStage" modelElement="EAID_dst815C4E_A421_45ce_B940_8E07DDB6E493">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_B940_8E07DDB6E493" x="1306" y="680" width="157" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_B940_8E07DDB6E493" x="1298" y="681" width="157" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_B940_8E07DDB6E493" text="0..*" modelElement="EAID_dst815C4E_A421_45ce_B940_8E07DDB6E493">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_B940_8E07DDB6E493" x="1462" y="703" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_B940_8E07DDB6E493" x="1285" y="698"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_B940_8E07DDB6E493" x="1286" y="698"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_B940_8E07DDB6E493" x="1481" y="698"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_9A59_461990838D96" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_2E9FE66A_E025_4563_9A59_461990838D96">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_9A59_461990838D96" text="+epo-ful:hasConsignmentInvoiceValue" modelElement="EAID_dst9FE66A_E025_4563_9A59_461990838D96">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_9A59_461990838D96" x="914" y="185" width="14" height="155"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_9A59_461990838D96" x="908" y="185" width="14" height="155"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_9A59_461990838D96" text="0..1" modelElement="EAID_dst9FE66A_E025_4563_9A59_461990838D96">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_9A59_461990838D96" x="943" y="164" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_9A59_461990838D96" x="937" y="164" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_9A59_461990838D96" x="1030" y="663"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_9A59_461990838D96" x="931" y="663"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_9A59_461990838D96" x="931" y="159"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_9A59_461990838D96" x="1031" y="659"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_9A59_461990838D96" x="925" y="659"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_9A59_461990838D96" x="925" y="159"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_9723_9C69BB0EB7B4" source="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_618070AC_783D_48ae_9723_9C69BB0EB7B4">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_9723_9C69BB0EB7B4" x="637" y="282"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_9723_9C69BB0EB7B4" x="352" y="282"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_B1A5_01DDEE025D3A" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_A287E36F_7CEB_4668_B1A5_01DDEE025D3A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_B1A5_01DDEE025D3A" text="+epo-ful:hasDeclaredStatisticalValue" modelElement="EAID_dst87E36F_7CEB_4668_B1A5_01DDEE025D3A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_B1A5_01DDEE025D3A" x="946" y="175" width="14" height="147"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_B1A5_01DDEE025D3A" text="0..1" modelElement="EAID_dst87E36F_7CEB_4668_B1A5_01DDEE025D3A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_B1A5_01DDEE025D3A" x="978" y="164" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_B1A5_01DDEE025D3A" x="1031" y="649"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_B1A5_01DDEE025D3A" x="966" y="649"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_B1A5_01DDEE025D3A" x="966" y="159"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_A413_050778056B72" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" modelElement="EAID_6DA6B6C9_7964_4102_A413_050778056B72">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_A413_050778056B72" text="+epo-ful:hasFreightCharge" modelElement="EAID_dstA6B6C9_7964_4102_A413_050778056B72">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_A413_050778056B72" x="1336" y="516" width="107" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_A413_050778056B72" text="0..*" modelElement="EAID_dstA6B6C9_7964_4102_A413_050778056B72">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_A413_050778056B72" x="1393" y="496" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_A413_050778056B72" x="1286" y="642"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_A413_050778056B72" x="1381" y="642"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_A413_050778056B72" x="1381" y="491"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_A519_F160F8927173" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" modelElement="EAID_FBFFE3B6_925B_4b80_A519_F160F8927173">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_A519_F160F8927173" text="+epo-ful:hasRequestedPickUpInformation" modelElement="EAID_dstFFE3B6_925B_4b80_A519_F160F8927173">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_A519_F160F8927173" x="1082" y="846" width="167" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_A519_F160F8927173" text="1" modelElement="EAID_dstFFE3B6_925B_4b80_A519_F160F8927173">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_A519_F160F8927173" x="1170" y="869" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_A519_F160F8927173" x="1162" y="760"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_A519_F160F8927173" x="1162" y="887"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_B2AC_3DB623B8AA78" source="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE" target="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA" modelElement="EAID_A3907E97_8458_42ef_B2AC_3DB623B8AA78">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_B2AC_3DB623B8AA78" text="+epo-ful:usesTransportEquipment" modelElement="EAID_dst907E97_8458_42ef_B2AC_3DB623B8AA78">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_B2AC_3DB623B8AA78" x="499" y="834" width="136" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_B2AC_3DB623B8AA78" x="500" y="834" width="136" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_B2AC_3DB623B8AA78" text="0..*" modelElement="EAID_dst907E97_8458_42ef_B2AC_3DB623B8AA78">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_B2AC_3DB623B8AA78" x="498" y="857" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_B2AC_3DB623B8AA78" x="499" y="857" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_B2AC_3DB623B8AA78" x="680" y="852"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_B2AC_3DB623B8AA78" x="495" y="852"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_B2AC_3DB623B8AA78" x="496" y="852"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_948C_F84C001C68E4" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184" modelElement="EAID_3C454BB2_FC26_49ad_948C_F84C001C68E4">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_948C_F84C001C68E4" text="+epo:specifiesNotifier" modelElement="EAID_dst454BB2_FC26_49ad_948C_F84C001C68E4">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_948C_F84C001C68E4" x="1151" y="517" width="87" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_9787_DB2496C70148" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" modelElement="EAID_053FA551_E0F4_4d8a_9787_DB2496C70148">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_9787_DB2496C70148" text="+epo-ful:hasFreightAllowanceCharge" modelElement="EAID_dst3FA551_E0F4_4d8a_9787_DB2496C70148">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_9787_DB2496C70148" x="1210" y="549" width="148" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_948C_F84C001C68E4" text="0..*" modelElement="EAID_dst454BB2_FC26_49ad_948C_F84C001C68E4">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_948C_F84C001C68E4" x="1194" y="496" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_9787_DB2496C70148" text="0..*" modelElement="EAID_dst3FA551_E0F4_4d8a_9787_DB2496C70148">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_9787_DB2496C70148" x="1284" y="496" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_948C_F84C001C68E4" x="1182" y="633"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_948C_F84C001C68E4" x="1182" y="491"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_9787_DB2496C70148" x="1272" y="633"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_9787_DB2496C70148" x="1272" y="491"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_A27B_53F4397FF22D" source="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE" target="EAID_894938CF_E95C_498c_9C4C_0FD3115E2A2A" modelElement="EAID_27E9E48A_CCBA_48c3_A27B_53F4397FF22D">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_A27B_53F4397FF22D" x="818" y="817"/>
@@ -1771,27 +1984,26 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_AB39_1D8D064F10A5" source="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA" target="EAID_3C8EEF69_1346_4dbe_B505_7C2D920B97B9" modelElement="EAID_BA43B026_B4D0_426b_AB39_1D8D064F10A5">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_AB39_1D8D064F10A5" text="+epo-ful:hasTransportEquipmentSeal" modelElement="EAID_dst43B026_B4D0_426b_AB39_1D8D064F10A5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_AB39_1D8D064F10A5" x="322" y="742" width="149" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_AB39_1D8D064F10A5" x="323" y="742" width="149" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_AB39_1D8D064F10A5" text="0..*" modelElement="EAID_dst43B026_B4D0_426b_AB39_1D8D064F10A5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_AB39_1D8D064F10A5" x="400" y="727" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_AB39_1D8D064F10A5" x="401" y="727" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_AB39_1D8D064F10A5" x="388" y="808"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_AB39_1D8D064F10A5" x="388" y="722"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_AB39_1D8D064F10A5" x="389" y="808"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_AB39_1D8D064F10A5" x="389" y="722"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_84A2_E0CF23F0C305" source="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA" target="EAID_9DC1B8F7_FF27_4120_A538_C3E64CC643BA" modelElement="EAID_506D198C_F014_4656_84A2_E0CF23F0C305">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_84A2_E0CF23F0C305" x="285" y="830"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_84A2_E0CF23F0C305" x="286" y="830"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_84A2_E0CF23F0C305" x="141" y="830"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_84A2_E0CF23F0C305" x="141" y="782"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_B9C9_3A70FB20574B" source="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA" target="EAID_4CD4C360_C8F1_4565_9570_087A142343D6" modelElement="EAID_CEFBB7DC_83F7_430a_B9C9_3A70FB20574B">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_B9C9_3A70FB20574B" x="285" y="875"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_B9C9_3A70FB20574B" x="286" y="875"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_B9C9_3A70FB20574B" x="186" y="875"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_994B_4700B802E440" source="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B" target="EAID_BA97F7F9_0B9C_4d96_8E10_3AC087F5FF2A" modelElement="EAID_169F95CD_4B6A_4e39_994B_4700B802E440">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_994B_4700B802E440" x="723" y="987"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_994B_4700B802E440" x="723" y="926"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_994B_4700B802E440" x="620" y="926"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_994B_4700B802E440" x="798" y="1057"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_994B_4700B802E440" x="798" y="1109"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_A4B4_978BEF67A273" source="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B" target="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B" modelElement="EAID_A219EBC4_BBC6_421b_A4B4_978BEF67A273">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_A4B4_978BEF67A273" text="+epo-ful:containsPackage 0..*" modelElement="EAID_dst19EBC4_BBC6_421b_A4B4_978BEF67A273">
@@ -1807,9 +2019,13 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_0A9A_43f4_A4B4_978BEF67A273" x="850" y="987"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_0A9A_43f4_A4B4_978BEF67A273" x="850" y="987"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_9723_9C69BB0EB7B4" source="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_618070AC_783D_48ae_9723_9C69BB0EB7B4">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_9723_9C69BB0EB7B4" x="637" y="282"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_9723_9C69BB0EB7B4" x="352" y="282"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_987B_AEF828189A10" source="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" target="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" modelElement="EAID_D8E29289_C54A_4d5e_987B_AEF828189A10">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_987B_AEF828189A10" x="687" y="421"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_987B_AEF828189A10" x="687" y="320"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_987B_AEF828189A10" x="686" y="421"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_987B_AEF828189A10" x="686" y="320"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_BE14_3F84B34FF9D8" source="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" target="EAID_274424DF_415D_400f_99C0_FDA108C74C7A" modelElement="EAID_2B89940C_0005_4c86_BE14_3F84B34FF9D8">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_BE14_3F84B34FF9D8" x="674" y="250"/>
@@ -1822,49 +2038,81 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_8FFF_C8B67B4CF87D" text="1..*" modelElement="EAID_dst1E7032_36A3_4c8b_8FFF_C8B67B4CF87D">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_8FFF_C8B67B4CF87D" x="414" y="460" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_8FFF_C8B67B4CF87D" x="656" y="455"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_8FFF_C8B67B4CF87D" x="649" y="455"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_8FFF_C8B67B4CF87D" x="411" y="455"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_9486_C235014D3693" source="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" target="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" modelElement="EAID_79AEE9C5_EA86_424b_9486_C235014D3693">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_9486_C235014D3693" text="+epo-ful:specifiesShipment" modelElement="EAID_dstAEE9C5_EA86_424b_9486_C235014D3693">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_9486_C235014D3693" x="947" y="890" width="109" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_9486_C235014D3693" text="0..1" modelElement="EAID_dstAEE9C5_EA86_424b_9486_C235014D3693">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_9486_C235014D3693" x="1039" y="913" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_9486_C235014D3693" x="654" y="491"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_9486_C235014D3693" x="654" y="908"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_9486_C235014D3693" x="1058" y="908"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_9023_77697592FF3C" source="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" target="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE" modelElement="EAID_9D8A2FCD_752D_45a9_9023_77697592FF3C">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_9023_77697592FF3C" text="+epo-ful:specifiesTransportHandlingUnits" modelElement="EAID_dst8A2FCD_752D_45a9_9023_77697592FF3C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_9023_77697592FF3C" x="582" y="785" width="164" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_9023_77697592FF3C" text="0..*" modelElement="EAID_dst8A2FCD_752D_45a9_9023_77697592FF3C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_9023_77697592FF3C" x="661" y="838" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_9023_77697592FF3C" x="649" y="471"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_9023_77697592FF3C" x="631" y="471"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_9023_77697592FF3C" x="631" y="833"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_0A9A_43f4_9023_77697592FF3C" x="680" y="833"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_99BF_B659211FD91B" source="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_6A127BB3_2702_45c1_99BF_B659211FD91B">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_99BF_B659211FD91B" text="+epo-ful:hasAssociatedDocument" modelElement="EAID_dst127BB3_2702_45c1_99BF_B659211FD91B">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_99BF_B659211FD91B" x="355" y="315" width="135" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_99BF_B659211FD91B" text="0..1" modelElement="EAID_dst127BB3_2702_45c1_99BF_B659211FD91B">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_99BF_B659211FD91B" x="355" y="338" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_99BF_B659211FD91B" x="658" y="421"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_99BF_B659211FD91B" x="658" y="333"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_99BF_B659211FD91B" x="352" y="333"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_A268_3FC6AF39C084" source="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" target="EAID_0648E479_6FDB_4549_8A77_989FA3BA7568" modelElement="EAID_6E467C8A_6420_4dec_A268_3FC6AF39C084">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_A268_3FC6AF39C084" x="777" y="445"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_A268_3FC6AF39C084" x="797" y="445"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_A268_3FC6AF39C084" x="797" y="339"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_A268_3FC6AF39C084" x="770" y="445"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_A268_3FC6AF39C084" x="804" y="445"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_A268_3FC6AF39C084" x="804" y="361"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_9787_DB2496C70148" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" modelElement="EAID_053FA551_E0F4_4d8a_9787_DB2496C70148">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_9787_DB2496C70148" text="+epo-ful:hasFreightAllowanceCharge" modelElement="EAID_dst3FA551_E0F4_4d8a_9787_DB2496C70148">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_9787_DB2496C70148" x="1292" y="549" width="148" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_B221_B2A54F890D2D" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6" modelElement="EAID_783AAD71_420E_40ee_B221_B2A54F890D2D">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_B221_B2A54F890D2D" text="+epo-ful:hasMainCarriageShipmentStage" modelElement="EAID_dst3AAD71_420E_40ee_B221_B2A54F890D2D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_B221_B2A54F890D2D" x="1305" y="656" width="166" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_9787_DB2496C70148" text="0..*" modelElement="EAID_dst3FA551_E0F4_4d8a_9787_DB2496C70148">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_9787_DB2496C70148" x="1366" y="496" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_B221_B2A54F890D2D" text="0..1" modelElement="EAID_dst3AAD71_420E_40ee_B221_B2A54F890D2D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_B221_B2A54F890D2D" x="1462" y="680" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_9787_DB2496C70148" x="1285" y="638"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_9787_DB2496C70148" x="1354" y="638"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_9787_DB2496C70148" x="1354" y="491"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_B221_B2A54F890D2D" x="1286" y="675"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_B221_B2A54F890D2D" x="1481" y="675"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_9D36_DD776DFC8538" source="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" target="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D" modelElement="EAID_0A78D73E_7BA7_4bf0_9D36_DD776DFC8538">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_9D36_DD776DFC8538" text="+epo-ful:refersToShipmentAgreement" modelElement="EAID_dst78D73E_7BA7_4bf0_9D36_DD776DFC8538">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_9D36_DD776DFC8538" x="644" y="599" width="153" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_9D36_DD776DFC8538" x="669" y="599" width="153" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_9D36_DD776DFC8538" text="0..1" modelElement="EAID_dst78D73E_7BA7_4bf0_9D36_DD776DFC8538">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_9D36_DD776DFC8538" x="725" y="615" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_9D36_DD776DFC8538" x="750" y="615" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_9D36_DD776DFC8538" x="717" y="491"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_9D36_DD776DFC8538" x="717" y="633"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_9D36_DD776DFC8538" x="742" y="491"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_9D36_DD776DFC8538" x="742" y="633"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_ACC2_F2FE3A90C76A" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE" modelElement="EAID_A0665A13_AEF0_4cf6_ACC2_F2FE3A90C76A">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_ACC2_F2FE3A90C76A" text="+epo-ful:containsTransportHandlingUnit" modelElement="EAID_dst665A13_AEF0_4cf6_ACC2_F2FE3A90C76A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_ACC2_F2FE3A90C76A" x="917" y="822" width="159" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_9052_55D13D688E6F" source="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6" target="EAID_9E80131F_7D1C_452d_98B2_308983569ECB" modelElement="EAID_4E226C0E_C79A_44dd_9052_55D13D688E6F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_9052_55D13D688E6F" text="+epo-ful:usesTransportMeans" modelElement="EAID_dst226C0E_C79A_44dd_9052_55D13D688E6F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_9052_55D13D688E6F" x="1690" y="657" width="121" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_ACC2_F2FE3A90C76A" text="1..*" modelElement="EAID_dst665A13_AEF0_4cf6_ACC2_F2FE3A90C76A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_ACC2_F2FE3A90C76A" x="918" y="846" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_9052_55D13D688E6F" text="1..*" modelElement="EAID_dst226C0E_C79A_44dd_9052_55D13D688E6F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_9052_55D13D688E6F" x="1794" y="680" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_ACC2_F2FE3A90C76A" x="1094" y="760"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_ACC2_F2FE3A90C76A" x="1094" y="841"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_ACC2_F2FE3A90C76A" x="915" y="841"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_9052_55D13D688E6F" x="1680" y="675"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_9052_55D13D688E6F" x="1813" y="675"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_A009_CBC3D19B20B5" source="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_6ADD570C_FEF5_4342_A009_CBC3D19B20B5">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_A009_CBC3D19B20B5" text="+epo-ful:hasAssociatedDocument" modelElement="EAID_dstDD570C_FEF5_4342_A009_CBC3D19B20B5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_A009_CBC3D19B20B5" x="190" y="370" width="135" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_A009_CBC3D19B20B5" x="182" y="372" width="135" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_A009_CBC3D19B20B5" text="0..1" modelElement="EAID_dstDD570C_FEF5_4342_A009_CBC3D19B20B5">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_A009_CBC3D19B20B5" x="262" y="349" width="17" height="14"/>
@@ -1873,30 +2121,30 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_A009_CBC3D19B20B5" x="250" y="344"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_8774_289769C50390" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_894938CF_E95C_498c_9C4C_0FD3115E2A2A" modelElement="EAID_7D11F407_8C9D_4214_8774_289769C50390">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_8774_289769C50390" x="1030" y="730"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_8774_289769C50390" x="1031" y="730"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_8774_289769C50390" x="864" y="730"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_B7B6_50CA2F0A9B94" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_569C582B_2F50_4a11_B7B6_50CA2F0A9B94">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_B7B6_50CA2F0A9B94" text="+epo-ful:hasConsignmentDeclaredStatisticsValue" modelElement="EAID_dst9C582B_2F50_4a11_B7B6_50CA2F0A9B94">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_B7B6_50CA2F0A9B94" x="866" y="181" width="14" height="196"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_B7B6_50CA2F0A9B94" x="868" y="181" width="14" height="196"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_B7B6_50CA2F0A9B94" text="0..1" modelElement="EAID_dst9C582B_2F50_4a11_B7B6_50CA2F0A9B94">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_B7B6_50CA2F0A9B94" x="896" y="164" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_B7B6_50CA2F0A9B94" x="898" y="164" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_B7B6_50CA2F0A9B94" x="1030" y="675"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_B7B6_50CA2F0A9B94" x="884" y="675"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_B7B6_50CA2F0A9B94" x="884" y="159"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_B7B6_50CA2F0A9B94" x="1031" y="671"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_B7B6_50CA2F0A9B94" x="886" y="671"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_B7B6_50CA2F0A9B94" x="886" y="159"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_96A3_A1F92BE8EA63" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_5009F883_10B2_4e9c_96A3_A1F92BE8EA63">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_96A3_A1F92BE8EA63" text="+epo-ful:hasConsignmentFreeOnBoardValue" modelElement="EAID_dst09F883_10B2_4e9c_96A3_A1F92BE8EA63">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_96A3_A1F92BE8EA63" x="961" y="173" width="14" height="179"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_96A3_A1F92BE8EA63" x="983" y="173" width="14" height="179"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_96A3_A1F92BE8EA63" text="0..1" modelElement="EAID_dst09F883_10B2_4e9c_96A3_A1F92BE8EA63">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_96A3_A1F92BE8EA63" x="991" y="164" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_96A3_A1F92BE8EA63" x="1013" y="164" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_96A3_A1F92BE8EA63" x="1030" y="644"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_96A3_A1F92BE8EA63" x="979" y="644"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_96A3_A1F92BE8EA63" x="979" y="159"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_96A3_A1F92BE8EA63" x="1031" y="641"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_96A3_A1F92BE8EA63" x="1001" y="641"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_96A3_A1F92BE8EA63" x="1001" y="159"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_95E6_BC660BB6F161" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_CE66C7F9_83F7_479f_89C7_9BC5ACC1EEFB" modelElement="EAID_4D018782_9090_4ec2_95E6_BC660BB6F161">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_95E6_BC660BB6F161" text="+epo:specifiesFreightForwarder" modelElement="EAID_dst018782_9090_4ec2_95E6_BC660BB6F161">
@@ -1908,68 +2156,71 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_95E6_BC660BB6F161" x="1077" y="633"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_95E6_BC660BB6F161" x="1077" y="491"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_9052_55D13D688E6F" source="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6" target="EAID_9E80131F_7D1C_452d_98B2_308983569ECB" modelElement="EAID_4E226C0E_C79A_44dd_9052_55D13D688E6F">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_9052_55D13D688E6F" text="+epo-ful:usesTransportMeans" modelElement="EAID_dst226C0E_C79A_44dd_9052_55D13D688E6F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_9052_55D13D688E6F" x="1690" y="657" width="121" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_948C_F84C001C68E4" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184" modelElement="EAID_3C454BB2_FC26_49ad_948C_F84C001C68E4">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_948C_F84C001C68E4" text="+epo:specifiesNotifier" modelElement="EAID_dst454BB2_FC26_49ad_948C_F84C001C68E4">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_948C_F84C001C68E4" x="1151" y="517" width="87" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_9052_55D13D688E6F" text="1..*" modelElement="EAID_dst226C0E_C79A_44dd_9052_55D13D688E6F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_9052_55D13D688E6F" x="1794" y="680" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_948C_F84C001C68E4" text="0..*" modelElement="EAID_dst454BB2_FC26_49ad_948C_F84C001C68E4">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_948C_F84C001C68E4" x="1194" y="496" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_9052_55D13D688E6F" x="1680" y="675"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_9052_55D13D688E6F" x="1813" y="675"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_948C_F84C001C68E4" x="1182" y="633"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_948C_F84C001C68E4" x="1182" y="491"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_ACC2_F2FE3A90C76A" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE" modelElement="EAID_A0665A13_AEF0_4cf6_ACC2_F2FE3A90C76A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_ACC2_F2FE3A90C76A" text="+epo-ful:containsTransportHandlingUnit" modelElement="EAID_dst665A13_AEF0_4cf6_ACC2_F2FE3A90C76A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_ACC2_F2FE3A90C76A" x="917" y="822" width="159" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_ACC2_F2FE3A90C76A" text="1..*" modelElement="EAID_dst665A13_AEF0_4cf6_ACC2_F2FE3A90C76A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_ACC2_F2FE3A90C76A" x="918" y="846" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_ACC2_F2FE3A90C76A" x="1095" y="760"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_ACC2_F2FE3A90C76A" x="1095" y="841"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_ACC2_F2FE3A90C76A" x="915" y="841"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_9583_5FF42CA3E096" source="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" target="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" modelElement="EAID_D6B12A9D_029A_4c46_9583_5FF42CA3E096">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_9583_5FF42CA3E096" text="+epo-ful:refersToConsignment" modelElement="EAID_dstB12A9D_029A_4c46_9583_5FF42CA3E096">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_9583_5FF42CA3E096" x="902" y="675" width="122" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_9583_5FF42CA3E096" x="903" y="678" width="122" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_9583_5FF42CA3E096" text="1" modelElement="EAID_dstB12A9D_029A_4c46_9583_5FF42CA3E096">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_9583_5FF42CA3E096" x="1022" y="698" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_9583_5FF42CA3E096" x="1023" y="701" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_9583_5FF42CA3E096" x="777" y="472"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_9583_5FF42CA3E096" x="817" y="472"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_9583_5FF42CA3E096" x="817" y="693"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_0A9A_43f4_9583_5FF42CA3E096" x="1030" y="693"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_9583_5FF42CA3E096" x="770" y="475"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_9583_5FF42CA3E096" x="843" y="475"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_9583_5FF42CA3E096" x="843" y="696"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_0A9A_43f4_9583_5FF42CA3E096" x="1031" y="696"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_91B2_799578663395" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_470D1B16_C07B_4868_91B2_799578663395">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_91B2_799578663395" text="+epo:isCalculatedOn" modelElement="EAID_dst0D1B16_C07B_4868_91B2_799578663395">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_91B2_799578663395" x="1110" y="54" width="83" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_84FB_38E506A895B7" source="EAID_C215EC75_82FD_45d3_832A_B3989A897692" target="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" modelElement="EAID_D57BCA2B_F949_4607_84FB_38E506A895B7">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_84FB_38E506A895B7" text="+epo-ful:refersToDespatchLine" modelElement="EAID_dst7BCA2B_F949_4607_84FB_38E506A895B7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_84FB_38E506A895B7" x="15" y="441" width="123" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_91B2_799578663395" text="0..1" modelElement="EAID_dst0D1B16_C07B_4868_91B2_799578663395">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_91B2_799578663395" x="1092" y="75" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_84FB_38E506A895B7" text="1" modelElement="EAID_dst7BCA2B_F949_4607_84FB_38E506A895B7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_84FB_38E506A895B7" x="132" y="464" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_91B2_799578663395" x="1613" y="70"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_91B2_799578663395" x="1089" y="70"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_84FB_38E506A895B7" x="266" y="1008"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_84FB_38E506A895B7" x="86" y="1008"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_84FB_38E506A895B7" x="86" y="459"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_0A9A_43f4_84FB_38E506A895B7" x="140" y="459"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_A51F_2425A6DBF32F" source="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B" target="EAID_C215EC75_82FD_45d3_832A_B3989A897692" modelElement="EAID_7EAB192B_82DE_4520_A51F_2425A6DBF32F">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_A51F_2425A6DBF32F" text="+epo-ful:containsGoodsItem" modelElement="EAID_dstAB192B_82DE_4520_A51F_2425A6DBF32F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_A51F_2425A6DBF32F" x="552" y="1004" width="114" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_A51F_2425A6DBF32F" x="520" y="1004" width="114" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_A51F_2425A6DBF32F" text="1..*" modelElement="EAID_dstAB192B_82DE_4520_A51F_2425A6DBF32F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_A51F_2425A6DBF32F" x="552" y="1027" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_A51F_2425A6DBF32F" text="0..*" modelElement="EAID_dstAB192B_82DE_4520_A51F_2425A6DBF32F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_A51F_2425A6DBF32F" x="520" y="1027" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_A51F_2425A6DBF32F" x="667" y="1022"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_A51F_2425A6DBF32F" x="549" y="1022"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_BCA8_CFEC07ED34AE" source="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" target="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" modelElement="EAID_D8FEF002_D274_4157_BCA8_CFEC07ED34AE">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_BCA8_CFEC07ED34AE" text="+epo-ord:specifiesPlaceOfDelivery" modelElement="EAID_dstFEF002_D274_4157_BCA8_CFEC07ED34AE">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_BCA8_CFEC07ED34AE" x="1260" y="1129" width="138" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_BCA8_CFEC07ED34AE" text="0..1" modelElement="EAID_dstFEF002_D274_4157_BCA8_CFEC07ED34AE">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_BCA8_CFEC07ED34AE" x="1260" y="1152" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_BCA8_CFEC07ED34AE" x="1422" y="1147"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_BCA8_CFEC07ED34AE" x="1257" y="1147"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_A51F_2425A6DBF32F" x="517" y="1022"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_B24B_49A69CC51624" source="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_DCA21CBC_3D4F_480a_B24B_49A69CC51624">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_B24B_49A69CC51624" text="+epo-ord:hasDeliveryPeriod" modelElement="EAID_dstA21CBC_3D4F_480a_B24B_49A69CC51624">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_B24B_49A69CC51624" x="1127" y="1263" width="112" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_B24B_49A69CC51624" x="1127" y="1264" width="112" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_B24B_49A69CC51624" text="0..1" modelElement="EAID_dstA21CBC_3D4F_480a_B24B_49A69CC51624">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_B24B_49A69CC51624" x="1118" y="1280" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_B24B_49A69CC51624" x="1118" y="1281" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_B24B_49A69CC51624" x="1542" y="1182"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_B24B_49A69CC51624" x="1542" y="1277"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_B24B_49A69CC51624" x="1109" y="1277"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_B24B_49A69CC51624" x="1522" y="1197"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_B24B_49A69CC51624" x="1522" y="1278"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_B24B_49A69CC51624" x="1109" y="1278"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_B368_9AA9D2B6757D" source="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" target="EAID_EA36CA1F_5963_4ff6_86BE_1ACC9D34E843" modelElement="EAID_ED2DCABC_3EFA_4af4_B368_9AA9D2B6757D">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_B368_9AA9D2B6757D" text="+epo-ord:specifiesGeneralDeliveryAgreement" modelElement="EAID_dst2DCABC_3EFA_4af4_B368_9AA9D2B6757D">
@@ -1978,8 +2229,8 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_B368_9AA9D2B6757D" text="0..1" modelElement="EAID_dst2DCABC_3EFA_4af4_B368_9AA9D2B6757D">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_B368_9AA9D2B6757D" x="1409" y="1038" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_B368_9AA9D2B6757D" x="1512" y="1112"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_B368_9AA9D2B6757D" x="1512" y="1033"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_B368_9AA9D2B6757D" x="1511" y="1112"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_B368_9AA9D2B6757D" x="1511" y="1033"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_B368_9AA9D2B6757D" x="1406" y="1033"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_ACA2_4C099B935E15" source="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" target="EAID_EA36CA1F_5963_4ff6_86BE_1ACC9D34E843" modelElement="EAID_F79B2205_58A2_42e8_ACA2_4C099B935E15">
@@ -1989,57 +2240,50 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_ACA2_4C099B935E15" text="0..1" modelElement="EAID_dst9B2205_58A2_42e8_ACA2_4C099B935E15">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_ACA2_4C099B935E15" x="1409" y="996" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_ACA2_4C099B935E15" x="1544" y="1112"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_ACA2_4C099B935E15" x="1544" y="991"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_ACA2_4C099B935E15" x="1543" y="1112"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_ACA2_4C099B935E15" x="1543" y="991"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_ACA2_4C099B935E15" x="1406" y="991"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_B62C_6F674CDB3888" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A" modelElement="EAID_0D4101FD_7720_417c_B62C_6F674CDB3888">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_B62C_6F674CDB3888" x="1808" y="96"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_B62C_6F674CDB3888" x="1924" y="96"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_895E_9E7177239DE8" source="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D" target="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" modelElement="EAID_06DB4B0B_7B20_475e_895E_9E7177239DE8">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_895E_9E7177239DE8" text="+epo-ful:agreedBySeller" modelElement="EAID_dstDB4B0B_7B20_475e_895E_9E7177239DE8">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_895E_9E7177239DE8" x="485" y="705" width="97" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_895E_9E7177239DE8" text="1..*" modelElement="EAID_dstDB4B0B_7B20_475e_895E_9E7177239DE8">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_895E_9E7177239DE8" x="542" y="719" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_895E_9E7177239DE8" x="648" y="669"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_895E_9E7177239DE8" x="534" y="669"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_895E_9E7177239DE8" x="534" y="737"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_806C_38F93CA90719" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_33A89700_846B_47cb_93D9_9D4729194EA6" modelElement="EAID_4D92CD55_08CD_4d21_806C_38F93CA90719">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_806C_38F93CA90719" x="1726" y="131"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_806C_38F93CA90719" x="1726" y="181"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_806C_38F93CA90719" x="1924" y="181"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_925D_13E9A7667A18" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_87123434_C2AD_43de_925D_13E9A7667A18">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_925D_13E9A7667A18" text="+epo-cat:hasAmount" modelElement="EAID_dst123434_C2AD_43de_925D_13E9A7667A18">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_925D_13E9A7667A18" x="1114" y="77" width="85" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_9F26_8CD173F2F4F7" source="EAID_EA36CA1F_5963_4ff6_86BE_1ACC9D34E843" target="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" modelElement="EAID_6A549AF3_1E2A_4cd7_9F26_8CD173F2F4F7">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_9F26_8CD173F2F4F7" text="+epo-ord:specifiesDeliveryAgreementLocation" modelElement="EAID_dst549AF3_1E2A_4cd7_9F26_8CD173F2F4F7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_9F26_8CD173F2F4F7" x="1116" y="1069" width="185" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_925D_13E9A7667A18" text="0..1" modelElement="EAID_dst123434_C2AD_43de_925D_13E9A7667A18">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_925D_13E9A7667A18" x="1092" y="101" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_9F26_8CD173F2F4F7" text="0..1" modelElement="EAID_dst549AF3_1E2A_4cd7_9F26_8CD173F2F4F7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_9F26_8CD173F2F4F7" x="1178" y="1101" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_925D_13E9A7667A18" x="1613" y="96"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_925D_13E9A7667A18" x="1089" y="96"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_9F26_8CD173F2F4F7" x="1235" y="1015"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_9F26_8CD173F2F4F7" x="1170" y="1015"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_9F26_8CD173F2F4F7" x="1170" y="1119"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_8257_A68F3DC30CC3" source="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_8C74AF3F_89A0_4039_8257_A68F3DC30CC3">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_8257_A68F3DC30CC3" text="+epo-ful:agreedByBuyer" modelElement="EAID_dst74AF3F_89A0_4039_8257_A68F3DC30CC3">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_8257_A68F3DC30CC3" x="483" y="613" width="98" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_91B2_799578663395" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_470D1B16_C07B_4868_91B2_799578663395">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_91B2_799578663395" text="+epo:isCalculatedOn" modelElement="EAID_dst0D1B16_C07B_4868_91B2_799578663395">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_91B2_799578663395" x="1110" y="54" width="83" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_8257_A68F3DC30CC3" text="1..*" modelElement="EAID_dst74AF3F_89A0_4039_8257_A68F3DC30CC3">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_8257_A68F3DC30CC3" x="545" y="599" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_91B2_799578663395" text="0..1" modelElement="EAID_dst0D1B16_C07B_4868_91B2_799578663395">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_91B2_799578663395" x="1092" y="75" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_8257_A68F3DC30CC3" x="648" y="656"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_8257_A68F3DC30CC3" x="533" y="656"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_8257_A68F3DC30CC3" x="533" y="594"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_91B2_799578663395" x="1613" y="70"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_91B2_799578663395" x="1089" y="70"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_84FB_38E506A895B7" source="EAID_C215EC75_82FD_45d3_832A_B3989A897692" target="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" modelElement="EAID_D57BCA2B_F949_4607_84FB_38E506A895B7">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_84FB_38E506A895B7" text="+epo-ful:refersToDespatchLine" modelElement="EAID_dst7BCA2B_F949_4607_84FB_38E506A895B7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_84FB_38E506A895B7" x="15" y="441" width="123" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_895E_9E7177239DE8" source="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D" target="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" modelElement="EAID_06DB4B0B_7B20_475e_895E_9E7177239DE8">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_895E_9E7177239DE8" text="+epo-ful:agreedBySeller" modelElement="EAID_dstDB4B0B_7B20_475e_895E_9E7177239DE8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_895E_9E7177239DE8" x="472" y="705" width="97" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_84FB_38E506A895B7" text="1" modelElement="EAID_dst7BCA2B_F949_4607_84FB_38E506A895B7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_84FB_38E506A895B7" x="132" y="464" width="6" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_895E_9E7177239DE8" text="1..*" modelElement="EAID_dstDB4B0B_7B20_475e_895E_9E7177239DE8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_895E_9E7177239DE8" x="529" y="719" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_84FB_38E506A895B7" x="298" y="1008"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_84FB_38E506A895B7" x="86" y="1008"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_84FB_38E506A895B7" x="86" y="459"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_0A9A_43f4_84FB_38E506A895B7" x="140" y="459"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_895E_9E7177239DE8" x="673" y="669"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_895E_9E7177239DE8" x="521" y="669"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_895E_9E7177239DE8" x="521" y="737"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_9255_1C4C8BE7B02F" source="EAID_C215EC75_82FD_45d3_832A_B3989A897692" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_AB852C7E_4390_46da_9255_1C4C8BE7B02F">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_9255_1C4C8BE7B02F" text="+epo-ful:hasDeclaredStatisticalValue" modelElement="EAID_dst852C7E_4390_46da_9255_1C4C8BE7B02F">
@@ -2048,7 +2292,7 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_9255_1C4C8BE7B02F" text="0..*" modelElement="EAID_dst852C7E_4390_46da_9255_1C4C8BE7B02F">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_9255_1C4C8BE7B02F" x="803" y="110" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_9255_1C4C8BE7B02F" x="298" y="1044"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_9255_1C4C8BE7B02F" x="266" y="1044"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_9255_1C4C8BE7B02F" x="27" y="1044"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_9255_1C4C8BE7B02F" x="27" y="105"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_0A9A_43f4_9255_1C4C8BE7B02F" x="822" y="105"/>
@@ -2106,19 +2350,28 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_0A9A_43f4_B72E_BC6C99FF3009" x="352" y="219"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_0A9A_43f4_B72E_BC6C99FF3009" x="352" y="219"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_806C_38F93CA90719" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_33A89700_846B_47cb_93D9_9D4729194EA6" modelElement="EAID_4D92CD55_08CD_4d21_806C_38F93CA90719">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_806C_38F93CA90719" x="1726" y="131"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_806C_38F93CA90719" x="1726" y="181"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_806C_38F93CA90719" x="1924" y="181"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_99A9_85E159FD3FDA" source="EAID_27ECEEC8_871D_4826_8EA1_8E10F63A1500" target="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA" modelElement="EAID_357EE20B_991E_4359_99A9_85E159FD3FDA">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_99A9_85E159FD3FDA" x="391" y="915"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_99A9_85E159FD3FDA" x="391" y="896"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_B911_26A9D3F39745" source="EAID_D8A8B96C_BD80_4776_8875_507427F96AF2" target="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" modelElement="EAID_7162EBB6_46B3_40ef_B911_26A9D3F39745">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_B911_26A9D3F39745" x="1312" y="800"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_B911_26A9D3F39745" x="1253" y="760"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_925D_13E9A7667A18" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_87123434_C2AD_43de_925D_13E9A7667A18">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_925D_13E9A7667A18" text="+epo-cat:hasAmount" modelElement="EAID_dst123434_C2AD_43de_925D_13E9A7667A18">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_925D_13E9A7667A18" x="1114" y="77" width="85" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_925D_13E9A7667A18" text="0..1" modelElement="EAID_dst123434_C2AD_43de_925D_13E9A7667A18">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_925D_13E9A7667A18" x="1092" y="101" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_925D_13E9A7667A18" x="1613" y="96"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_925D_13E9A7667A18" x="1089" y="96"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_918C_44D86E9AC3CF" source="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" target="EAID_D72442ED_835D_455e_970E_3D4CAF26A2F5" modelElement="EAID_AF8C5388_D443_4b59_918C_44D86E9AC3CF">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_918C_44D86E9AC3CF" x="1491" y="272"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_918C_44D86E9AC3CF" x="1650" y="272"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_99A9_85E159FD3FDA" source="EAID_27ECEEC8_871D_4826_8EA1_8E10F63A1500" target="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA" modelElement="EAID_357EE20B_991E_4359_99A9_85E159FD3FDA">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_99A9_85E159FD3FDA" x="390" y="915"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_99A9_85E159FD3FDA" x="390" y="896"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_B6CF_EA7D771FF0D0" source="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6" target="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" modelElement="EAID_A0F3C1F4_862B_474a_B6CF_EA7D771FF0D0">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_B6CF_EA7D771FF0D0" text="+epo:hasArrivalShipmentInformation" modelElement="EAID_dstF3C1F4_862B_474a_B6CF_EA7D771FF0D0">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_B6CF_EA7D771FF0D0" x="1274" y="883" width="149" height="14"/>
@@ -2143,35 +2396,56 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_8E3F_AB7111A1C8C8" source="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" target="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" modelElement="EAID_F53AAA5F_2719_4ea3_8E3F_AB7111A1C8C8">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_8E3F_AB7111A1C8C8" text="+epo-ful:specifiesPlaceOfDespatch" modelElement="EAID_dst3AAA5F_2719_4ea3_8E3F_AB7111A1C8C8">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_8E3F_AB7111A1C8C8" x="1020" y="1041" width="139" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_8E3F_AB7111A1C8C8" x="1026" y="1047" width="139" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_8E3F_AB7111A1C8C8" text="0..1" modelElement="EAID_dst3AAA5F_2719_4ea3_8E3F_AB7111A1C8C8">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_8E3F_AB7111A1C8C8" x="1102" y="1094" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_8E3F_AB7111A1C8C8" x="1102" y="1101" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_8E3F_AB7111A1C8C8" x="1094" y="967"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_8E3F_AB7111A1C8C8" x="1094" y="1112"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_8E3F_AB7111A1C8C8" x="1094" y="1119"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_AFD3_4B863C07ABEE" source="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" target="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" modelElement="EAID_FD183E35_6937_4f66_AFD3_4B863C07ABEE">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_AFD3_4B863C07ABEE" text="+epo-ful:isSpecificToDespatchLine" modelElement="EAID_dst183E35_6937_4f66_AFD3_4B863C07ABEE">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_AFD3_4B863C07ABEE" x="172" y="520" width="136" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_AFD3_4B863C07ABEE" text="0..1" modelElement="EAID_dst183E35_6937_4f66_AFD3_4B863C07ABEE">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_AFD3_4B863C07ABEE" x="263" y="495" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_AFD3_4B863C07ABEE" x="1058" y="930"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_AFD3_4B863C07ABEE" x="251" y="930"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_AFD3_4B863C07ABEE" x="251" y="490"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_AF8A_1D37420731A9" source="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_11C78626_167C_4c06_AF8A_1D37420731A9">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_AF8A_1D37420731A9" text="+epo-ful:hasEstimatedDeliveryPeriod" modelElement="EAID_dstC78626_167C_4c06_AF8A_1D37420731A9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_AF8A_1D37420731A9" x="939" y="1209" width="149" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_AF8A_1D37420731A9" x="981" y="1204" width="149" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_AF8A_1D37420731A9" text="0..1" modelElement="EAID_dstC78626_167C_4c06_AF8A_1D37420731A9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_AF8A_1D37420731A9" x="1017" y="1228" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_AF8A_1D37420731A9" x="1025" y="1228" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_AF8A_1D37420731A9" x="1058" y="933"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_AF8A_1D37420731A9" x="1009" y="933"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_AF8A_1D37420731A9" x="1009" y="1246"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_AF8A_1D37420731A9" x="1058" y="957"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_AF8A_1D37420731A9" x="1017" y="957"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_AF8A_1D37420731A9" x="1017" y="1246"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_9F26_8CD173F2F4F7" source="EAID_EA36CA1F_5963_4ff6_86BE_1ACC9D34E843" target="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" modelElement="EAID_6A549AF3_1E2A_4cd7_9F26_8CD173F2F4F7">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_9F26_8CD173F2F4F7" text="+epo-ord:specifiesDeliveryAgreementLocation" modelElement="EAID_dst549AF3_1E2A_4cd7_9F26_8CD173F2F4F7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_9F26_8CD173F2F4F7" x="1110" y="1062" width="185" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_9445_B3D0C269B4E6" source="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" target="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" modelElement="EAID_B9BA1AAD_DA48_4953_9445_B3D0C269B4E6">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_9445_B3D0C269B4E6" text="+epo-ful:refersToDeliveryInformation" modelElement="EAID_dstBA1AAD_DA48_4953_9445_B3D0C269B4E6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_9445_B3D0C269B4E6" x="1546" y="1067" width="150" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_9F26_8CD173F2F4F7" text="0..1" modelElement="EAID_dst549AF3_1E2A_4cd7_9F26_8CD173F2F4F7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_9F26_8CD173F2F4F7" x="1172" y="1094" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_9445_B3D0C269B4E6" text="1" modelElement="EAID_dstBA1AAD_DA48_4953_9445_B3D0C269B4E6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_9445_B3D0C269B4E6" x="1623" y="1094" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_9F26_8CD173F2F4F7" x="1235" y="1015"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_9F26_8CD173F2F4F7" x="1164" y="1015"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_9F26_8CD173F2F4F7" x="1164" y="1112"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_9445_B3D0C269B4E6" x="1255" y="960"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_9445_B3D0C269B4E6" x="1615" y="960"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_9445_B3D0C269B4E6" x="1615" y="1112"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_BCA8_CFEC07ED34AE" source="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" target="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" modelElement="EAID_D8FEF002_D274_4157_BCA8_CFEC07ED34AE">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_BCA8_CFEC07ED34AE" text="+epo-ord:specifiesPlaceOfDelivery" modelElement="EAID_dstFEF002_D274_4157_BCA8_CFEC07ED34AE">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_BCA8_CFEC07ED34AE" x="1260" y="1136" width="138" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_BCA8_CFEC07ED34AE" text="0..1" modelElement="EAID_dstFEF002_D274_4157_BCA8_CFEC07ED34AE">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_BCA8_CFEC07ED34AE" x="1260" y="1159" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_BCA8_CFEC07ED34AE" x="1421" y="1154"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_BCA8_CFEC07ED34AE" x="1257" y="1154"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_AAF8_2E19960E553F" source="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_516CC611_B255_4c67_AAF8_2E19960E553F">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_AAF8_2E19960E553F" text="+epo-cat:hasAmount" modelElement="EAID_dst6CC611_B255_4c67_AAF8_2E19960E553F">
@@ -2184,15 +2458,9 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_AAF8_2E19960E553F" x="1346" y="127"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_AAF8_2E19960E553F" x="1089" y="127"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_A4A1_7512C3E0591E" source="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6" target="EAID_78459D23_BCB4_42bb_83F6_F9D8F550B19D" modelElement="EAID_F48C13D8_6CDE_4da6_A4A1_7512C3E0591E">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_A4A1_7512C3E0591E" text="+epo:specifiesCarrier" modelElement="EAID_dst8C13D8_6CDE_4da6_A4A1_7512C3E0591E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_A4A1_7512C3E0591E" x="1524" y="609" width="84" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_A4A1_7512C3E0591E" text="0..1" modelElement="EAID_dst8C13D8_6CDE_4da6_A4A1_7512C3E0591E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_A4A1_7512C3E0591E" x="1578" y="588" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_A4A1_7512C3E0591E" x="1566" y="655"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_A4A1_7512C3E0591E" x="1566" y="583"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_B877_9B2219A80C72" source="EAID_AFF2FF49_6801_472a_B12C_681ECC691BB8" target="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE" modelElement="EAID_54B7C02C_C045_45c7_B877_9B2219A80C72">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_B877_9B2219A80C72" x="722" y="768"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_B877_9B2219A80C72" x="766" y="817"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_91D4_F6387465413F" source="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_202AF5A1_B4FE_48a4_91D4_F6387465413F">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_91D4_F6387465413F" text="+epo:isCalculatedOn" modelElement="EAID_dst2AF5A1_B4FE_48a4_91D4_F6387465413F">
@@ -2218,39 +2486,50 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_AAEC_E4DC2FD36641" source="EAID_9E80131F_7D1C_452d_98B2_308983569ECB" target="EAID_9099AF4F_0019_4768_B85A_99820F3E6307" modelElement="EAID_9219D833_E02D_4663_AAEC_E4DC2FD36641">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_AAEC_E4DC2FD36641" text="+epo:hasDriverPerson" modelElement="EAID_dst19D833_E02D_4663_AAEC_E4DC2FD36641">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_AAEC_E4DC2FD36641" x="1811" y="606" width="89" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_AAEC_E4DC2FD36641" x="1813" y="606" width="89" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_AAEC_E4DC2FD36641" text="1..*" modelElement="EAID_dst19D833_E02D_4663_AAEC_E4DC2FD36641">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_AAEC_E4DC2FD36641" x="1882" y="588" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_AAEC_E4DC2FD36641" x="1884" y="588" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_AAEC_E4DC2FD36641" x="1870" y="649"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_AAEC_E4DC2FD36641" x="1870" y="583"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_AAEC_E4DC2FD36641" x="1872" y="649"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_AAEC_E4DC2FD36641" x="1872" y="583"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_84EC_413BB95A2AB6" source="EAID_9E80131F_7D1C_452d_98B2_308983569ECB" target="EAID_41E9A77E_E3B5_48df_BE17_4B4411613470" modelElement="EAID_507F5BF2_9FDB_496a_84EC_413BB95A2AB6">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_84EC_413BB95A2AB6" x="1868" y="691"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_84EC_413BB95A2AB6" x="1868" y="748"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_84EC_413BB95A2AB6" x="1871" y="691"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_84EC_413BB95A2AB6" x="1871" y="748"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_B4D4_B3EE0610F79E" source="EAID_9E80131F_7D1C_452d_98B2_308983569ECB" target="EAID_54C25D5B_33E1_4ec5_BCDB_3E876216F668" modelElement="EAID_37038B3F_FA49_401f_B4D4_B3EE0610F79E">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_B4D4_B3EE0610F79E" x="1927" y="670"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_B4D4_B3EE0610F79E" x="2077" y="670"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_B4D4_B3EE0610F79E" x="2075" y="670"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_82FA_E8F122CD0638" source="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" target="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" modelElement="EAID_D8788651_B092_4dea_82FA_E8F122CD0638">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_82FA_E8F122CD0638" x="1341" y="421"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_82FA_E8F122CD0638" x="1341" y="307"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_9445_B3D0C269B4E6" source="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" target="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" modelElement="EAID_B9BA1AAD_DA48_4953_9445_B3D0C269B4E6">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_9445_B3D0C269B4E6" text="+epo-ful:refersToDeliveryInformation" modelElement="EAID_dstBA1AAD_DA48_4953_9445_B3D0C269B4E6">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_9445_B3D0C269B4E6" x="1547" y="1067" width="150" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_8257_A68F3DC30CC3" source="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_8C74AF3F_89A0_4039_8257_A68F3DC30CC3">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_8257_A68F3DC30CC3" text="+epo-ful:agreedByBuyer" modelElement="EAID_dst74AF3F_89A0_4039_8257_A68F3DC30CC3">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_8257_A68F3DC30CC3" x="445" y="613" width="98" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_9445_B3D0C269B4E6" text="1" modelElement="EAID_dstBA1AAD_DA48_4953_9445_B3D0C269B4E6">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_9445_B3D0C269B4E6" x="1624" y="1094" width="6" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_8257_A68F3DC30CC3" text="1..*" modelElement="EAID_dst74AF3F_89A0_4039_8257_A68F3DC30CC3">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_8257_A68F3DC30CC3" x="507" y="599" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_9445_B3D0C269B4E6" x="1255" y="960"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_9445_B3D0C269B4E6" x="1616" y="960"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_9445_B3D0C269B4E6" x="1616" y="1112"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_8257_A68F3DC30CC3" x="673" y="656"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_8257_A68F3DC30CC3" x="495" y="656"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_8257_A68F3DC30CC3" x="495" y="594"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B157CDB_0A9A_43f4_9887_A78953BBB2E2" source="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_3A930003_5665_43a6_9887_A78953BBB2E2">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0A9A_43f4_9887_A78953BBB2E2" text="+epo-ful:hasDespatchPeriod" modelElement="EAID_dst930003_5665_43a6_9887_A78953BBB2E2">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0A9A_43f4_9887_A78953BBB2E2" x="896" y="1180" width="113" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0A9A_43f4_9887_A78953BBB2E2" text="0..1" modelElement="EAID_dst930003_5665_43a6_9887_A78953BBB2E2">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0A9A_43f4_9887_A78953BBB2E2" x="965" y="1228" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0A9A_43f4_9887_A78953BBB2E2" x="1058" y="941"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0A9A_43f4_9887_A78953BBB2E2" x="957" y="941"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_9887_A78953BBB2E2" x="957" y="1246"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_D210A255_85F8_4c7e_8376_ED3954C42486" isFrame="false" modelElement="EAPK_9F90CA42_2AD5_4086_8537_A3D0531D27FD">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_D210A255_85F8_4c7e_8376_ED3954C42486" isFrame="false" modelElement="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D210A255_85F8_4c7e_AD7B_7484B8FDA398" modelElement="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_85F8_4c7e_AD7B_7484B8FDA398" text="adms:Identifier"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_85F8_4c7e_AD7B_7484B8FDA398" x="508" y="283" width="216" height="140"/>
@@ -2285,12 +2564,18 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D210A255_85F8_4c7e_A889_D9AA2A5B456A" modelElement="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_85F8_4c7e_A889_D9AA2A5B456A" text="epo-ord:DeliveryInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_85F8_4c7e_A889_D9AA2A5B456A" x="141" y="587" width="226" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_85F8_4c7e_A889_D9AA2A5B456A" x="141" y="587" width="226" height="85"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D210A255_85F8_4c7e_A3F8_36BB2D57FFCD" modelElement="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_85F8_4c7e_A3F8_36BB2D57FFCD" text="epo-ful:AbstractContainer"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_85F8_4c7e_A3F8_36BB2D57FFCD" x="418" y="134" width="217" height="70"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_D210A255_85F8_4c7e_8493_0DB77A3F5DD2" modelElement="EAID_0A77CA66_1049_4c72_8493_0DB77A3F5DD2">
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_85F8_4c7e_8493_0DB77A3F5DD2" x="983" y="470" width="115" height="55"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_D210A255_85F8_4c7e_A870_BC4A0B51E6B7" modelElement="EAID_ED784F3F_23C1_491d_A870_BC4A0B51E6B7">
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_85F8_4c7e_A870_BC4A0B51E6B7" x="374" y="500" width="115" height="55"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D210A255_85F8_4c7e_9069_80DF68AD408A" source="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_C7C433B7_9297_4921_9069_80DF68AD408A">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_85F8_4c7e_9069_80DF68AD408A" text="+adms:identifier" modelElement="EAID_dstC433B7_9297_4921_9069_80DF68AD408A">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_85F8_4c7e_9069_80DF68AD408A" x="750" y="401" width="66" height="14"/>
@@ -2335,23 +2620,33 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D210A255_85F8_4c7e_84B7_1E5035469B29" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_11702782_CA5B_4035_84B7_1E5035469B29">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_85F8_4c7e_84B7_1E5035469B29" text="+adms:identifier" modelElement="EAID_dst702782_CA5B_4035_84B7_1E5035469B29">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_85F8_4c7e_84B7_1E5035469B29" x="617" y="448" width="66" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_85F8_4c7e_84B7_1E5035469B29" x="602" y="448" width="66" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_85F8_4c7e_84B7_1E5035469B29" text="0..1" modelElement="EAID_dst702782_CA5B_4035_84B7_1E5035469B29">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_85F8_4c7e_84B7_1E5035469B29" x="663" y="428" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_85F8_4c7e_84B7_1E5035469B29" x="648" y="428" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_85F8_4c7e_84B7_1E5035469B29" x="651" y="559"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_85F8_4c7e_84B7_1E5035469B29" x="651" y="423"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_85F8_4c7e_84B7_1E5035469B29" x="636" y="559"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_85F8_4c7e_84B7_1E5035469B29" x="636" y="423"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D210A255_85F8_4c7e_AC1D_F32A308572D4" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_7DD90B0C_4D89_4d64_AC1D_F32A308572D4">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_85F8_4c7e_AC1D_F32A308572D4" text="+epo-ful:hasFreightForwarderConsignmentID" modelElement="EAID_dstD90B0C_4D89_4d64_AC1D_F32A308572D4">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_85F8_4c7e_AC1D_F32A308572D4" x="638" y="518" width="181" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D210A255_85F8_4c7e_A987_53BA66264912" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_F3CD32F8_8180_4939_A987_53BA66264912">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_85F8_4c7e_A987_53BA66264912" text="+epo-ful:hasConsigneeConsignmentID" modelElement="EAID_dstCD32F8_8180_4939_A987_53BA66264912">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_85F8_4c7e_A987_53BA66264912" x="612" y="493" width="153" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_85F8_4c7e_AC1D_F32A308572D4" text="0..1" modelElement="EAID_dstD90B0C_4D89_4d64_AC1D_F32A308572D4">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_85F8_4c7e_AC1D_F32A308572D4" x="715" y="437" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_85F8_4c7e_A987_53BA66264912" text="0..1" modelElement="EAID_dstCD32F8_8180_4939_A987_53BA66264912">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_85F8_4c7e_A987_53BA66264912" x="693" y="428" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_85F8_4c7e_AC1D_F32A308572D4" x="705" y="559"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_85F8_4c7e_AC1D_F32A308572D4" x="705" y="423"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_85F8_4c7e_A987_53BA66264912" x="681" y="559"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_85F8_4c7e_A987_53BA66264912" x="681" y="423"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D210A255_85F8_4c7e_BE39_99AFCAAF2C1F" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_36284C1D_C098_4082_BE39_99AFCAAF2C1F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_85F8_4c7e_BE39_99AFCAAF2C1F" text="+epo-ful:hasDespatcherConsignmentID" modelElement="EAID_dst284C1D_C098_4082_BE39_99AFCAAF2C1F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_85F8_4c7e_BE39_99AFCAAF2C1F" x="697" y="458" width="157" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_85F8_4c7e_BE39_99AFCAAF2C1F" text="0..1" modelElement="EAID_dst284C1D_C098_4082_BE39_99AFCAAF2C1F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_85F8_4c7e_BE39_99AFCAAF2C1F" x="730" y="428" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_85F8_4c7e_BE39_99AFCAAF2C1F" x="718" y="559"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_85F8_4c7e_BE39_99AFCAAF2C1F" x="718" y="423"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D210A255_85F8_4c7e_BDD9_5E0D69EFDD3D" source="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_DA6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_85F8_4c7e_BDD9_5E0D69EFDD3D" text="+adms:identifier" modelElement="EAID_dst6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D">
@@ -2398,7 +2693,7 @@
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_85F8_4c7e_AE53_091E3E0514AF" x="642" y="235" width="82" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_85F8_4c7e_AE53_091E3E0514AF" text="0..1" modelElement="EAID_dstA6863A_1079_4af7_AE53_091E3E0514AF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_85F8_4c7e_AE53_091E3E0514AF" x="686" y="248" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_85F8_4c7e_AE53_091E3E0514AF" x="660" y="265" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_85F8_4c7e_AE53_091E3E0514AF" x="687" y="196"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_85F8_4c7e_AE53_091E3E0514AF" x="687" y="283"/>
@@ -2414,18 +2709,18 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_85F8_4c7e_BF21_25D103CB3656" x="249" y="411"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_85F8_4c7e_BF21_25D103CB3656" x="508" y="411"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D210A255_85F8_4c7e_A987_53BA66264912" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_F3CD32F8_8180_4939_A987_53BA66264912">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_85F8_4c7e_A987_53BA66264912" text="+epo-ful:hasConsigneeConsignmentID" modelElement="EAID_dstCD32F8_8180_4939_A987_53BA66264912">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_85F8_4c7e_A987_53BA66264912" x="526" y="493" width="153" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D210A255_85F8_4c7e_AC1D_F32A308572D4" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_7DD90B0C_4D89_4d64_AC1D_F32A308572D4">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_85F8_4c7e_AC1D_F32A308572D4" text="+epo-ful:hasFreightForwarderConsignmentID" modelElement="EAID_dstD90B0C_4D89_4d64_AC1D_F32A308572D4">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_85F8_4c7e_AC1D_F32A308572D4" x="497" y="519" width="181" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_85F8_4c7e_A987_53BA66264912" text="0..1" modelElement="EAID_dstCD32F8_8180_4939_A987_53BA66264912">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_85F8_4c7e_A987_53BA66264912" x="607" y="428" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_85F8_4c7e_AC1D_F32A308572D4" text="0..1" modelElement="EAID_dstD90B0C_4D89_4d64_AC1D_F32A308572D4">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_85F8_4c7e_AC1D_F32A308572D4" x="594" y="437" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_85F8_4c7e_A987_53BA66264912" x="595" y="559"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_85F8_4c7e_A987_53BA66264912" x="595" y="423"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_85F8_4c7e_AC1D_F32A308572D4" x="584" y="559"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_85F8_4c7e_AC1D_F32A308572D4" x="584" y="423"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_EC284203_FAC5_4d56_86F8_EC99545F97B4" isFrame="false" modelElement="EAPK_9F90CA42_2AD5_4086_8537_A3D0531D27FD">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_EC284203_FAC5_4d56_86F8_EC99545F97B4" isFrame="false" modelElement="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EC284203_FAC5_4d56_8D25_BA714BA9C3EC" modelElement="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_FAC5_4d56_8D25_BA714BA9C3EC" text="epo:Quantity"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_FAC5_4d56_8D25_BA714BA9C3EC" x="584" y="375" width="290" height="82"/>
@@ -2451,6 +2746,9 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_FAC5_4d56_B49F_D657B2ABC394" text="epo-ful:Consignment"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_FAC5_4d56_B49F_D657B2ABC394" x="584" y="663" width="290" height="127"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_EC284203_FAC5_4d56_AA5E_1F31B11EAC62" modelElement="EAID_78B45A5F_C144_44a4_AA5E_1F31B11EAC62">
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_FAC5_4d56_AA5E_1F31B11EAC62" x="435" y="682" width="115" height="55"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EC284203_FAC5_4d56_ACDC_BC0C377734AF" source="EAID_BB1AAA4C_E66B_4fde_A0B6_1A30FC13503B" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_B1577190_0947_4041_ACDC_BC0C377734AF">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_FAC5_4d56_ACDC_BC0C377734AF" text="+epo-ful:hasMaximumTemperature" modelElement="EAID_dst577190_0947_4041_ACDC_BC0C377734AF">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FAC5_4d56_ACDC_BC0C377734AF" x="905" y="365" width="144" height="14"/>
@@ -2557,15 +2855,15 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FAC5_4d56_8583_6B810BB672CD" x="1154" y="407"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_FAC5_4d56_8583_6B810BB672CD" x="874" y="407"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EC284203_FAC5_4d56_8E1B_502A7CDA0486" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_75378C4F_ABAD_440f_8E1B_502A7CDA0486">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_FAC5_4d56_8E1B_502A7CDA0486" text="+epo-ful:hasLoadingLength" modelElement="EAID_dst378C4F_ABAD_440f_8E1B_502A7CDA0486">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FAC5_4d56_8E1B_502A7CDA0486" x="624" y="479" width="14" height="109"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EC284203_FAC5_4d56_AC1C_956CD538804F" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_73E249AD_BE82_405c_AC1C_956CD538804F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_FAC5_4d56_AC1C_956CD538804F" text="+epo-ful:hasLoadingMeter" modelElement="EAID_dstE249AD_BE82_405c_AC1C_956CD538804F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FAC5_4d56_AC1C_956CD538804F" x="655" y="479" width="14" height="107"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_FAC5_4d56_8E1B_502A7CDA0486" text="0..1" modelElement="EAID_dst378C4F_ABAD_440f_8E1B_502A7CDA0486">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FAC5_4d56_8E1B_502A7CDA0486" x="654" y="462" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_FAC5_4d56_AC1C_956CD538804F" text="0..1" modelElement="EAID_dstE249AD_BE82_405c_AC1C_956CD538804F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FAC5_4d56_AC1C_956CD538804F" x="685" y="462" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FAC5_4d56_8E1B_502A7CDA0486" x="642" y="663"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FAC5_4d56_8E1B_502A7CDA0486" x="642" y="457"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FAC5_4d56_AC1C_956CD538804F" x="673" y="663"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FAC5_4d56_AC1C_956CD538804F" x="673" y="457"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EC284203_FAC5_4d56_8218_75D01ED44538" source="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_65E8EC44_CB4C_4aa9_8218_75D01ED44538">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_FAC5_4d56_8218_75D01ED44538" text="+epo-ful:hasDespatchedQuantity" modelElement="EAID_dstE8EC44_CB4C_4aa9_8218_75D01ED44538">
@@ -2589,13 +2887,13 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EC284203_FAC5_4d56_80EF_346FB3152195" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_F9F5CFA7_D31A_4c48_80EF_346FB3152195">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_FAC5_4d56_80EF_346FB3152195" text="+epo-ful:hasGrossWeight" modelElement="EAID_dstF5CFA7_D31A_4c48_80EF_346FB3152195">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FAC5_4d56_80EF_346FB3152195" x="667" y="486" width="14" height="102"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FAC5_4d56_80EF_346FB3152195" x="625" y="486" width="14" height="102"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_FAC5_4d56_80EF_346FB3152195" text="0..1" modelElement="EAID_dstF5CFA7_D31A_4c48_80EF_346FB3152195">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FAC5_4d56_80EF_346FB3152195" x="696" y="462" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FAC5_4d56_80EF_346FB3152195" x="654" y="462" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FAC5_4d56_80EF_346FB3152195" x="684" y="663"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FAC5_4d56_80EF_346FB3152195" x="684" y="457"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FAC5_4d56_80EF_346FB3152195" x="642" y="663"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FAC5_4d56_80EF_346FB3152195" x="642" y="457"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EC284203_FAC5_4d56_B3BF_333FDA416F39" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_8C56C81B_B46D_49ef_B3BF_333FDA416F39">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_FAC5_4d56_B3BF_333FDA416F39" text="+epo-ful:hasGrossVolume" modelElement="EAID_dst56C81B_B46D_49ef_B3BF_333FDA416F39">
@@ -2619,33 +2917,43 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EC284203_FAC5_4d56_8694_DC63D52825C1" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_45480564_D6B2_41da_8694_DC63D52825C1">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_FAC5_4d56_8694_DC63D52825C1" text="+epo-ful:hasChargeableWeight" modelElement="EAID_dst480564_D6B2_41da_8694_DC63D52825C1">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FAC5_4d56_8694_DC63D52825C1" x="713" y="485" width="14" height="125"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FAC5_4d56_8694_DC63D52825C1" x="737" y="481" width="14" height="125"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_FAC5_4d56_8694_DC63D52825C1" text="0..1" modelElement="EAID_dst480564_D6B2_41da_8694_DC63D52825C1">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FAC5_4d56_8694_DC63D52825C1" x="742" y="462" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FAC5_4d56_8694_DC63D52825C1" x="765" y="462" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FAC5_4d56_8694_DC63D52825C1" x="730" y="663"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FAC5_4d56_8694_DC63D52825C1" x="730" y="457"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FAC5_4d56_8694_DC63D52825C1" x="753" y="663"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FAC5_4d56_8694_DC63D52825C1" x="753" y="457"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EC284203_FAC5_4d56_9A7B_894EA99DED44" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_5C5BD66A_585D_4646_9A7B_894EA99DED44">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_FAC5_4d56_9A7B_894EA99DED44" text="+epo-ful:hasTransportHandlingUnitQuantity" modelElement="EAID_dst5BD66A_585D_4646_9A7B_894EA99DED44">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FAC5_4d56_9A7B_894EA99DED44" x="799" y="479" width="14" height="175"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FAC5_4d56_9A7B_894EA99DED44" x="808" y="479" width="14" height="175"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_FAC5_4d56_9A7B_894EA99DED44" text="0..1" modelElement="EAID_dst5BD66A_585D_4646_9A7B_894EA99DED44">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FAC5_4d56_9A7B_894EA99DED44" x="833" y="462" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FAC5_4d56_9A7B_894EA99DED44" x="842" y="462" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FAC5_4d56_9A7B_894EA99DED44" x="821" y="663"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FAC5_4d56_9A7B_894EA99DED44" x="821" y="457"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FAC5_4d56_9A7B_894EA99DED44" x="830" y="663"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FAC5_4d56_9A7B_894EA99DED44" x="830" y="457"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EC284203_FAC5_4d56_88EE_23DE2339DB3C" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_F93A2AAD_C014_4fa4_88EE_23DE2339DB3C">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_FAC5_4d56_88EE_23DE2339DB3C" text="+epo-ful:hasTotalGoodsItemQuantity" modelElement="EAID_dst3A2AAD_C014_4fa4_88EE_23DE2339DB3C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FAC5_4d56_88EE_23DE2339DB3C" x="757" y="479" width="14" height="150"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FAC5_4d56_88EE_23DE2339DB3C" x="773" y="479" width="14" height="150"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_FAC5_4d56_88EE_23DE2339DB3C" text="0..1" modelElement="EAID_dst3A2AAD_C014_4fa4_88EE_23DE2339DB3C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FAC5_4d56_88EE_23DE2339DB3C" x="789" y="462" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FAC5_4d56_88EE_23DE2339DB3C" x="805" y="462" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FAC5_4d56_88EE_23DE2339DB3C" x="777" y="663"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FAC5_4d56_88EE_23DE2339DB3C" x="777" y="457"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FAC5_4d56_88EE_23DE2339DB3C" x="793" y="663"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FAC5_4d56_88EE_23DE2339DB3C" x="793" y="457"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EC284203_FAC5_4d56_8E1B_502A7CDA0486" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_75378C4F_ABAD_440f_8E1B_502A7CDA0486">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_FAC5_4d56_8E1B_502A7CDA0486" text="+epo-ful:hasLoadingLength" modelElement="EAID_dst378C4F_ABAD_440f_8E1B_502A7CDA0486">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FAC5_4d56_8E1B_502A7CDA0486" x="699" y="479" width="14" height="109"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_FAC5_4d56_8E1B_502A7CDA0486" text="0..1" modelElement="EAID_dst378C4F_ABAD_440f_8E1B_502A7CDA0486">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FAC5_4d56_8E1B_502A7CDA0486" x="729" y="462" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FAC5_4d56_8E1B_502A7CDA0486" x="717" y="663"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FAC5_4d56_8E1B_502A7CDA0486" x="717" y="457"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EC284203_FAC5_4d56_8D27_8D44BA5CA36A" source="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_770594A4_09FD_4b6e_8D27_8D44BA5CA36A">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_FAC5_4d56_8D27_8D44BA5CA36A" text="+epo-ful:hasWidth" modelElement="EAID_dst0594A4_09FD_4b6e_8D27_8D44BA5CA36A">
@@ -2658,7 +2966,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FAC5_4d56_8D27_8D44BA5CA36A" x="860" y="375"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_0E0367BE_EF6C_459c_9C87_3B64208EE574" isFrame="false" modelElement="EAPK_9F90CA42_2AD5_4086_8537_A3D0531D27FD">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_0E0367BE_EF6C_459c_9C87_3B64208EE574" isFrame="false" modelElement="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0E0367BE_EF6C_459c_A3F8_36BB2D57FFCD" modelElement="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_EF6C_459c_A3F8_36BB2D57FFCD" text="epo-ful:AbstractContainer"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_EF6C_459c_A3F8_36BB2D57FFCD" x="617" y="330" width="290" height="70"/>
@@ -2719,7 +3027,7 @@
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_EF6C_459c_A51F_2425A6DBF32F" text="+epo-ful:containsGoodsItem" modelElement="EAID_dstAB192B_82DE_4520_A51F_2425A6DBF32F">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_EF6C_459c_A51F_2425A6DBF32F" x="695" y="480" width="114" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_EF6C_459c_A51F_2425A6DBF32F" text="1..*" modelElement="EAID_dstAB192B_82DE_4520_A51F_2425A6DBF32F">
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_EF6C_459c_A51F_2425A6DBF32F" text="0..*" modelElement="EAID_dstAB192B_82DE_4520_A51F_2425A6DBF32F">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_EF6C_459c_A51F_2425A6DBF32F" x="695" y="503" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_EF6C_459c_A51F_2425A6DBF32F" x="822" y="498"/>
@@ -2910,7 +3218,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_EF6C_459c_A73F_AD86550D22E1" x="868" y="400"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_9F7EC64C_05DC_429f_B68B_6CE04C3F8991" isFrame="false" modelElement="EAPK_9F90CA42_2AD5_4086_8537_A3D0531D27FD">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_9F7EC64C_05DC_429f_B68B_6CE04C3F8991" isFrame="false" modelElement="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9F7EC64C_05DC_429f_8EF3_D893D4201BD3" modelElement="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_05DC_429f_8EF3_D893D4201BD3" text="epo-ful:Despatcher"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_05DC_429f_8EF3_D893D4201BD3" x="896" y="429" width="90" height="70"/>
@@ -2929,7 +3237,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9F7EC64C_05DC_429f_98CF_6753815E5C67" modelElement="EAID_05A42455_86E9_49a9_98CF_6753815E5C67">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_05DC_429f_98CF_6753815E5C67" text="epo-ful:DespatchAdvice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_05DC_429f_98CF_6753815E5C67" x="883" y="217" width="115" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_05DC_429f_98CF_6753815E5C67" x="883" y="217" width="121" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9F7EC64C_05DC_429f_80D1_768357F1472D" modelElement="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_05DC_429f_80D1_768357F1472D" text="epo-ful:ShipmentAgreement"/>
@@ -2945,11 +3253,11 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9F7EC64C_05DC_429f_89C7_9BC5ACC1EEFB" modelElement="EAID_CE66C7F9_83F7_479f_89C7_9BC5ACC1EEFB">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_05DC_429f_89C7_9BC5ACC1EEFB" text="epo-ful:FreightForwarder"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_05DC_429f_89C7_9BC5ACC1EEFB" x="641" y="429" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_05DC_429f_89C7_9BC5ACC1EEFB" x="666" y="429" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9F7EC64C_05DC_429f_A18E_DE28480B6184" modelElement="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_05DC_429f_A18E_DE28480B6184" text="epo-ful:Notifier"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_05DC_429f_A18E_DE28480B6184" x="476" y="429" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_05DC_429f_A18E_DE28480B6184" x="546" y="429" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9F7EC64C_05DC_429f_B50E_A7C6B28E280E" modelElement="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_05DC_429f_B50E_A7C6B28E280E" text="epo-ord:Originator"/>
@@ -2959,6 +3267,17 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_05DC_429f_BE94_E8962C41C9F6" text="epo-ful:ShipmentStage"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_05DC_429f_BE94_E8962C41C9F6" x="94" y="200" width="199" height="70"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9F7EC64C_05DC_429f_9453_012E0A141952" modelElement="EAID_0D5BCA5B_42CB_4202_9453_012E0A141952">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_05DC_429f_9453_012E0A141952" text="epo-ful:NotificationReceiver"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_05DC_429f_9453_012E0A141952" x="398" y="430" width="108" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_9F7EC64C_05DC_429f_8572_20C458910F29" modelElement="EAID_37B4C249_5774_4d78_8572_20C458910F29">
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_05DC_429f_8572_20C458910F29" x="534" y="557" width="115" height="101"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9F7EC64C_05DC_429f_A107_DA46C0358E53" source="EAID_37B4C249_5774_4d78_8572_20C458910F29" target="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184" modelElement="EAID_A4C29886_C9D8_48eb_A107_DA46C0358E53">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_05DC_429f_A107_DA46C0358E53" x="591" y="557"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_05DC_429f_A107_DA46C0358E53" x="591" y="499"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9F7EC64C_05DC_429f_895E_9E7177239DE8" source="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D" target="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" modelElement="EAID_06DB4B0B_7B20_475e_895E_9E7177239DE8">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_05DC_429f_895E_9E7177239DE8" text="+epo-ful:agreedBySeller" modelElement="EAID_dstDB4B0B_7B20_475e_895E_9E7177239DE8">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_05DC_429f_895E_9E7177239DE8" x="1374" y="386" width="97" height="14"/>
@@ -2988,7 +3307,7 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_05DC_429f_9D36_DD776DFC8538" text="0..1" modelElement="EAID_dst78D73E_7BA7_4bf0_9D36_DD776DFC8538">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_05DC_429f_9D36_DD776DFC8538" x="1257" y="253" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_05DC_429f_9D36_DD776DFC8538" x="998" y="251"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_05DC_429f_9D36_DD776DFC8538" x="1004" y="251"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_05DC_429f_9D36_DD776DFC8538" x="1289" y="251"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9F7EC64C_05DC_429f_9583_5FF42CA3E096" source="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" target="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" modelElement="EAID_D6B12A9D_029A_4c46_9583_5FF42CA3E096">
@@ -3008,28 +3327,28 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_05DC_429f_A8B6_7BE5B0CB8B20" text="0..*" modelElement="EAID_dst042A72_F34F_4e88_A8B6_7BE5B0CB8B20">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_05DC_429f_A8B6_7BE5B0CB8B20" x="1052" y="411" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_05DC_429f_A8B6_7BE5B0CB8B20" x="970" y="287"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_05DC_429f_A8B6_7BE5B0CB8B20" x="973" y="287"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_05DC_429f_A8B6_7BE5B0CB8B20" x="1044" y="429"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9F7EC64C_05DC_429f_A7FC_2B4BAC3C8DBD" source="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" target="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695" modelElement="EAID_850FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_05DC_429f_A7FC_2B4BAC3C8DBD" text="+epo-ful:specifiesConsignee" modelElement="EAID_dst0FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_05DC_429f_A7FC_2B4BAC3C8DBD" x="797" y="392" width="112" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_05DC_429f_A7FC_2B4BAC3C8DBD" x="799" y="392" width="112" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_05DC_429f_A7FC_2B4BAC3C8DBD" text="1..*" modelElement="EAID_dst0FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_05DC_429f_A7FC_2B4BAC3C8DBD" x="859" y="414" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_05DC_429f_A7FC_2B4BAC3C8DBD" x="860" y="414" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_05DC_429f_A7FC_2B4BAC3C8DBD" x="911" y="287"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_05DC_429f_A7FC_2B4BAC3C8DBD" x="842" y="429"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_05DC_429f_A7FC_2B4BAC3C8DBD" x="913" y="287"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_05DC_429f_A7FC_2B4BAC3C8DBD" x="843" y="429"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9F7EC64C_05DC_429f_8601_BEA52AB5E730" source="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" target="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3" modelElement="EAID_E91C243F_824F_48fd_8601_BEA52AB5E730">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_05DC_429f_8601_BEA52AB5E730" text="+epo-ful:specifiesDespatcher" modelElement="EAID_dst1C243F_824F_48fd_8601_BEA52AB5E730">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_05DC_429f_8601_BEA52AB5E730" x="887" y="357" width="116" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_05DC_429f_8601_BEA52AB5E730" x="888" y="357" width="116" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_05DC_429f_8601_BEA52AB5E730" text="1..*" modelElement="EAID_dst1C243F_824F_48fd_8601_BEA52AB5E730">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_05DC_429f_8601_BEA52AB5E730" x="953" y="417" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_05DC_429f_8601_BEA52AB5E730" x="954" y="417" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_05DC_429f_8601_BEA52AB5E730" x="940" y="287"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_05DC_429f_8601_BEA52AB5E730" x="940" y="429"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_05DC_429f_8601_BEA52AB5E730" x="942" y="287"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_05DC_429f_8601_BEA52AB5E730" x="941" y="429"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9F7EC64C_05DC_429f_B940_8E07DDB6E493" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6" modelElement="EAID_22815C4E_A421_45ce_B940_8E07DDB6E493">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_05DC_429f_B940_8E07DDB6E493" text="+epo-ful:hasOnCarriageShipmentStage" modelElement="EAID_dst815C4E_A421_45ce_B940_8E07DDB6E493">
@@ -3063,23 +3382,33 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9F7EC64C_05DC_429f_948C_F84C001C68E4" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184" modelElement="EAID_3C454BB2_FC26_49ad_948C_F84C001C68E4">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_05DC_429f_948C_F84C001C68E4" text="+epo:specifiesNotifier" modelElement="EAID_dst454BB2_FC26_49ad_948C_F84C001C68E4">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_05DC_429f_948C_F84C001C68E4" x="494" y="371" width="87" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_05DC_429f_948C_F84C001C68E4" x="567" y="371" width="87" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_05DC_429f_948C_F84C001C68E4" text="0..*" modelElement="EAID_dst454BB2_FC26_49ad_948C_F84C001C68E4">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_05DC_429f_948C_F84C001C68E4" x="525" y="411" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_05DC_429f_948C_F84C001C68E4" x="598" y="411" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_05DC_429f_948C_F84C001C68E4" x="563" y="299"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_05DC_429f_948C_F84C001C68E4" x="517" y="429"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_05DC_429f_948C_F84C001C68E4" x="590" y="299"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_05DC_429f_948C_F84C001C68E4" x="590" y="429"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9F7EC64C_05DC_429f_95E6_BC660BB6F161" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_CE66C7F9_83F7_479f_89C7_9BC5ACC1EEFB" modelElement="EAID_4D018782_9090_4ec2_95E6_BC660BB6F161">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_05DC_429f_95E6_BC660BB6F161" text="+epo:specifiesFreightForwarder" modelElement="EAID_dst018782_9090_4ec2_95E6_BC660BB6F161">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_05DC_429f_95E6_BC660BB6F161" x="608" y="393" width="127" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_05DC_429f_95E6_BC660BB6F161" x="629" y="393" width="127" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_05DC_429f_95E6_BC660BB6F161" text="0..*" modelElement="EAID_dst018782_9090_4ec2_95E6_BC660BB6F161">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_05DC_429f_95E6_BC660BB6F161" x="684" y="411" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_05DC_429f_95E6_BC660BB6F161" x="705" y="411" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_05DC_429f_95E6_BC660BB6F161" x="629" y="299"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_05DC_429f_95E6_BC660BB6F161" x="676" y="429"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_05DC_429f_95E6_BC660BB6F161" x="636" y="299"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_05DC_429f_95E6_BC660BB6F161" x="697" y="429"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9F7EC64C_05DC_429f_8CD9_ECD02C462F1D" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_0D5BCA5B_42CB_4202_9453_012E0A141952" modelElement="EAID_C466B869_99C4_4539_8CD9_ECD02C462F1D">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_05DC_429f_8CD9_ECD02C462F1D" text="+epo:specifiesNotificationReceiver" modelElement="EAID_dst66B869_99C4_4539_8CD9_ECD02C462F1D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_05DC_429f_8CD9_ECD02C462F1D" x="429" y="394" width="137" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_05DC_429f_8CD9_ECD02C462F1D" text="0..*" modelElement="EAID_dst66B869_99C4_4539_8CD9_ECD02C462F1D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_05DC_429f_8CD9_ECD02C462F1D" x="464" y="412" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_05DC_429f_8CD9_ECD02C462F1D" x="542" y="299"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_05DC_429f_8CD9_ECD02C462F1D" x="456" y="430"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9F7EC64C_05DC_429f_A4A1_7512C3E0591E" source="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6" target="EAID_78459D23_BCB4_42bb_83F6_F9D8F550B19D" modelElement="EAID_F48C13D8_6CDE_4da6_A4A1_7512C3E0591E">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_05DC_429f_A4A1_7512C3E0591E" text="+epo:specifiesCarrier" modelElement="EAID_dst8C13D8_6CDE_4da6_A4A1_7512C3E0591E">
@@ -3092,7 +3421,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_05DC_429f_A4A1_7512C3E0591E" x="195" y="429"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_1BD1C3F1_A1B2_4395_9499_3C88CA228A42" isFrame="false" modelElement="EAPK_9F90CA42_2AD5_4086_8537_A3D0531D27FD">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_1BD1C3F1_A1B2_4395_9499_3C88CA228A42" isFrame="false" modelElement="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1BD1C3F1_A1B2_4395_98CF_6753815E5C67" modelElement="EAID_05A42455_86E9_49a9_98CF_6753815E5C67">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_A1B2_4395_98CF_6753815E5C67" text="epo-ful:DespatchAdvice"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A1B2_4395_98CF_6753815E5C67" x="207" y="237" width="121" height="70"/>
@@ -3107,7 +3436,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1BD1C3F1_A1B2_4395_8568_C49C5DA11831" modelElement="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_A1B2_4395_8568_C49C5DA11831" text="epo-cat:ChargeInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A1B2_4395_8568_C49C5DA11831" x="542" y="415" width="117" height="41"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A1B2_4395_8568_C49C5DA11831" x="542" y="415" width="117" height="55"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1BD1C3F1_A1B2_4395_AAE5_65D2B64C35E1" modelElement="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_A1B2_4395_AAE5_65D2B64C35E1" text="epo-ord:AllowanceChargeInformation"/>
@@ -3140,15 +3469,9 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_A1B2_4395_93D9_9D4729194EA6" text="at-voc-new:tax-scheme"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A1B2_4395_93D9_9D4729194EA6" x="556" y="38" width="90" height="60"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1BD1C3F1_A1B2_4395_91D4_F6387465413F" source="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_202AF5A1_B4FE_48a4_91D4_F6387465413F">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_A1B2_4395_91D4_F6387465413F" text="+epo:isCalculatedOn" modelElement="EAID_dst2AF5A1_B4FE_48a4_91D4_F6387465413F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_91D4_F6387465413F" x="772" y="285" width="83" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_A1B2_4395_91D4_F6387465413F" text="0..1" modelElement="EAID_dst2AF5A1_B4FE_48a4_91D4_F6387465413F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_91D4_F6387465413F" x="838" y="308" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_91D4_F6387465413F" x="751" y="303"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_91D4_F6387465413F" x="857" y="303"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1BD1C3F1_A1B2_4395_918C_44D86E9AC3CF" source="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" target="EAID_D72442ED_835D_455e_970E_3D4CAF26A2F5" modelElement="EAID_AF8C5388_D443_4b59_918C_44D86E9AC3CF">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_918C_44D86E9AC3CF" x="501" y="268"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_918C_44D86E9AC3CF" x="501" y="202"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1BD1C3F1_A1B2_4395_9583_5FF42CA3E096" source="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" target="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" modelElement="EAID_D6B12A9D_029A_4c46_9583_5FF42CA3E096">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_A1B2_4395_9583_5FF42CA3E096" text="+epo-ful:refersToConsignment" modelElement="EAID_dstB12A9D_029A_4c46_9583_5FF42CA3E096">
@@ -3162,17 +3485,34 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1BD1C3F1_A1B2_4395_9787_DB2496C70148" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" modelElement="EAID_053FA551_E0F4_4d8a_9787_DB2496C70148">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_A1B2_4395_9787_DB2496C70148" text="+epo-ful:hasFreightAllowanceCharge" modelElement="EAID_dst3FA551_E0F4_4d8a_9787_DB2496C70148">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_9787_DB2496C70148" x="392" y="416" width="148" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_9787_DB2496C70148" x="394" y="412" width="148" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_A1B2_4395_9787_DB2496C70148" text="0..*" modelElement="EAID_dst3FA551_E0F4_4d8a_9787_DB2496C70148">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_9787_DB2496C70148" x="523" y="439" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_9787_DB2496C70148" x="523" y="434" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_9787_DB2496C70148" x="391" y="434"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_9787_DB2496C70148" x="542" y="434"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_9787_DB2496C70148" x="391" y="429"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_9787_DB2496C70148" x="542" y="429"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1BD1C3F1_A1B2_4395_82FA_E8F122CD0638" source="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" target="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" modelElement="EAID_D8788651_B092_4dea_82FA_E8F122CD0638">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_82FA_E8F122CD0638" x="599" y="415"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_82FA_E8F122CD0638" x="599" y="338"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1BD1C3F1_A1B2_4395_B1A5_01DDEE025D3A" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_A287E36F_7CEB_4668_B1A5_01DDEE025D3A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_A1B2_4395_B1A5_01DDEE025D3A" text="+epo-ful:hasDeclaredStatisticalValue" modelElement="EAID_dst87E36F_7CEB_4668_B1A5_01DDEE025D3A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_B1A5_01DDEE025D3A" x="1054" y="410" width="147" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_A1B2_4395_B1A5_01DDEE025D3A" text="0..1" modelElement="EAID_dst87E36F_7CEB_4668_B1A5_01DDEE025D3A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_B1A5_01DDEE025D3A" x="1105" y="357" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_B1A5_01DDEE025D3A" x="391" y="490"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_B1A5_01DDEE025D3A" x="1093" y="490"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_A1B2_4395_B1A5_01DDEE025D3A" x="1093" y="352"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1BD1C3F1_A1B2_4395_A413_050778056B72" source="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" target="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" modelElement="EAID_6DA6B6C9_7964_4102_A413_050778056B72">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_A1B2_4395_A413_050778056B72" text="+epo-ful:hasFreightCharge" modelElement="EAID_dstA6B6C9_7964_4102_A413_050778056B72">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_A413_050778056B72" x="421" y="441" width="107" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_A1B2_4395_A413_050778056B72" text="0..*" modelElement="EAID_dstA6B6C9_7964_4102_A413_050778056B72">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_A413_050778056B72" x="523" y="464" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_A413_050778056B72" x="391" y="459"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_A413_050778056B72" x="542" y="459"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1BD1C3F1_A1B2_4395_8FFF_C8B67B4CF87D" source="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" target="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" modelElement="EAID_121E7032_36A3_4c8b_8FFF_C8B67B4CF87D">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_A1B2_4395_8FFF_C8B67B4CF87D" text="+epo-ful:comprisesDespatchLine" modelElement="EAID_dst1E7032_36A3_4c8b_8FFF_C8B67B4CF87D">
@@ -3184,19 +3524,35 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_8FFF_C8B67B4CF87D" x="265" y="237"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_8FFF_C8B67B4CF87D" x="264" y="172"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1BD1C3F1_A1B2_4395_918C_44D86E9AC3CF" source="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" target="EAID_D72442ED_835D_455e_970E_3D4CAF26A2F5" modelElement="EAID_AF8C5388_D443_4b59_918C_44D86E9AC3CF">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_918C_44D86E9AC3CF" x="501" y="268"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_918C_44D86E9AC3CF" x="501" y="202"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1BD1C3F1_A1B2_4395_AAF8_2E19960E553F" source="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_516CC611_B255_4c67_AAF8_2E19960E553F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_A1B2_4395_AAF8_2E19960E553F" text="+epo-cat:hasAmount" modelElement="EAID_dst6CC611_B255_4c67_AAF8_2E19960E553F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_AAF8_2E19960E553F" x="770" y="285" width="85" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_A1B2_4395_AAF8_2E19960E553F" text="1" modelElement="EAID_dst6CC611_B255_4c67_AAF8_2E19960E553F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_AAF8_2E19960E553F" x="849" y="308" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_AAF8_2E19960E553F" x="751" y="303"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_AAF8_2E19960E553F" x="857" y="303"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1BD1C3F1_A1B2_4395_BFCF_A26F9C0B1D38" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" modelElement="EAID_4F4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_A1B2_4395_BFCF_A26F9C0B1D38" text="+epo:hasPriceSurchargeInformation" modelElement="EAID_dst4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_BFCF_A26F9C0B1D38" x="662" y="417" width="144" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1BD1C3F1_A1B2_4395_9AB4_37A6F31DF36A" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_47E28283_E9BB_4790_9AB4_37A6F31DF36A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_A1B2_4395_9AB4_37A6F31DF36A" text="+epo-ord:hasGrossMonetaryValue" modelElement="EAID_dstE28283_E9BB_4790_9AB4_37A6F31DF36A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_9AB4_37A6F31DF36A" x="862" y="382" width="139" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_A1B2_4395_BFCF_A26F9C0B1D38" text="0..1" modelElement="EAID_dst4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_BFCF_A26F9C0B1D38" x="662" y="440" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_A1B2_4395_9AB4_37A6F31DF36A" text="0..1" modelElement="EAID_dstE28283_E9BB_4790_9AB4_37A6F31DF36A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_9AB4_37A6F31DF36A" x="965" y="357" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_BFCF_A26F9C0B1D38" x="945" y="435"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_BFCF_A26F9C0B1D38" x="659" y="435"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_9AB4_37A6F31DF36A" x="953" y="400"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_9AB4_37A6F31DF36A" x="953" y="352"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1BD1C3F1_A1B2_4395_91D4_F6387465413F" source="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_202AF5A1_B4FE_48a4_91D4_F6387465413F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_A1B2_4395_91D4_F6387465413F" text="+epo:isCalculatedOn" modelElement="EAID_dst2AF5A1_B4FE_48a4_91D4_F6387465413F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_91D4_F6387465413F" x="772" y="285" width="83" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_A1B2_4395_91D4_F6387465413F" text="0..1" modelElement="EAID_dst2AF5A1_B4FE_48a4_91D4_F6387465413F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_91D4_F6387465413F" x="838" y="308" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_91D4_F6387465413F" x="751" y="303"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_91D4_F6387465413F" x="857" y="303"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1BD1C3F1_A1B2_4395_A54F_BC6967C07ADF" source="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" target="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" modelElement="EAID_2EEE05CA_6A1E_4946_A54F_BC6967C07ADF">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_A1B2_4395_A54F_BC6967C07ADF" text="+epo-ord:hasTaxInformation" modelElement="EAID_dstEE05CA_6A1E_4946_A54F_BC6967C07ADF">
@@ -3240,26 +3596,30 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1BD1C3F1_A1B2_4395_B3EA_A725F5A385F7" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_A1B2_4395_B3EA_A725F5A385F7" text="+epo-cat:hasNetMonetaryValue" modelElement="EAID_dst92648E_ABC4_4408_B3EA_A725F5A385F7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_B3EA_A725F5A385F7" x="919" y="373" width="130" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_B3EA_A725F5A385F7" x="965" y="370" width="130" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_A1B2_4395_B3EA_A725F5A385F7" text="1" modelElement="EAID_dst92648E_ABC4_4408_B3EA_A725F5A385F7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_B3EA_A725F5A385F7" x="1004" y="357" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_B3EA_A725F5A385F7" x="1042" y="357" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_B3EA_A725F5A385F7" x="992" y="400"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_B3EA_A725F5A385F7" x="992" y="352"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_B3EA_A725F5A385F7" x="1030" y="400"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_B3EA_A725F5A385F7" x="1030" y="352"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1BD1C3F1_A1B2_4395_AAF8_2E19960E553F" source="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_516CC611_B255_4c67_AAF8_2E19960E553F">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_A1B2_4395_AAF8_2E19960E553F" text="+epo-cat:hasAmount" modelElement="EAID_dst6CC611_B255_4c67_AAF8_2E19960E553F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_AAF8_2E19960E553F" x="770" y="285" width="85" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1BD1C3F1_A1B2_4395_BFCF_A26F9C0B1D38" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" modelElement="EAID_4F4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_A1B2_4395_BFCF_A26F9C0B1D38" text="+epo:hasPriceSurchargeInformation" modelElement="EAID_dst4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_BFCF_A26F9C0B1D38" x="662" y="425" width="144" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_A1B2_4395_AAF8_2E19960E553F" text="1" modelElement="EAID_dst6CC611_B255_4c67_AAF8_2E19960E553F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_AAF8_2E19960E553F" x="849" y="308" width="6" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_A1B2_4395_BFCF_A26F9C0B1D38" text="0..1" modelElement="EAID_dst4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_BFCF_A26F9C0B1D38" x="662" y="448" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_AAF8_2E19960E553F" x="751" y="303"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_AAF8_2E19960E553F" x="857" y="303"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_BFCF_A26F9C0B1D38" x="945" y="443"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_BFCF_A26F9C0B1D38" x="659" y="443"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1BD1C3F1_A1B2_4395_82FA_E8F122CD0638" source="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" target="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" modelElement="EAID_D8788651_B092_4dea_82FA_E8F122CD0638">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_82FA_E8F122CD0638" x="599" y="415"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_82FA_E8F122CD0638" x="599" y="338"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_14ABD635_4FA5_417e_86EB_10A484C84B2B" isFrame="false" modelElement="EAPK_BA11696D_6ACD_40f7_958C_DB383E6E89FD">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_14ABD635_4FA5_417e_86EB_10A484C84B2B" isFrame="false" modelElement="EAPK_007403A6_1B13_47c8_AAFD_D00C4DF6FA72">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_14ABD635_4FA5_417e_B386_8ACB39A17657" modelElement="EAID_CF553CC8_8DC9_4ea2_B386_8ACB39A17657">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4FA5_417e_B386_8ACB39A17657" text="epo-ful:ReceiptAdvice"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4FA5_417e_B386_8ACB39A17657" x="934" y="543" width="176" height="115"/>
@@ -3324,11 +3684,11 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_14ABD635_4FA5_417e_9313_58C4BB4EB1A7" modelElement="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4FA5_417e_9313_58C4BB4EB1A7" text="epo-cat:Line"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4FA5_417e_9313_58C4BB4EB1A7" x="125" y="285" width="171" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4FA5_417e_9313_58C4BB4EB1A7" x="125" y="285" width="232" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_14ABD635_4FA5_417e_B200_94202420C754" modelElement="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4FA5_417e_B200_94202420C754" text="epo-cat:Item"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4FA5_417e_B200_94202420C754" x="88" y="125" width="246" height="114"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4FA5_417e_B200_94202420C754" x="118" y="130" width="246" height="114"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_14ABD635_4FA5_417e_B935_B52376928738" modelElement="EAID_C3684D7C_E07D_415a_B935_B52376928738">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_4FA5_417e_B935_B52376928738" text="enumeration"/>
@@ -3557,17 +3917,17 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_14ABD635_4FA5_417e_BD03_7B202CFA4807" source="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" target="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" modelElement="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_4FA5_417e_BD03_7B202CFA4807" text="+epo-cat:specifiesItem" modelElement="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_4FA5_417e_BD03_7B202CFA4807" x="162" y="264" width="92" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_4FA5_417e_BD03_7B202CFA4807" x="193" y="269" width="92" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_4FA5_417e_BD03_7B202CFA4807" text="1" modelElement="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4FA5_417e_BD03_7B202CFA4807" x="222" y="244" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4FA5_417e_BD03_7B202CFA4807" x="253" y="249" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4FA5_417e_BD03_7B202CFA4807" x="210" y="285"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4FA5_417e_BD03_7B202CFA4807" x="210" y="239"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4FA5_417e_BD03_7B202CFA4807" x="241" y="285"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4FA5_417e_BD03_7B202CFA4807" x="241" y="244"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_14ABD635_4FA5_417e_BCCC_37421BA960DE" source="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" target="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" modelElement="EAID_AA589EDA_B26B_44c3_BCCC_37421BA960DE">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4FA5_417e_BCCC_37421BA960DE" x="570" y="315"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4FA5_417e_BCCC_37421BA960DE" x="296" y="315"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4FA5_417e_BCCC_37421BA960DE" x="357" y="315"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_14ABD635_4FA5_417e_8018_10297955785C" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_39F3583F_0D40_4e9f_8018_10297955785C">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_4FA5_417e_8018_10297955785C" text="+epo:associatedWith 0..*" modelElement="EAID_dstF3583F_0D40_4e9f_8018_10297955785C">
@@ -3598,7 +3958,7 @@
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_14ABD635_4FA5_417e_B27A_8F69BE5B1455" source="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" target="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" modelElement="EAID_A88D0B55_1D01_4b73_B27A_8F69BE5B1455">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4FA5_417e_B27A_8F69BE5B1455" x="534" y="399"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4FA5_417e_B27A_8F69BE5B1455" x="534" y="336"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4FA5_417e_B27A_8F69BE5B1455" x="296" y="336"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4FA5_417e_B27A_8F69BE5B1455" x="357" y="336"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_14ABD635_4FA5_417e_A009_CBC3D19B20B5" source="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_6ADD570C_FEF5_4342_A009_CBC3D19B20B5">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_4FA5_417e_A009_CBC3D19B20B5" text="+epo-ful:hasAssociatedDocument" modelElement="EAID_dstDD570C_FEF5_4342_A009_CBC3D19B20B5">
@@ -3637,8 +3997,8 @@
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_4FA5_417e_A3AA_B5B7E513AEA0" text="+epo-ful:refersToOrderLine" modelElement="EAID_dst259612_87E6_4f34_A3AA_B5B7E513AEA0">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_4FA5_417e_A3AA_B5B7E513AEA0" x="557" y="362" width="109" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_4FA5_417e_A3AA_B5B7E513AEA0" text="0..1" modelElement="EAID_dst259612_87E6_4f34_A3AA_B5B7E513AEA0">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4FA5_417e_A3AA_B5B7E513AEA0" x="626" y="345" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_4FA5_417e_A3AA_B5B7E513AEA0" text="1" modelElement="EAID_dst259612_87E6_4f34_A3AA_B5B7E513AEA0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4FA5_417e_A3AA_B5B7E513AEA0" x="626" y="345" width="6" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4FA5_417e_A3AA_B5B7E513AEA0" x="614" y="399"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4FA5_417e_A3AA_B5B7E513AEA0" x="614" y="340"/>
@@ -3697,10 +4057,10 @@
 				<times created="2022-08-11 09:40:01" modified="2023-09-27 15:58:16"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
 			</element>
-			<element xmi:idref="EAPK_9F90CA42_2AD5_4086_8537_A3D0531D27FD" xmi:type="uml:Package" name="diagrams" scope="public">
-				<model package2="EAID_9F90CA42_2AD5_4086_8537_A3D0531D27FD" package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" tpos="1" ea_localid="247" ea_eleType="package"/>
+			<element xmi:idref="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" xmi:type="uml:Package" name="diagrams" scope="public">
+				<model package2="EAID_2862E732_468C_425f_AB69_5F67101EF9E1" package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" tpos="1" ea_localid="257" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 13:00:23" modified="2024-03-18 13:00:23" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:50:51" modified="2024-07-23 11:50:51" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3708,13 +4068,23 @@
 				<extendedProperties tagged="0" package_name="despatch advice"/>
 				<packageproperties version="1.0" tpos="1"/>
 				<paths/>
-				<times created="2024-03-18 13:00:23" modified="2024-03-18 13:00:23"/>
+				<times created="2024-07-23 11:50:51" modified="2024-07-23 11:50:51"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
+			<element xmi:idref="EAID_0A77CA66_1049_4c72_8493_0DB77A3F5DD2" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" tpos="0" ea_localid="3611" ea_eleType="element"/>
+				<properties documentation="used for rail car identifier.&#xA;" isSpecification="false" sType="Note" nType="1" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-06-05 12:33:12" modified="2024-06-05 12:33:22" complexity="1" status="Proposed"/>
+				<code gentype="&lt;none&gt;"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams" relatedlinks="idref1=EAID_77553B39_DB4D_4388_9D1B_8C8E24EB522C;"/>
+			</element>
 			<element xmi:idref="EAID_27ECEEC8_871D_4826_8EA1_8E10F63A1500" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_9F90CA42_2AD5_4086_8537_A3D0531D27FD" tpos="0" ea_localid="2895" ea_eleType="element"/>
-				<properties documentation="isReturnable attribute needs to be checked on whether it is useful or not." isSpecification="false" sType="Note" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-03-30 15:45:49" modified="2023-03-30 15:46:16" complexity="1" status="Proposed"/>
+				<model package="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" tpos="0" ea_localid="2895" ea_eleType="element"/>
+				<properties documentation="isReturnable attribute should be removed in a future release." isSpecification="false" sType="Note" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-03-30 15:45:49" modified="2024-06-05 13:12:40" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3724,10 +4094,109 @@
 					<NoteLink xmi:id="EAID_357EE20B_991E_4359_99A9_85E159FD3FDA" start="EAID_27ECEEC8_871D_4826_8EA1_8E10F63A1500" end="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA"/>
 				</links>
 			</element>
-			<element xmi:idref="EAPK_8F63D40D_7F22_4ec4_8775_4576642A2A08" xmi:type="uml:Package" name="classes" scope="public">
-				<model package2="EAID_8F63D40D_7F22_4ec4_8775_4576642A2A08" package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" tpos="2" ea_localid="248" ea_eleType="package"/>
+			<element xmi:idref="EAID_37B4C249_5774_4d78_8572_20C458910F29" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" tpos="0" ea_localid="3628" ea_eleType="element"/>
+				<properties documentation="This class was wrongly named and has been replaced by epo-ful:NotificationReceiver. It will be removed in the next major release. &#xA;" isSpecification="false" sType="Note" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-06-25 16:45:43" modified="2024-06-25 16:45:50" complexity="1" status="Proposed"/>
+				<code gentype="&lt;none&gt;"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<NoteLink xmi:id="EAID_A4C29886_C9D8_48eb_A107_DA46C0358E53" start="EAID_37B4C249_5774_4d78_8572_20C458910F29" end="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_78B45A5F_C144_44a4_AA5E_1F31B11EAC62" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" tpos="0" ea_localid="3618" ea_eleType="element"/>
+				<properties documentation="to be removed from future ePO version&#xA;" isSpecification="false" sType="Note" nType="1" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-06-10 12:21:32" modified="2024-06-18 16:51:00" complexity="1" status="Proposed"/>
+				<code gentype="&lt;none&gt;"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams" relatedlinks="idref1=EAID_45480564_D6B2_41da_8694_DC63D52825C1;idref2=EAID_75378C4F_ABAD_440f_8E1B_502A7CDA0486;"/>
+			</element>
+			<element xmi:idref="EAID_864B4AE7_D2C6_4c67_93BC_19F9D69F8197" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" tpos="0" ea_localid="3619" ea_eleType="element"/>
+				<properties documentation="to be removed in a future ePO version and to re-use epo-ful:hasDeclaredStatisticalValue instead." isSpecification="false" sType="Note" nType="1" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-06-10 12:25:31" modified="2024-06-10 12:25:56" complexity="1" status="Proposed"/>
+				<code gentype="&lt;none&gt;"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams" relatedlinks="idref1=EAID_569C582B_2F50_4a11_B7B6_50CA2F0A9B94;"/>
+			</element>
+			<element xmi:idref="EAID_AFF2FF49_6801_472a_B12C_681ECC691BB8" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" tpos="0" ea_localid="3613" ea_eleType="element"/>
+				<properties documentation="we should re-use epo-ord:hasShippingMark instead of epo-ful:hasShippingMark." isSpecification="false" sType="Note" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-06-05 13:18:25" modified="2024-06-05 13:18:59" complexity="1" status="Proposed"/>
+				<code gentype="&lt;none&gt;"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<NoteLink xmi:id="EAID_54B7C02C_C045_45c7_B877_9B2219A80C72" start="EAID_AFF2FF49_6801_472a_B12C_681ECC691BB8" end="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_C94A7466_0773_451f_8CF7_C481027E03FA" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" tpos="0" ea_localid="3630" ea_eleType="element"/>
+				<properties documentation="proposal to be removed in the future ePO version" isSpecification="false" sType="Note" nType="1" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-02 15:41:41" modified="2024-07-02 15:45:12" complexity="1" status="Proposed"/>
+				<code gentype="&lt;none&gt;"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams" relatedlinks="idref1=EAID_79AEE9C5_EA86_424b_9486_C235014D3693;idref2=EAID_9D8A2FCD_752D_45a9_9023_77697592FF3C;idref3=EAID_EA77B614_F9B2_464f_9F87_43543F10AEA4;"/>
+			</element>
+			<element xmi:idref="EAID_D25408FD_102C_45ac_8B0F_E2AD6B66BE37" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" tpos="0" ea_localid="3629" ea_eleType="element"/>
+				<properties documentation="proposal to be removed in the future ePO version" isSpecification="false" sType="Note" nType="1" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-06-25 17:07:41" modified="2024-07-02 15:38:15" complexity="1" status="Proposed"/>
+				<code gentype="&lt;none&gt;"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams" relatedlinks="idref1=EAID_79AEE9C5_EA86_424b_9486_C235014D3693;idref2=EAID_9D8A2FCD_752D_45a9_9023_77697592FF3C;"/>
+			</element>
+			<element xmi:idref="EAID_D5D11C8E_0306_4f62_986A_C58347A2EB63" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" tpos="0" ea_localid="3624" ea_eleType="element"/>
+				<properties documentation="to be removed in a future ePO version" isSpecification="false" sType="Note" nType="1" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-06-18 15:43:35" modified="2024-06-18 16:14:48" complexity="1" status="Proposed"/>
+				<code gentype="&lt;none&gt;"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams" relatedlinks="idref1=EAID_5009F883_10B2_4e9c_96A3_A1F92BE8EA63;idref2=EAID_2E9FE66A_E025_4563_9A59_461990838D96;idref3=EAID_053FA551_E0F4_4d8a_9787_DB2496C70148;"/>
+			</element>
+			<element xmi:idref="EAID_D8A8B96C_BD80_4776_8875_507427F96AF2" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" tpos="0" ea_localid="3612" ea_eleType="element"/>
+				<properties documentation="to remove epo-ful:hasVehicleDescription" isSpecification="false" sType="Note" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-06-05 12:36:47" modified="2024-06-05 12:37:00" complexity="1" status="Proposed"/>
+				<code gentype="&lt;none&gt;"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<NoteLink xmi:id="EAID_7162EBB6_46B3_40ef_B911_26A9D3F39745" start="EAID_D8A8B96C_BD80_4776_8875_507427F96AF2" end="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_ED784F3F_23C1_491d_A870_BC4A0B51E6B7" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" tpos="0" ea_localid="3617" ea_eleType="element"/>
+				<properties documentation="to be removed from future ePO version" isSpecification="false" sType="Note" nType="1" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-06-10 12:06:53" modified="2024-06-10 12:07:11" complexity="1" status="Proposed"/>
+				<code gentype="&lt;none&gt;"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams" relatedlinks="idref1=EAID_9F290187_06CC_4af8_83C9_F475091E0C14;idref2=EAID_7DD90B0C_4D89_4d64_AC1D_F32A308572D4;"/>
+			</element>
+			<element xmi:idref="EAPK_CA125651_CFD9_48ea_99C3_25D0C029AD03" xmi:type="uml:Package" name="classes" scope="public">
+				<model package2="EAID_CA125651_CFD9_48ea_99C3_25D0C029AD03" package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" tpos="2" ea_localid="258" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 13:00:37" modified="2024-03-18 13:00:40" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:51:01" modified="2024-07-23 11:51:01" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3735,13 +4204,13 @@
 				<extendedProperties tagged="0" package_name="despatch advice"/>
 				<packageproperties version="1.0" tpos="2"/>
 				<paths/>
-				<times created="2024-03-18 13:00:37" modified="2024-03-18 13:00:37"/>
+				<times created="2024-07-23 11:51:01" modified="2024-07-23 11:51:01"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAID_BB1AAA4C_E66B_4fde_A0B6_1A30FC13503B" xmi:type="uml:Class" name="epo-ful:TemperatureSpecification" scope="public">
-				<model package="EAPK_8F63D40D_7F22_4ec4_8775_4576642A2A08" tpos="0" ea_localid="2622" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-02-08 16:11:09" modified="2024-03-18 13:01:11" complexity="1" status="Proposed"/>
+				<model package="EAPK_CA125651_CFD9_48ea_99C3_25D0C029AD03" tpos="0" ea_localid="2622" ea_eleType="element"/>
+				<properties documentation="Description of the temperature requirements during shipment.&#xA;&#xA;WG approval 21/05/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-02-08 16:11:09" modified="2024-07-23 11:51:12" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3771,9 +4240,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" xmi:type="uml:Class" name="epo-ful:AbstractContainer" scope="public">
-				<model package="EAPK_8F63D40D_7F22_4ec4_8775_4576642A2A08" tpos="0" ea_localid="2621" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-02-08 15:56:58" modified="2024-03-18 13:01:11" complexity="1" status="Proposed"/>
+				<model package="EAPK_CA125651_CFD9_48ea_99C3_25D0C029AD03" tpos="0" ea_localid="2621" ea_eleType="element"/>
+				<properties documentation="Gathering class for Packages and Transport Handling Units.&#xA;&#xA;WG approval 14/05/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-02-08 15:56:58" modified="2024-07-23 11:51:12" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3782,7 +4251,7 @@
 				<attributes>
 					<attribute xmi:idref="EAID_CA48A297_FEB1_4283_9D35_59D451D012B9" name="epo-ful:isReturnableMaterial" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="Indicates whether the container or part of the container is to be sent back.&#xA;&#xA;WG approval 21/05/2024"/>
 						<model ea_localid="2248" ea_guid="{CA48A297-FEB1-4283-9D35-59D451D012B9}"/>
 						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -3791,13 +4260,13 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
 					<attribute xmi:idref="EAID_ECD349A4_390B_47a1_A963_CBCFECFD7BC2" name="epo-ful:isHazardousRisk" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="Indicates whether some of the contained Goods Items are hazardous.&#xA;&#xA;WG approval 21/05/2024"/>
 						<model ea_localid="2252" ea_guid="{ECD349A4-390B-47a1-A963-CBCFECFD7BC2}"/>
 						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -3806,7 +4275,7 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -3826,9 +4295,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_9099AF4F_0019_4768_B85A_99820F3E6307" xmi:type="uml:Class" name="epo-ful:TransportMeansOperator" scope="public">
-				<model package="EAPK_8F63D40D_7F22_4ec4_8775_4576642A2A08" tpos="0" ea_localid="2618" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-02-08 15:08:40" modified="2024-03-18 13:01:11" complexity="1" status="Proposed"/>
+				<model package="EAPK_CA125651_CFD9_48ea_99C3_25D0C029AD03" tpos="0" ea_localid="2618" ea_eleType="element"/>
+				<properties documentation="The Role of an Agent who is responsible for controlling the Transport Means.&#xA;&#xA;WG approval 21/05/2024 " isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-02-08 15:08:40" modified="2024-07-23 11:51:12" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3841,9 +4310,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_C215EC75_82FD_45d3_832A_B3989A897692" xmi:type="uml:Class" name="epo-ful:GoodsItem" scope="public">
-				<model package="EAPK_8F63D40D_7F22_4ec4_8775_4576642A2A08" tpos="0" ea_localid="2615" ea_eleType="element"/>
+				<model package="EAPK_CA125651_CFD9_48ea_99C3_25D0C029AD03" tpos="0" ea_localid="2615" ea_eleType="element"/>
 				<properties documentation="An Item including its initial packaging during transportation.&#xA;&#xA;Additional information:&#xA;For example, the Item being bought is the computer. The weight of the computer is X.&#xA;The weight of the Goods Item is the weight of the computer plus the weight of the initial packaging.&#xA;During transportation you have for example trace ID which is applied to the GoodsItem, rather than on the Item itself. &#xA;The declared statistical value can only apply once you have a GoodsItem.&#xA;&#xA;WG approval 30/03/2023" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-02-08 12:42:56" modified="2024-03-18 13:01:11" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-02-08 12:42:56" modified="2024-07-23 11:51:12" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3857,9 +4326,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D" xmi:type="uml:Class" name="epo-ful:ShipmentAgreement" scope="public">
-				<model package="EAPK_8F63D40D_7F22_4ec4_8775_4576642A2A08" tpos="0" ea_localid="2623" ea_eleType="element"/>
-				<properties documentation="The Commercial Agreement between the Commercial Parties.&#xA;&#xA;Additional Information:&#xA;It describes items being shipped. What is being moved. &#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-02-08 16:33:23" modified="2024-03-18 13:01:11" complexity="1" status="Proposed"/>
+				<model package="EAPK_CA125651_CFD9_48ea_99C3_25D0C029AD03" tpos="0" ea_localid="2623" ea_eleType="element"/>
+				<properties documentation="The commercial agreement between the Buyer and the Seller.&#xA;&#xA;Additional Information:&#xA;The Shipment Agreement describes the items being shipped.&#xA;&#xA;WG approval 21/05/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-02-08 16:33:23" modified="2024-07-23 11:51:12" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3872,9 +4341,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_3C8EEF69_1346_4dbe_B505_7C2D920B97B9" xmi:type="uml:Class" name="epo-ful:TransportEquipmentSeal" scope="public">
-				<model package="EAPK_8F63D40D_7F22_4ec4_8775_4576642A2A08" tpos="0" ea_localid="2610" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-02-03 15:27:42" modified="2024-03-18 13:01:11" complexity="1" status="Proposed"/>
+				<model package="EAPK_CA125651_CFD9_48ea_99C3_25D0C029AD03" tpos="0" ea_localid="2610" ea_eleType="element"/>
+				<properties documentation="Means used to ensure that the Transport Equipment is not tampered during transportation.&#xA;&#xA;WG approval 21/05/2025" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-02-03 15:27:42" modified="2024-07-23 11:51:12" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3886,9 +4355,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_9E80131F_7D1C_452d_98B2_308983569ECB" xmi:type="uml:Class" name="epo-ful:TransportMeans" scope="public">
-				<model package="EAPK_8F63D40D_7F22_4ec4_8775_4576642A2A08" tpos="0" ea_localid="2575" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-01-18 17:04:58" modified="2024-03-18 13:01:11" complexity="1" status="Proposed"/>
+				<model package="EAPK_CA125651_CFD9_48ea_99C3_25D0C029AD03" tpos="0" ea_localid="2575" ea_eleType="element"/>
+				<properties documentation="Description of a particular vehicle or vessel used for the conveyance of goods or persons.&#xA;&#xA;WG approval 21/05/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-01-18 17:04:58" modified="2024-07-23 11:51:12" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3904,9 +4373,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6" xmi:type="uml:Class" name="epo-ful:ShipmentStage" scope="public">
-				<model package="EAPK_8F63D40D_7F22_4ec4_8775_4576642A2A08" tpos="0" ea_localid="2573" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-01-18 16:51:21" modified="2024-03-18 13:01:11" complexity="1" status="Proposed"/>
+				<model package="EAPK_CA125651_CFD9_48ea_99C3_25D0C029AD03" tpos="0" ea_localid="2573" ea_eleType="element"/>
+				<properties documentation="Part of the itinerary of a shipment.&#xA;&#xA;Additional information:&#xA;In the context of fulfilment only the last part of the itinerary is taken into consideration.&#xA;&#xA;WG approval 21/05/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-01-18 16:51:21" modified="2024-07-23 11:51:12" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3915,7 +4384,7 @@
 				<attributes>
 					<attribute xmi:idref="EAID_480BB6B3_EC84_4048_8BB4_14680AEE519E" name="epo-ful:isHazardousRisk" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="Pending confirmation on whether this attribute should be removed in the next major release because is covered at the level of Consignment. "/>
 						<model ea_localid="2250" ea_guid="{480BB6B3-EC84-4048-8BB4-14680AEE519E}"/>
 						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -3924,7 +4393,7 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -3941,9 +4410,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B" xmi:type="uml:Class" name="epo-ful:Package" scope="public">
-				<model package="EAPK_8F63D40D_7F22_4ec4_8775_4576642A2A08" tpos="0" ea_localid="2571" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-01-18 16:47:33" modified="2024-03-18 13:01:11" complexity="1" status="Proposed"/>
+				<model package="EAPK_CA125651_CFD9_48ea_99C3_25D0C029AD03" tpos="0" ea_localid="2571" ea_eleType="element"/>
+				<properties documentation="Container used for transportation.&#xA;&#xA;WG approval 14/05/2024&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-01-18 16:47:33" modified="2024-07-23 11:51:12" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3952,7 +4421,7 @@
 				<attributes>
 					<attribute xmi:idref="EAID_881A49EE_A6E6_40c9_A28F_8220939D14DE" name="epo-ful:hasPackagingTypeDescription" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="Explanatory text about how the Goods Item is packed.&#xA;&#xA;WG approval 05/06/2024"/>
 						<model ea_localid="2249" ea_guid="{881A49EE-A6E6-40c9-A28F-8220939D14DE}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -3961,7 +4430,7 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -3977,9 +4446,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA" xmi:type="uml:Class" name="epo-ful:TransportEquipment" scope="public">
-				<model package="EAPK_8F63D40D_7F22_4ec4_8775_4576642A2A08" tpos="0" ea_localid="2570" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-01-18 16:47:00" modified="2024-03-18 13:01:11" complexity="1" status="Proposed"/>
+				<model package="EAPK_CA125651_CFD9_48ea_99C3_25D0C029AD03" tpos="0" ea_localid="2570" ea_eleType="element"/>
+				<properties documentation="Description of the apparatus used during transportation.&#xA;&#xA;Additional information:&#xA;The equipment may be a container, a trailer, means of assistance to load or unload the Goods Items.&#xA;&#xA;WG approval 21/05/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-01-18 16:47:00" modified="2024-07-23 11:51:12" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4003,7 +4472,7 @@
 					</attribute>
 					<attribute xmi:idref="EAID_F4DDD2E5_7ADB_4037_93A6_F976EB5C73E3" name="epo-ful:isRefrigerated" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="Indicates whether the instance of the concept includes refrigeration.&#xA;&#xA;Additional Information:&#xA;The instance of the concept can be, for example, Transport Equipment.&#xA;&#xA;WG approval 05/06/2024"/>
 						<model ea_localid="2244" ea_guid="{F4DDD2E5-7ADB-4037-93A6-F976EB5C73E3}"/>
 						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -4012,7 +4481,7 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -4033,7 +4502,7 @@
 					</attribute>
 					<attribute xmi:idref="EAID_C3EB3CEC_F24F_4008_9207_2EEED0B5107B" name="epo-ful:isPowerIndicated" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="Indicates whether the instance of the concept can supply electrical energy.&#xA;&#xA;Additional Information:&#xA;The instance of the concept can be, for example, Transport Equipment.&#xA;&#xA;WG approval 05/06/2024"/>
 						<model ea_localid="2246" ea_guid="{C3EB3CEC-F24F-4008-9207-2EEED0B5107B}"/>
 						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -4042,7 +4511,7 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -4057,9 +4526,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184" xmi:type="uml:Class" name="epo-ful:Notifier" scope="public">
-				<model package="EAPK_8F63D40D_7F22_4ec4_8775_4576642A2A08" tpos="0" ea_localid="2568" ea_eleType="element"/>
-				<properties documentation="The party to be notified upon arrival of goods and when special occurrences (usually pre-defined) take place during a transportation service. (UBL)&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-01-18 16:28:02" modified="2024-03-18 13:01:11" complexity="1" status="Proposed"/>
+				<model package="EAPK_CA125651_CFD9_48ea_99C3_25D0C029AD03" tpos="0" ea_localid="2568" ea_eleType="element"/>
+				<properties documentation="This class was wrongly named and has been replaced by epo-ful:NotificationReceiver. It will be removed in the next major release. &#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-01-18 16:28:02" modified="2024-07-23 11:51:12" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4068,12 +4537,13 @@
 				<links>
 					<Generalization xmi:id="EAID_9AF7586F_1A75_46a2_BD4B_CD5FBBA367E4" start="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
 					<Association xmi:id="EAID_3C454BB2_FC26_49ad_948C_F84C001C68E4" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184"/>
+					<NoteLink xmi:id="EAID_A4C29886_C9D8_48eb_A107_DA46C0358E53" start="EAID_37B4C249_5774_4d78_8572_20C458910F29" end="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_CE66C7F9_83F7_479f_89C7_9BC5ACC1EEFB" xmi:type="uml:Class" name="epo-ful:FreightForwarder" scope="public">
-				<model package="EAPK_8F63D40D_7F22_4ec4_8775_4576642A2A08" tpos="0" ea_localid="2567" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-01-18 16:27:33" modified="2024-03-18 13:01:11" complexity="1" status="Proposed"/>
+				<model package="EAPK_CA125651_CFD9_48ea_99C3_25D0C029AD03" tpos="0" ea_localid="2567" ea_eleType="element"/>
+				<properties documentation="The Role of an Agent who organise the logistic operations need for a fulfilment.&#xA;&#xA;WG approval 21/05/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-01-18 16:27:33" modified="2024-07-23 11:51:12" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4085,9 +4555,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" xmi:type="uml:Class" name="epo-ful:Consignment" scope="public">
-				<model package="EAPK_8F63D40D_7F22_4ec4_8775_4576642A2A08" tpos="0" ea_localid="2566" ea_eleType="element"/>
-				<properties documentation="A batch of goods destined for or delivered to someone.&#xA;&#xA;Additional information:&#xA;Consignment it is a Transport Agreement. They do not care about the content of what is being shipped. (only if there are dangerous goods, and temperature requirements). How to move from place a to place B." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-01-18 16:25:54" modified="2024-03-18 13:01:11" complexity="1" status="Proposed"/>
+				<model package="EAPK_CA125651_CFD9_48ea_99C3_25D0C029AD03" tpos="0" ea_localid="2566" ea_eleType="element"/>
+				<properties documentation="A batch of goods destined for or delivered to someone.&#xA;&#xA;Additional information:&#xA;Consignment is a Transport Agreement between the Despatcher and the Consignee as to who and how the goods are despatched and received.&#xA;&#xA;WG approval 14/05/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-01-18 16:25:54" modified="2024-07-23 11:51:12" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4096,7 +4566,7 @@
 				<attributes>
 					<attribute xmi:idref="EAID_0C96E1C5_7220_4034_BC9A_6674B6211C12" name="epo-ful:hasVehicleDescription" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="&#xA;"/>
 						<model ea_localid="2234" ea_guid="{0C96E1C5-7220-4034-BC9A-6674B6211C12}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -4105,13 +4575,13 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
 					<attribute xmi:idref="EAID_A465985F_DAD6_48b6_8755_A371B92EC409" name="epo-ful:isHazardousRisk" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="Indicates whether some of the contained Goods Items are hazardous.&#xA;&#xA;WG approval 21/05/2024"/>
 						<model ea_localid="2251" ea_guid="{A465985F-DAD6-48b6-8755-A371B92EC409}"/>
 						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -4120,13 +4590,13 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
 					<attribute xmi:idref="EAID_59AE7F91_C586_414f_89AF_5C1F2A092CFA" name="epo-ful:hasHandlingInstruction" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="Instruction on how to handle the Goods Items during transportation.&#xA;&#xA;WG approval 05/06/2024"/>
 						<model ea_localid="2254" ea_guid="{59AE7F91-C586-414f-89AF-5C1F2A092CFA}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -4135,13 +4605,13 @@
 						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
 					<attribute xmi:idref="EAID_9172E21F_7B8B_47fb_9485_A176EEF63EAF" name="epo-ful:hasCarrierServiceInstruction" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="This attribute should be removed in the next major release."/>
 						<model ea_localid="2255" ea_guid="{9172E21F-7B8B-47fb-9485-A176EEF63EAF}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -4150,13 +4620,13 @@
 						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
 					<attribute xmi:idref="EAID_C2B6DE07_3B4E_485f_8845_AD1578623CFD" name="epo-ful:hasSpecialInstruction" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="This attribute should be removed in the next major release."/>
 						<model ea_localid="2256" ea_guid="{C2B6DE07-3B4E-485f-8845-AD1578623CFD}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -4165,13 +4635,13 @@
 						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
 					<attribute xmi:idref="EAID_D6CAB38F_B906_4f3f_A512_1FC6AB793A4F" name="epo-ful:hasDeliveryInstruction" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="This attribute should be removed in the next major release."/>
 						<model ea_localid="2257" ea_guid="{D6CAB38F-B906-4f3f-A512-1FC6AB793A4F}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -4180,13 +4650,13 @@
 						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
 					<attribute xmi:idref="EAID_402D77CE_15E9_4ddd_AE49_1C64B0078574" name="epo-ful:hasSpecialServiceInstruction" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="Description about special services needed for loading or unloading the Goods Items.&#xA;&#xA;WG approval 21/05/2024 "/>
 						<model ea_localid="2324" ea_guid="{402D77CE-15E9-4ddd-AE49-1C64B0078574}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -4195,7 +4665,7 @@
 						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -4206,6 +4676,7 @@
 					<Association xmi:id="EAID_1D18BED8_E786_4a53_A9AC_93AD55744288" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6"/>
 					<Association xmi:id="EAID_22815C4E_A421_45ce_B940_8E07DDB6E493" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6"/>
 					<Association xmi:id="EAID_2E9FE66A_E025_4563_9A59_461990838D96" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_36284C1D_C098_4082_BE39_99AFCAAF2C1F" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
 					<Association xmi:id="EAID_3C454BB2_FC26_49ad_948C_F84C001C68E4" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184"/>
 					<Association xmi:id="EAID_3D54F6F9_658D_40fe_9D16_D79F46DB945C" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
 					<Association xmi:id="EAID_45480564_D6B2_41da_8694_DC63D52825C1" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
@@ -4213,6 +4684,8 @@
 					<Association xmi:id="EAID_5009F883_10B2_4e9c_96A3_A1F92BE8EA63" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
 					<Association xmi:id="EAID_569C582B_2F50_4a11_B7B6_50CA2F0A9B94" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
 					<Association xmi:id="EAID_5C5BD66A_585D_4646_9A7B_894EA99DED44" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_6DA6B6C9_7964_4102_A413_050778056B72" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831"/>
+					<Association xmi:id="EAID_73E249AD_BE82_405c_AC1C_956CD538804F" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
 					<Association xmi:id="EAID_75378C4F_ABAD_440f_8E1B_502A7CDA0486" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
 					<Association xmi:id="EAID_783AAD71_420E_40ee_B221_B2A54F890D2D" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6"/>
 					<Dependency xmi:id="EAID_7D11F407_8C9D_4214_8774_289769C50390" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_894938CF_E95C_498c_9C4C_0FD3115E2A2A"/>
@@ -4220,17 +4693,34 @@
 					<Association xmi:id="EAID_8C56C81B_B46D_49ef_B3BF_333FDA416F39" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
 					<Association xmi:id="EAID_9F290187_06CC_4af8_83C9_F475091E0C14" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
 					<Association xmi:id="EAID_A0665A13_AEF0_4cf6_ACC2_F2FE3A90C76A" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE"/>
+					<Association xmi:id="EAID_A287E36F_7CEB_4668_B1A5_01DDEE025D3A" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_C466B869_99C4_4539_8CD9_ECD02C462F1D" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_0D5BCA5B_42CB_4202_9453_012E0A141952"/>
 					<Association xmi:id="EAID_F3CD32F8_8180_4939_A987_53BA66264912" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
 					<Association xmi:id="EAID_F93A2AAD_C014_4fa4_88EE_23DE2339DB3C" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
 					<Association xmi:id="EAID_F9F5CFA7_D31A_4c48_80EF_346FB3152195" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
 					<Association xmi:id="EAID_FBFFE3B6_925B_4b80_A519_F160F8927173" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
+					<NoteLink xmi:id="EAID_7162EBB6_46B3_40ef_B911_26A9D3F39745" start="EAID_D8A8B96C_BD80_4776_8875_507427F96AF2" end="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
 					<Association xmi:id="EAID_D6B12A9D_029A_4c46_9583_5FF42CA3E096" start="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" end="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
 				</links>
 			</element>
+			<element xmi:idref="EAID_0D5BCA5B_42CB_4202_9453_012E0A141952" xmi:type="uml:Class" name="epo-ful:NotificationReceiver" scope="public">
+				<model package="EAPK_CA125651_CFD9_48ea_99C3_25D0C029AD03" tpos="0" ea_localid="3577" ea_eleType="element"/>
+				<properties documentation="The Role of an Agent that is informed about the arrival of a Shipment at a destination.&#xA;&#xA;Additional information:&#xA;This could be for example customs and excise.&#xA;&#xA;WG approval 21/05/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-05-21 15:58:18" modified="2024-07-23 11:51:12" complexity="1" status="Proposed"/>
+				<code product_name="Java" gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<links>
+					<Generalization xmi:id="EAID_0E005307_D7E7_4c2a_B693_817916BDFA4B" start="EAID_0D5BCA5B_42CB_4202_9453_012E0A141952" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
+					<Association xmi:id="EAID_C466B869_99C4_4539_8CD9_ECD02C462F1D" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_0D5BCA5B_42CB_4202_9453_012E0A141952"/>
+				</links>
+			</element>
 			<element xmi:idref="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" xmi:type="uml:Class" name="epo-ful:DespatchLine" scope="public">
-				<model package="EAPK_8F63D40D_7F22_4ec4_8775_4576642A2A08" tpos="0" ea_localid="2117" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-11-01 14:34:41" modified="2024-03-18 13:01:11" complexity="1" status="Proposed"/>
+				<model package="EAPK_CA125651_CFD9_48ea_99C3_25D0C029AD03" tpos="0" ea_localid="2117" ea_eleType="element"/>
+				<properties documentation="Details concerning the fulfilment of an Order Line.&#xA;&#xA;WG approval 21/05/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-11-01 14:34:41" modified="2024-07-23 11:51:12" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4239,7 +4729,7 @@
 				<attributes>
 					<attribute xmi:idref="EAID_B772CC17_2873_4964_9C08_D45EC3DCC68F" name="epo-ful:hasOutstandingQuantityReason" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="Explanation of the outstanding quantity still to be despatched.&#xA;&#xA;WG approval 05/06/2024"/>
 						<model ea_localid="2126" ea_guid="{B772CC17-2873-4964-9C08-D45EC3DCC68F}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -4248,7 +4738,7 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -4267,9 +4757,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE" xmi:type="uml:Class" name="epo-ful:TransportHandlingUnit" scope="public">
-				<model package="EAPK_8F63D40D_7F22_4ec4_8775_4576642A2A08" tpos="0" ea_localid="2025" ea_eleType="element"/>
-				<properties documentation="A description of Individual Handling Units in which the Line Items are packed." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-08-11 13:14:08" modified="2024-03-18 13:01:11" complexity="1" status="Proposed"/>
+				<model package="EAPK_CA125651_CFD9_48ea_99C3_25D0C029AD03" tpos="0" ea_localid="2025" ea_eleType="element"/>
+				<properties documentation="The outermost Package that the Carrier is handling.&#xA;&#xA;WG approval 14/05/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-08-11 13:14:08" modified="2024-07-23 11:51:12" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4278,7 +4768,7 @@
 				<attributes>
 					<attribute xmi:idref="EAID_9415F538_3385_43d5_ACA4_5CECFE7F5116" name="epo-ful:hasShippingMark" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="A text that the buyer requests to be printed on the packing labels.&#xA;&#xA;WG approval 05/06/2024"/>
 						<model ea_localid="2128" ea_guid="{9415F538-3385-43d5-ACA4-5CECFE7F5116}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -4287,13 +4777,13 @@
 						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
 					<attribute xmi:idref="EAID_45AF7447_212B_4746_92CC_AC97100E9D83" name="epo-ful:hasHandlingInstruction" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="Instruction on how to handle the Goods Items during transportation.&#xA;&#xA;WG approval 05/06/2024&#xA;"/>
 						<model ea_localid="2344" ea_guid="{45AF7447-212B-4746-92CC-AC97100E9D83}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -4302,7 +4792,7 @@
 						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -4312,14 +4802,15 @@
 					<Generalization xmi:id="EAID_2AB47C99_7B9A_495c_838D_198E22FE4C02" start="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE" end="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B"/>
 					<Association xmi:id="EAID_A3907E97_8458_42ef_B2AC_3DB623B8AA78" start="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE" end="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA"/>
 					<Association xmi:id="EAID_EA77B614_F9B2_464f_9F87_43543F10AEA4" start="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE" end="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC"/>
+					<NoteLink xmi:id="EAID_54B7C02C_C045_45c7_B877_9B2219A80C72" start="EAID_AFF2FF49_6801_472a_B12C_681ECC691BB8" end="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE"/>
 					<Association xmi:id="EAID_9D8A2FCD_752D_45a9_9023_77697592FF3C" start="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" end="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE"/>
 					<Association xmi:id="EAID_A0665A13_AEF0_4cf6_ACC2_F2FE3A90C76A" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" xmi:type="uml:Class" name="epo-ful:ShipmentInformation" scope="public">
-				<model package="EAPK_8F63D40D_7F22_4ec4_8775_4576642A2A08" tpos="0" ea_localid="2023" ea_eleType="element"/>
-				<properties documentation="The Transportation of an identifiable collection of Goods Items from one party (the Despatch Party) to another party (the Consignee) via one or more modes of transport.&#xA;&#xA;Addition Information&#xA;This represents the &quot;where&quot; and &quot;when&quot;." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-08-11 13:13:06" modified="2024-03-18 13:01:11" complexity="1" status="Proposed"/>
+				<model package="EAPK_CA125651_CFD9_48ea_99C3_25D0C029AD03" tpos="0" ea_localid="2023" ea_eleType="element"/>
+				<properties documentation="Information about the transportation of an identifiable collection of Goods Items from the Despatcher to the Consignee.&#xA;&#xA;WG approval 21/05/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-08-11 13:13:06" modified="2024-07-23 11:51:12" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4328,7 +4819,7 @@
 				<attributes>
 					<attribute xmi:idref="EAID_2BA699ED_5F72_4730_9D8B_AE6943FFEA19" name="epo-ful:despatchDate" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="The date of sending of goods or the execution of works or services.&#xA;&#xA;WG approval 05/06/2024"/>
 						<model ea_localid="2125" ea_guid="{2BA699ED-5F72-4730-9D8B-AE6943FFEA19}"/>
 						<properties type="xsd:dateTime" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -4337,7 +4828,7 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -4359,6 +4850,7 @@
 				</attributes>
 				<links>
 					<Association xmi:id="EAID_11C78626_167C_4c06_AF8A_1D37420731A9" start="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+					<Association xmi:id="EAID_3A930003_5665_43a6_9887_A78953BBB2E2" start="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
 					<Generalization xmi:id="EAID_74FDD051_8991_4328_BB5F_DB2625DE81D1" start="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" end="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
 					<Association xmi:id="EAID_B9BA1AAD_DA48_4953_9445_B3D0C269B4E6" start="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" end="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A"/>
 					<Association xmi:id="EAID_C7C433B7_9297_4921_9069_80DF68AD408A" start="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
@@ -4372,9 +4864,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3" xmi:type="uml:Class" name="epo-ful:Despatcher" scope="public">
-				<model package="EAPK_8F63D40D_7F22_4ec4_8775_4576642A2A08" tpos="0" ea_localid="2017" ea_eleType="element"/>
-				<properties documentation="Role of an Agent who sends the goods or notifies of the service or works execution. &#xA;&#xA;Additional Information:&#xA;The Role is carried out by the Supplier or on behalf of the Supplier. &#xA;Despatcher is also known as Despatch Party, Consignor, Deliverer. " isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-08-11 12:58:54" modified="2024-03-18 13:01:11" complexity="1" status="Proposed"/>
+				<model package="EAPK_CA125651_CFD9_48ea_99C3_25D0C029AD03" tpos="0" ea_localid="2017" ea_eleType="element"/>
+				<properties documentation="The Role of an Agent who sends the goods or notifies of the service or works execution. &#xA;&#xA;Additional Information:&#xA;The Role is carried out by the Supplier or on behalf of the Supplier. &#xA;This Role is often referred to as the Despatch Party, Consignor or Deliverer. &#xA;&#xA;WG approval 02/07/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-08-11 12:58:54" modified="2024-07-23 11:51:12" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4389,9 +4881,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" xmi:type="uml:Class" name="epo-ful:DespatchAdvice" scope="public">
-				<model package="EAPK_8F63D40D_7F22_4ec4_8775_4576642A2A08" tpos="0" ea_localid="2116" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-11-01 14:18:28" modified="2024-03-18 13:01:11" complexity="1" status="Proposed"/>
+				<model package="EAPK_CA125651_CFD9_48ea_99C3_25D0C029AD03" tpos="0" ea_localid="2116" ea_eleType="element"/>
+				<properties documentation="A document notifying the sending of goods or the execution of works or services.&#xA;&#xA;WG approval 14/05/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-11-01 14:18:28" modified="2024-07-23 11:51:12" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4411,12 +4903,13 @@
 					<Generalization xmi:id="EAID_D8E29289_C54A_4d5e_987B_AEF828189A10" start="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" end="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
 					<Association xmi:id="EAID_E91C243F_824F_48fd_8601_BEA52AB5E730" start="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" end="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3"/>
 					<Association xmi:id="EAID_B2AD75A2_6A44_447c_856D_A5FD0F996EF5" start="EAID_CF553CC8_8DC9_4ea2_B386_8ACB39A17657" end="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
+					<Association xmi:id="EAID_FEAC08B7_4534_4c6e_98AB_31083434E530" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_78459D23_BCB4_42bb_83F6_F9D8F550B19D" xmi:type="uml:Class" name="epo-ful:Carrier" scope="public">
-				<model package="EAPK_8F63D40D_7F22_4ec4_8775_4576642A2A08" tpos="0" ea_localid="2007" ea_eleType="element"/>
-				<properties documentation="The Role of an Agent who handles the physical Delivery/Transportation of the (Despatched) Shipment. &#xA;&#xA;Additional Information:&#xA;This Role is also known as Deliverer.&#xA;&#xA;WG approval: 11/10/2022" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-08-10 15:33:11" modified="2024-03-18 13:01:11" complexity="1" status="Proposed"/>
+				<model package="EAPK_CA125651_CFD9_48ea_99C3_25D0C029AD03" tpos="0" ea_localid="2007" ea_eleType="element"/>
+				<properties documentation="The Role of an Agent who handles the physical Delivery/Transportation of the (Despatched) Shipment. &#xA;&#xA;Additional Information:&#xA;This Role is often referred to as the deliverer.&#xA;&#xA;WG approval 14/05/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-08-10 15:33:11" modified="2024-07-23 11:51:12" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4427,10 +4920,10 @@
 					<Association xmi:id="EAID_F48C13D8_6CDE_4da6_A4A1_7512C3E0591E" start="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6" end="EAID_78459D23_BCB4_42bb_83F6_F9D8F550B19D"/>
 				</links>
 			</element>
-			<element xmi:idref="EAPK_B5BD11CB_9809_407e_B123_6EE35FBFE87D" xmi:type="uml:Package" name="controlled vocabularies" scope="public">
-				<model package2="EAID_B5BD11CB_9809_407e_B123_6EE35FBFE87D" package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" tpos="3" ea_localid="249" ea_eleType="package"/>
+			<element xmi:idref="EAPK_9CE0A2ED_E903_4870_AD9E_E55443EB3C37" xmi:type="uml:Package" name="controlled vocabularies" scope="public">
+				<model package2="EAID_9CE0A2ED_E903_4870_AD9E_E55443EB3C37" package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" tpos="3" ea_localid="259" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 13:01:20" modified="2024-03-18 13:01:20" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:51:18" modified="2024-07-23 11:51:18" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4438,13 +4931,13 @@
 				<extendedProperties tagged="0" package_name="despatch advice"/>
 				<packageproperties version="1.0" tpos="3"/>
 				<paths/>
-				<times created="2024-03-18 13:01:20" modified="2024-03-18 13:01:20"/>
+				<times created="2024-07-23 11:51:18" modified="2024-07-23 11:51:18"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAID_D72442ED_835D_455e_970E_3D4CAF26A2F5" xmi:type="uml:Enumeration" name="at-voc-new:allowance-charge-reason" scope="public">
-				<model package="EAPK_B5BD11CB_9809_407e_B123_6EE35FBFE87D" tpos="0" ea_localid="2772" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-03-02 16:12:47" modified="2024-03-18 13:01:29" complexity="1" status="Proposed"/>
+				<model package="EAPK_9CE0A2ED_E903_4870_AD9E_E55443EB3C37" tpos="0" ea_localid="2772" ea_eleType="element"/>
+				<properties documentation="https://docs.peppol.eu/poacc/billing/3.0/codelist/UNCL5189/&#xA;&#xA;https://docs.peppol.eu/poacc/billing/3.0/codelist/UNCL7161/&#xA;" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-03-02 16:12:47" modified="2024-07-23 11:51:28" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4455,9 +4948,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_0648E479_6FDB_4549_8A77_989FA3BA7568" xmi:type="uml:Enumeration" name="at-voc-new:despatch-advice-type" scope="public">
-				<model package="EAPK_B5BD11CB_9809_407e_B123_6EE35FBFE87D" tpos="0" ea_localid="2789" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-03-14 16:10:24" modified="2024-03-18 13:01:29" complexity="1" status="Proposed"/>
+				<model package="EAPK_9CE0A2ED_E903_4870_AD9E_E55443EB3C37" tpos="0" ea_localid="2789" ea_eleType="element"/>
+				<properties documentation="https://test-docs.peppol.eu/logistics/transport-execution/codelist/DespatchAdviceTypeCode/" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-03-14 16:10:24" modified="2024-07-23 11:51:28" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4468,9 +4961,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_274424DF_415D_400f_99C0_FDA108C74C7A" xmi:type="uml:Enumeration" name="at-voc-new:document-status" scope="public">
-				<model package="EAPK_B5BD11CB_9809_407e_B123_6EE35FBFE87D" tpos="0" ea_localid="2788" ea_eleType="element"/>
+				<model package="EAPK_9CE0A2ED_E903_4870_AD9E_E55443EB3C37" tpos="0" ea_localid="2788" ea_eleType="element"/>
 				<properties documentation="https://test-docs.peppol.eu/logistics/transport-execution/codelist/DocumentStatusCode/&#xA;" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-03-14 16:04:43" modified="2024-03-18 13:01:29" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-03-14 16:04:43" modified="2024-07-23 11:51:28" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4481,9 +4974,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_894938CF_E95C_498c_9C4C_0FD3115E2A2A" xmi:type="uml:Enumeration" name="at-voc-new:handling-instruction" scope="public">
-				<model package="EAPK_B5BD11CB_9809_407e_B123_6EE35FBFE87D" tpos="0" ea_localid="2819" ea_eleType="element"/>
+				<model package="EAPK_9CE0A2ED_E903_4870_AD9E_E55443EB3C37" tpos="0" ea_localid="2819" ea_eleType="element"/>
 				<properties documentation="https://unece.org/fileadmin/DAM/trade/untdid/d17a/tred/tred4079.htm" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-03-24 16:09:31" modified="2024-03-18 13:01:29" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-03-24 16:09:31" modified="2024-07-23 11:51:28" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4495,9 +4988,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_BA97F7F9_0B9C_4d96_8E10_3AC087F5FF2A" xmi:type="uml:Enumeration" name="at-voc-new:packaging-type" scope="public">
-				<model package="EAPK_B5BD11CB_9809_407e_B123_6EE35FBFE87D" tpos="0" ea_localid="2121" ea_eleType="element"/>
-				<properties documentation="UNECERec21&#xA;http://bis.beast.se/codelist/UNECERec21/" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-11-01 15:45:34" modified="2024-03-18 13:01:29" complexity="1" status="Proposed"/>
+				<model package="EAPK_9CE0A2ED_E903_4870_AD9E_E55443EB3C37" tpos="0" ea_localid="2121" ea_eleType="element"/>
+				<properties documentation="UNECERec21&#xA;&#xA;http://bis.beast.se/codelist/UNECERec21/" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-11-01 15:45:34" modified="2024-07-23 11:51:28" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4508,9 +5001,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_4CD4C360_C8F1_4565_9570_087A142343D6" xmi:type="uml:Enumeration" name="at-voc-new:size-type" scope="public">
-				<model package="EAPK_B5BD11CB_9809_407e_B123_6EE35FBFE87D" tpos="0" ea_localid="2613" ea_eleType="element"/>
+				<model package="EAPK_9CE0A2ED_E903_4870_AD9E_E55443EB3C37" tpos="0" ea_localid="2613" ea_eleType="element"/>
 				<properties documentation="TRED8155&#xA;&#xA;http://bis.beast.se/codelist/TRED8155/" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-02-08 12:29:07" modified="2024-03-18 13:01:29" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-02-08 12:29:07" modified="2024-07-23 11:51:28" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4521,9 +5014,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_9DC1B8F7_FF27_4120_A538_C3E64CC643BA" xmi:type="uml:Enumeration" name="at-voc-new:transport-equipment-type" scope="public">
-				<model package="EAPK_B5BD11CB_9809_407e_B123_6EE35FBFE87D" tpos="0" ea_localid="2612" ea_eleType="element"/>
+				<model package="EAPK_9CE0A2ED_E903_4870_AD9E_E55443EB3C37" tpos="0" ea_localid="2612" ea_eleType="element"/>
 				<properties documentation="UNCL8053&#xA;&#xA;http://bis.beast.se/codelist/UNCL8053/" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-02-08 12:27:48" modified="2024-03-18 13:01:29" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-02-08 12:27:48" modified="2024-07-23 11:51:28" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4534,9 +5027,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_54C25D5B_33E1_4ec5_BCDB_3E876216F668" xmi:type="uml:Enumeration" name="at-voc-new:transport-means-type" scope="public">
-				<model package="EAPK_B5BD11CB_9809_407e_B123_6EE35FBFE87D" tpos="0" ea_localid="2820" ea_eleType="element"/>
+				<model package="EAPK_9CE0A2ED_E903_4870_AD9E_E55443EB3C37" tpos="0" ea_localid="2820" ea_eleType="element"/>
 				<properties documentation="https://test-docs.peppol.eu/logistics/transport-execution/codelist/UNECERec28/" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-03-24 16:40:39" modified="2024-03-18 13:01:29" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-03-24 16:40:39" modified="2024-07-23 11:51:28" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4547,9 +5040,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_41E9A77E_E3B5_48df_BE17_4B4411613470" xmi:type="uml:Enumeration" name="at-voc-new:transport-mode" scope="public">
-				<model package="EAPK_B5BD11CB_9809_407e_B123_6EE35FBFE87D" tpos="0" ea_localid="2619" ea_eleType="element"/>
+				<model package="EAPK_9CE0A2ED_E903_4870_AD9E_E55443EB3C37" tpos="0" ea_localid="2619" ea_eleType="element"/>
 				<properties documentation="https://test-docs.peppol.eu/poacc/upgrade-3/codelist/UNECERec19/" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-02-08 15:20:15" modified="2024-03-18 13:01:29" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-02-08 15:20:15" modified="2024-07-23 11:51:28" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4573,10 +5066,10 @@
 				<times created="2023-09-27 15:57:40" modified="2023-09-27 15:57:40"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
 			</element>
-			<element xmi:idref="EAPK_BA11696D_6ACD_40f7_958C_DB383E6E89FD" xmi:type="uml:Package" name="diagrams" scope="public">
-				<model package2="EAID_BA11696D_6ACD_40f7_958C_DB383E6E89FD" package="EAPK_4CC2B37F_7BB3_4a6e_9CF7_3F2F4EF6E5FA" tpos="1" ea_localid="250" ea_eleType="package"/>
+			<element xmi:idref="EAPK_007403A6_1B13_47c8_AAFD_D00C4DF6FA72" xmi:type="uml:Package" name="diagrams" scope="public">
+				<model package2="EAID_007403A6_1B13_47c8_AAFD_D00C4DF6FA72" package="EAPK_4CC2B37F_7BB3_4a6e_9CF7_3F2F4EF6E5FA" tpos="1" ea_localid="260" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 13:01:38" modified="2024-03-18 13:01:38" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:51:35" modified="2024-07-23 11:51:35" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4584,13 +5077,13 @@
 				<extendedProperties tagged="0" package_name="receipt advice"/>
 				<packageproperties version="1.0" tpos="1"/>
 				<paths/>
-				<times created="2024-03-18 13:01:38" modified="2024-03-18 13:01:38"/>
+				<times created="2024-07-23 11:51:35" modified="2024-07-23 11:51:35"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
-			<element xmi:idref="EAPK_A1BBED76_06B1_4690_961D_320A15D96F63" xmi:type="uml:Package" name="classes" scope="public">
-				<model package2="EAID_A1BBED76_06B1_4690_961D_320A15D96F63" package="EAPK_4CC2B37F_7BB3_4a6e_9CF7_3F2F4EF6E5FA" tpos="2" ea_localid="251" ea_eleType="package"/>
+			<element xmi:idref="EAPK_605F74FE_ACF9_4bc7_86DB_AB0A95C75961" xmi:type="uml:Package" name="classes" scope="public">
+				<model package2="EAID_605F74FE_ACF9_4bc7_86DB_AB0A95C75961" package="EAPK_4CC2B37F_7BB3_4a6e_9CF7_3F2F4EF6E5FA" tpos="2" ea_localid="261" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 13:01:44" modified="2024-03-18 13:01:44" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:51:42" modified="2024-07-23 11:51:42" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4598,13 +5091,13 @@
 				<extendedProperties tagged="0" package_name="receipt advice"/>
 				<packageproperties version="1.0" tpos="2"/>
 				<paths/>
-				<times created="2024-03-18 13:01:44" modified="2024-03-18 13:01:44"/>
+				<times created="2024-07-23 11:51:42" modified="2024-07-23 11:51:42"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAID_CF553CC8_8DC9_4ea2_B386_8ACB39A17657" xmi:type="uml:Class" name="epo-ful:ReceiptAdvice" scope="public">
-				<model package="EAPK_A1BBED76_06B1_4690_961D_320A15D96F63" tpos="0" ea_localid="3235" ea_eleType="element"/>
+				<model package="EAPK_605F74FE_ACF9_4bc7_86DB_AB0A95C75961" tpos="0" ea_localid="3235" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-09-27 15:58:49" modified="2024-03-18 13:01:49" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-09-27 15:58:49" modified="2024-07-23 11:51:48" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4620,12 +5113,13 @@
 					<Association xmi:id="EAID_CE5725F2_3A5A_41f0_A09F_125FFFF898A6" start="EAID_CF553CC8_8DC9_4ea2_B386_8ACB39A17657" end="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695"/>
 					<Association xmi:id="EAID_E0360D2E_DB37_4dbc_9B8A_CD6511F7E73A" start="EAID_CF553CC8_8DC9_4ea2_B386_8ACB39A17657" end="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
 					<Association xmi:id="EAID_E28552C5_C8B1_4583_9A9A_73A31F1E9982" start="EAID_CF553CC8_8DC9_4ea2_B386_8ACB39A17657" end="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73"/>
+					<Association xmi:id="EAID_FF0A4C18_97A9_450b_83FC_E7F2ADB8020E" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_CF553CC8_8DC9_4ea2_B386_8ACB39A17657"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73" xmi:type="uml:Class" name="epo-ful:ReceiptAdviceLine" scope="public">
-				<model package="EAPK_A1BBED76_06B1_4690_961D_320A15D96F63" tpos="0" ea_localid="3236" ea_eleType="element"/>
+				<model package="EAPK_605F74FE_ACF9_4bc7_86DB_AB0A95C75961" tpos="0" ea_localid="3236" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-09-27 15:59:01" modified="2024-03-18 13:01:49" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-09-27 15:59:01" modified="2024-07-23 11:51:48" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4644,10 +5138,10 @@
 					<Association xmi:id="EAID_E28552C5_C8B1_4583_9A9A_73A31F1E9982" start="EAID_CF553CC8_8DC9_4ea2_B386_8ACB39A17657" end="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73"/>
 				</links>
 			</element>
-			<element xmi:idref="EAPK_15F663CB_FEA6_49cb_90DC_5A04712F5F32" xmi:type="uml:Package" name="controlled vocabularies" scope="public">
-				<model package2="EAID_15F663CB_FEA6_49cb_90DC_5A04712F5F32" package="EAPK_4CC2B37F_7BB3_4a6e_9CF7_3F2F4EF6E5FA" tpos="3" ea_localid="252" ea_eleType="package"/>
+			<element xmi:idref="EAPK_E2C5F09D_C937_4f28_A34B_C5437AC869AD" xmi:type="uml:Package" name="controlled vocabularies" scope="public">
+				<model package2="EAID_E2C5F09D_C937_4f28_A34B_C5437AC869AD" package="EAPK_4CC2B37F_7BB3_4a6e_9CF7_3F2F4EF6E5FA" tpos="3" ea_localid="262" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 13:02:03" modified="2024-03-18 13:02:03" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:51:58" modified="2024-07-23 11:51:58" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4655,13 +5149,13 @@
 				<extendedProperties tagged="0" package_name="receipt advice"/>
 				<packageproperties version="1.0" tpos="3"/>
 				<paths/>
-				<times created="2024-03-18 13:02:03" modified="2024-03-18 13:02:03"/>
+				<times created="2024-07-23 11:51:58" modified="2024-07-23 11:51:58"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAID_EF1CEC2C_54A8_43cb_A898_39D1F9E0D575" xmi:type="uml:Enumeration" name="at-voc-new:action-code" scope="public">
-				<model package="EAPK_15F663CB_FEA6_49cb_90DC_5A04712F5F32" tpos="0" ea_localid="3237" ea_eleType="element"/>
+				<model package="EAPK_E2C5F09D_C937_4f28_A34B_C5437AC869AD" tpos="0" ea_localid="3237" ea_eleType="element"/>
 				<properties documentation="used for both shortage action code and reject action code&#xA;&#xA;https://test-docs.peppol.eu/logistics/qa/codelist/ReceiptAdviceActionCode/&#xA;&#xA;1. Replace missing/rejected parts.&#xA;2. Send Credit note and cancel order.&#xA;" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-09-27 16:00:01" modified="2024-03-18 13:02:12" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-09-27 16:00:01" modified="2024-07-23 11:52:04" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4673,9 +5167,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_E6D31017_87B9_4702_A97A_1C9D6F300741" xmi:type="uml:Enumeration" name="at-voc-new:reject-reason" scope="public">
-				<model package="EAPK_15F663CB_FEA6_49cb_90DC_5A04712F5F32" tpos="0" ea_localid="3238" ea_eleType="element"/>
+				<model package="EAPK_E2C5F09D_C937_4f28_A34B_C5437AC869AD" tpos="0" ea_localid="3238" ea_eleType="element"/>
 				<properties documentation="https://test-docs.peppol.eu/logistics/qa/codelist/RejectReasonCode/&#xA;" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-09-27 16:01:42" modified="2024-03-18 13:02:12" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-09-27 16:01:42" modified="2024-07-23 11:52:04" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4747,33 +5241,135 @@
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="datatype"/>
-			</element>
-			<element xmi:idref="EAID_6D1F1659_DB2F_47f8_A7C2_338BF9811D00" xmi:type="uml:DataType" name="xsd:decimal" scope="public">
-				<model package="EAPK_8A83B550_1EDC_4bf1_BAAD_2C75D3B1878E" tpos="0" ea_localid="3033" ea_eleType="element"/>
-				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:25:42" modified="2022-04-29 20:25:57" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
-				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+			<element xmi:idref="EAID_6D1F1659_DB2F_47f8_A7C2_338BF9811D00" xmi:type="uml:DataType" name="xsd:decimal" scope="public">
+				<model package="EAPK_8A83B550_1EDC_4bf1_BAAD_2C75D3B1878E" tpos="0" ea_localid="3033" ea_eleType="element"/>
+				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:25:42" modified="2022-04-29 20:25:57" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+			<element xmi:idref="EAID_77E91846_47FC_4974_BAF2_947AC44EEA52" xmi:type="uml:DataType" name="xsd:integer" scope="public">
+				<model package="EAPK_8A83B550_1EDC_4bf1_BAAD_2C75D3B1878E" tpos="0" ea_localid="3032" ea_eleType="element"/>
+				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:25:33" modified="2022-04-29 20:25:38" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+		</elements>
+		<connectors>
+			<connector xmi:idref="EAID_357EE20B_991E_4359_99A9_85E159FD3FDA">
+				<source xmi:idref="EAID_27ECEEC8_871D_4826_8EA1_8E10F63A1500">
+					<model ea_localid="2895" type="Note"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA">
+					<model ea_localid="2570" type="Class" name="epo-ful:TransportEquipment"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4432"/>
+				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_A4C29886_C9D8_48eb_A107_DA46C0358E53">
+				<source xmi:idref="EAID_37B4C249_5774_4d78_8572_20C458910F29">
+					<model ea_localid="3628" type="Note"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184">
+					<model ea_localid="2568" type="Class" name="epo-ful:Notifier"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5420"/>
+				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
 				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_54B7C02C_C045_45c7_B877_9B2219A80C72">
+				<source xmi:idref="EAID_AFF2FF49_6801_472a_B12C_681ECC691BB8">
+					<model ea_localid="3613" type="Note"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE">
+					<model ea_localid="2025" type="Class" name="epo-ful:TransportHandlingUnit"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5379"/>
+				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="datatype"/>
-			</element>
-			<element xmi:idref="EAID_77E91846_47FC_4974_BAF2_947AC44EEA52" xmi:type="uml:DataType" name="xsd:integer" scope="public">
-				<model package="EAPK_8A83B550_1EDC_4bf1_BAAD_2C75D3B1878E" tpos="0" ea_localid="3032" ea_eleType="element"/>
-				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:25:33" modified="2022-04-29 20:25:38" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
-				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="datatype"/>
-			</element>
-		</elements>
-		<connectors>
-			<connector xmi:idref="EAID_357EE20B_991E_4359_99A9_85E159FD3FDA">
-				<source xmi:idref="EAID_27ECEEC8_871D_4826_8EA1_8E10F63A1500">
-					<model ea_localid="2895" type="Note"/>
+			</connector>
+			<connector xmi:idref="EAID_7162EBB6_46B3_40ef_B911_26A9D3F39745">
+				<source xmi:idref="EAID_D8A8B96C_BD80_4776_8875_507427F96AF2">
+					<model ea_localid="3612" type="Note"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -4783,8 +5379,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA">
-					<model ea_localid="2570" type="Class" name="epo-ful:TransportEquipment"/>
+				<target xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
+					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -4794,7 +5390,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4432"/>
+				<model ea_localid="5378"/>
 				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<documentation/>
@@ -4832,7 +5428,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The highest tolerated temperature.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasMaximumTemperature"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -4867,7 +5463,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The lowest tolerated temperature.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasMinimumTemperature"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -4902,7 +5498,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating the Temperature Specification for the instance of the concept.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasTemperatureSpecification"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -4937,7 +5533,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The total mass of goods including the packaging. &#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasGrossWeight"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -4972,7 +5568,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The total mass of goods without the packaging. &#xA;&#xA;WG approval 18/06/2024&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasNetWeight"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -5007,7 +5603,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The horizontal measurement.&#xA;&#xA;Additional Information:&#xA;The length is the longer side between the length and the width.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasLength"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -5042,7 +5638,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The amount of space that is required including the packaging.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasGrossVolume"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -5077,7 +5673,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The measurement of the depth.&#xA;&#xA;Additional Information:&#xA;The width is the shorter side between the length and the width.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasWidth"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -5112,7 +5708,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The vertical measurement.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasHeight"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -5147,7 +5743,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating the number of the Goods Items.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasTotalGoodsItemQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -5217,7 +5813,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The amount of space that is required without the packaging.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasNetVolume"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -5355,7 +5951,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating the operator of the Transport Means.&#xA;&#xA;WG approval 02/07/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="1..*" rt="+epo:hasDriverPerson"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -5390,7 +5986,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The identifier used for tracking the goods item&#xA;&#xA;Additional information:&#xA;An example is the EPC number used in RFID.&#xA;&#xA;WG approval 21/09/2023&#xA;"/>
+				<documentation value="The identifier used for tracking the Goods Item.&#xA;&#xA;Additional information:&#xA;An example is the EPC number used in RFID.&#xA;&#xA;WG approval 21/09/2023&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasTraceID"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -5460,7 +6056,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Reference to a Despatch Line.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="1" rt="+epo-ful:refersToDespatchLine"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -5483,7 +6079,7 @@
 				<target xmi:idref="EAID_C215EC75_82FD_45d3_832A_B3989A897692">
 					<model ea_localid="2615" type="Class" name="epo-ful:GoodsItem"/>
 					<role name="epo-ful:containsGoodsItem" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -5495,9 +6091,9 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Includes Goods Item.&#xA;&#xA;WG approval 10/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1..*" rt="+epo-ful:containsGoodsItem"/>
+				<labels rb="0..*" rt="+epo-ful:containsGoodsItem"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -5530,7 +6126,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Accepted by Seller.&#xA;&#xA;WG approval 10/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="1..*" rt="+epo-ful:agreedBySeller"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -5565,7 +6161,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Accepted by Buyer.&#xA;&#xA;WG approval 10/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="1..*" rt="+epo-ful:agreedByBuyer"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -5600,7 +6196,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Reference to a Shipment Agreement.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:refersToShipmentAgreement"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -5670,7 +6266,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating that the instance of the concept has a Transport Equipment Seal.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..*" rt="+epo-ful:hasTransportEquipmentSeal"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -5703,7 +6299,7 @@
 				</target>
 				<model ea_localid="4326"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation/>
+				<documentation value="The kind of Transport Means.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasTransportMeansType"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -5736,7 +6332,7 @@
 				</target>
 				<model ea_localid="4030"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation/>
+				<documentation value="The type of the transport used.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="1" rt="+epo-ful:hasTransportMode"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -5771,7 +6367,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The identifier of a part of the Transport Means.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasVehicleSegmentID"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -5806,7 +6402,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The identifier of the Transport Means.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="1" rt="+epo-ful:hasVehicleID"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -5841,7 +6437,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating that a Shipment Stage utilises a Transport Means.&#xA;&#xA;WG approval 02/07/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="1..*" rt="+epo-ful:usesTransportMeans"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -5876,7 +6472,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Shipment Information about the place the Consignment is leaving from in a given Shipment Stage.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..*" rt="+epo-ful:hasDepartureShipmentInformation"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -5946,7 +6542,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Shipment Information about the destination of the Consignment for a given Shipment Stage.&#xA;&#xA;WG approval 18/06/2024&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..*" rt="+epo:hasArrivalShipmentInformation"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -5981,7 +6577,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating that the instance of the concept involves the Carrier.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo:specifiesCarrier"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -6016,7 +6612,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Any Shipment Stage between the Despatcher and the departure point of the main carriage in a transport chain.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..*" rt="+epo-ful:hasPreCarriageShipmentStage"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -6051,7 +6647,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Any Shipment Stage between the main carriage arrival point and the ultimate receiver in a transport chain.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..*" rt="+epo-ful:hasOnCarriageShipmentStage"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -6086,7 +6682,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The Shipment Stage for the longest distance covered in a transport chain.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasMainCarriageShipmentStage"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -6119,7 +6715,7 @@
 				</target>
 				<model ea_localid="3433"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation/>
+				<documentation value="The kind of Package.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasPackagingType"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -6154,7 +6750,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Includes Package.&#xA;&#xA;WG approval 10/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..*" rt="+epo-ful:containsPackage"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -6256,7 +6852,7 @@
 				</target>
 				<model ea_localid="4013"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation/>
+				<documentation value="The kind of Transport Equipment.&#xA;&#xA;WG approval 25/06/2024&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..*" rt="+epo-ful:hasTransportEquipmentType"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -6324,7 +6920,7 @@
 				</target>
 				<model ea_localid="4014"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation/>
+				<documentation value="An extension classification specifying the measurement of the Transport Equipment.&#xA;&#xA;Additional Information:&#xA;This codelist should be used only in the case of a container.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..*" rt="+epo-ful:hasSizeType"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -6359,7 +6955,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating that a Transport Handling Unit utilises a Transport Equipment.&#xA;&#xA;WG approval 02/07/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..*" rt="+epo-ful:usesTransportEquipment"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -6497,7 +7093,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating that the instance of the concept involves the Freight Forwarder.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..*" rt="+epo:specifiesFreightForwarder"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -6602,7 +7198,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Declared amount of the Consignment.&#xA;&#xA;Additional Information:&#xA;&#xA;This is a logistics information needed for logistics, security measures, customs check, etc."/>
+				<documentation value="Declared amount of the Consignment.&#xA;&#xA;Additional Information:&#xA;This is a logistics information needed for logistics, security measures, customs check, etc.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasConsignmentInvoiceValue"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -6610,6 +7206,41 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_36284C1D_C098_4082_BE39_99AFCAAF2C1F">
+				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
+					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-ful:hasDespatcherConsignmentID" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5393"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The identifier of the the Consignment given by the Despatcher.&#xA;&#xA;WG approval 10/06/2024&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-ful:hasDespatcherConsignmentID"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_3D54F6F9_658D_40fe_9D16_D79F46DB945C">
 				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
 					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
@@ -6637,7 +7268,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The total mass of goods without the packaging. &#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasNetWeight"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -6672,7 +7303,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The "/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasChargeableWeight"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -6707,7 +7338,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The Monetary Value of the Consignment when there is a transfer of liability for goods, damaged or destroyed, during shipping.&#xA;&#xA;at the exporter's customs frontier."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasConsignmentFreeOnBoardValue"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -6777,7 +7408,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating the number of the Transport Handling Unit.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasTransportHandlingUnitQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -6785,6 +7416,76 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_6DA6B6C9_7964_4102_A413_050778056B72">
+				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
+					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831">
+					<model ea_localid="1960" type="Class" name="epo-cat:ChargeInformation"/>
+					<role name="epo-ful:hasFreightCharge" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5401"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The total cost for moving the goods.&#xA;&#xA;WG approval 18/06/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-ful:hasFreightCharge"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_73E249AD_BE82_405c_AC1C_956CD538804F">
+				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
+					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasLoadingMeter" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5402"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The area of the Consignment in meters divided by the width of the truck, which is considered to be 2.4 meters.&#xA;&#xA;WG approval 18/06/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-ful:hasLoadingMeter"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_75378C4F_ABAD_440f_8E1B_502A7CDA0486">
 				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
 					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
@@ -6812,7 +7513,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The length "/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasLoadingLength"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -6843,17 +7544,87 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4325"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation/>
+				<model ea_localid="4325"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="Instruction on how to handle the Goods Items during transportation, expressed as a code.&#xA;&#xA;WG approval 18/06/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-ful:hasHandlingInstructionCode"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_7DD90B0C_4D89_4d64_AC1D_F32A308572D4">
+				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
+					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-ful:hasFreightForwarderConsignmentID" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4034"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The identifier of the the Consignment given by the Freight Forwarder.&#xA;&#xA;WG approval 10/06/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-ful:hasFreightForwarderConsignmentID"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_8C56C81B_B46D_49ef_B3BF_333FDA416F39">
+				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
+					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasGrossVolume" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3421"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The amount of space that is required including the packaging.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasHandlingInstructionCode"/>
+				<labels rb="0..1" rt="+epo-ful:hasGrossVolume"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7DD90B0C_4D89_4d64_AC1D_F32A308572D4">
+			<connector xmi:idref="EAID_9F290187_06CC_4af8_83C9_F475091E0C14">
 				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
 					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
 					<role visibility="Public" targetScope="instance"/>
@@ -6867,7 +7638,7 @@
 				</source>
 				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
 					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo-ful:hasFreightForwarderConsignmentID" visibility="Public" targetScope="instance"/>
+					<role name="epo-ful:hasCarrierConsignmentID" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -6876,19 +7647,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4034"/>
+				<model ea_localid="4250"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The identifier of the the Consignment given by the Carrier.&#xA;&#xA;WG approval 10/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasFreightForwarderConsignmentID"/>
+				<labels rb="0..1" rt="+epo-ful:hasCarrierConsignmentID"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_8C56C81B_B46D_49ef_B3BF_333FDA416F39">
+			<connector xmi:idref="EAID_A0665A13_AEF0_4cf6_ACC2_F2FE3A90C76A">
 				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
 					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
 					<role visibility="Public" targetScope="instance"/>
@@ -6900,10 +7671,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-ful:hasGrossVolume" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE">
+					<model ea_localid="2025" type="Class" name="epo-ful:TransportHandlingUnit"/>
+					<role name="epo-ful:containsTransportHandlingUnit" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -6911,19 +7682,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3421"/>
+				<model ea_localid="3942"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Includes Transport Handling Unit.&#xA;&#xA;WG approval 10/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasGrossVolume"/>
+				<labels rb="1..*" rt="+epo-ful:containsTransportHandlingUnit"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9F290187_06CC_4af8_83C9_F475091E0C14">
+			<connector xmi:idref="EAID_A287E36F_7CEB_4668_B1A5_01DDEE025D3A">
 				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
 					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
 					<role visibility="Public" targetScope="instance"/>
@@ -6935,9 +7706,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo-ful:hasCarrierConsignmentID" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ful:hasDeclaredStatisticalValue" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -6946,19 +7717,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4250"/>
+				<model ea_localid="5394"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The Monetary Value declared for statistical purposes.&#xA;&#xA;WG approval 10/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasCarrierConsignmentID"/>
+				<labels rb="0..1" rt="+epo-ful:hasDeclaredStatisticalValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A0665A13_AEF0_4cf6_ACC2_F2FE3A90C76A">
+			<connector xmi:idref="EAID_C466B869_99C4_4539_8CD9_ECD02C462F1D">
 				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
 					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
 					<role visibility="Public" targetScope="instance"/>
@@ -6970,10 +7741,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE">
-					<model ea_localid="2025" type="Class" name="epo-ful:TransportHandlingUnit"/>
-					<role name="epo-ful:containsTransportHandlingUnit" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_0D5BCA5B_42CB_4202_9453_012E0A141952">
+					<model ea_localid="3577" type="Class" name="epo-ful:NotificationReceiver"/>
+					<role name="epo:specifiesNotificationReceiver" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -6981,13 +7752,13 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3942"/>
+				<model ea_localid="5320"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="c&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1..*" rt="+epo-ful:containsTransportHandlingUnit"/>
+				<labels rb="0..*" rt="+epo:specifiesNotificationReceiver"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -7020,7 +7791,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The identifier of the the Consignment given by the Consignee.&#xA;&#xA;WG approval 10/06/2024&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasConsigneeConsignmentID"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -7055,7 +7826,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating the number of the Goods Items.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasTotalGoodsItemQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -7090,7 +7861,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The total mass of goods including the packaging. &#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasGrossWeight"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -7125,7 +7896,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Information about the requested despatch of the Goods Items.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="1" rt="+epo-ful:hasRequestedPickUpInformation"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -7160,7 +7931,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Reference to a Consignment.&#xA;&#xA;WG approval 25/06/2024&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="1" rt="+epo-ful:refersToConsignment"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -7168,6 +7939,40 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_0E005307_D7E7_4c2a_B693_817916BDFA4B">
+				<source xmi:idref="EAID_0D5BCA5B_42CB_4202_9453_012E0A141952">
+					<model ea_localid="3577" type="Class" name="epo-ful:NotificationReceiver"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5">
+					<model ea_localid="2111" type="Class" name="epo:AuxiliaryParty"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5319"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_65E8EC44_CB4C_4aa9_8218_75D01ED44538">
 				<source xmi:idref="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC">
 					<model ea_localid="2117" type="Class" name="epo-ful:DespatchLine"/>
@@ -7195,7 +8000,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Quantity despatched for delivered."/>
+				<documentation value="The Quantity that has been sent.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="1" rt="+epo-ful:hasDespatchedQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -7230,7 +8035,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Is related to a Document.&#xA;&#xA;WG approval 06/10/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasAssociatedDocument"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -7265,7 +8070,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The Quantity of non-despatched Goods Items.&#xA;&#xA;WG approval 05/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasOutstandingQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -7322,7 +8127,7 @@
 				<target xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A">
 					<model ea_localid="2037" type="Class" name="epo-ord:OrderLine"/>
 					<role name="epo-ful:refersToOrderLine" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -7334,9 +8139,9 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Reference to an Order Line.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:refersToOrderLine"/>
+				<labels rb="1" rt="+epo-ful:refersToOrderLine"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -7369,7 +8174,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Incorporates Despatch Line.&#xA;&#xA;WG approval 10/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="1..*" rt="+epo-ful:comprisesDespatchLine"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -7474,7 +8279,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Information that is particular to a Despatch Line.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:isSpecificToDespatchLine"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -7507,7 +8312,7 @@
 				</target>
 				<model ea_localid="4431"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation/>
+				<documentation value="Instruction on how to handle the Goods Items during transportation, expressed as a code.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasHandlingInstructionCode"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -7542,7 +8347,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating the use of a Transport Handling Unit.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..*" rt="+epo-ful:specifiesTransportHandlingUnits"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -7577,7 +8382,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The forecasted time period given by the Despatcher to provide the goods and services.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasEstimatedDeliveryPeriod"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -7585,6 +8390,41 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_3A930003_5665_43a6_9887_A78953BBB2E2">
+				<source xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8">
+					<model ea_localid="2023" type="Class" name="epo-ful:ShipmentInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
+					<model ea_localid="915" type="Class" name="epo:Period"/>
+					<role name="epo-ful:hasDespatchPeriod" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5446"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The time period when the Despatcher picks-up the Goods Items to be delivered.&#xA;&#xA;WG approval 16/07/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-ful:hasDespatchPeriod"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_74FDD051_8991_4328_BB5F_DB2625DE81D1">
 				<source xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8">
 					<model ea_localid="2023" type="Class" name="epo-ful:ShipmentInformation"/>
@@ -7646,7 +8486,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Reference to a Delivery Information.&#xA;&#xA;WG approval 25/06/2024&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="1" rt="+epo-ful:refersToDeliveryInformation"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -7716,7 +8556,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating the Location of the Despatch of the Goods Items to be delivered.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:specifiesPlaceOfDespatch"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -7890,7 +8730,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating that the instance of the concept involves the Despatcher.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo:specifiesDespatcher"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -7959,7 +8799,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating that the instance of the concept involves the Despatcher.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="1..*" rt="+epo-ful:specifiesDespatcher"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -7994,7 +8834,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Reference to an Order.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:refersToOrder"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -8029,7 +8869,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Is related to a Document.&#xA;&#xA;WG approval 06/10/2024&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasAssociatedDocument"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -8062,7 +8902,7 @@
 				</target>
 				<model ea_localid="4272"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="https://test-docs.peppol.eu/logistics/transport-execution/codelist/DespatchAdviceTypeCode/&#xA;"/>
+				<documentation value="Classification of a Despatch Advice.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasDespatchAdviceType"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -8097,7 +8937,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating that the instance of the concept involves the Consignee.&#xA;&#xA;WG approval 25/06/2024&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="1..*" rt="+epo-ful:specifiesConsignee"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -8132,7 +8972,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating that the instance of the concept involves the Originator.&#xA;&#xA;WG approval 25/06/2024&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..*" rt="+epo-ful:specifiesOriginator"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -8209,6 +9049,41 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_FEAC08B7_4534_4c6e_98AB_31083434E530">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67">
+					<model ea_localid="2116" type="Class" name="epo-ful:DespatchAdvice"/>
+					<role name="epo-inv:refersToDespatchAdvice" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5334"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:refersToDespatchAdvice"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_70DB7081_2834_461e_8B11_0F74ABE52935">
 				<source xmi:idref="EAID_78459D23_BCB4_42bb_83F6_F9D8F550B19D">
 					<model ea_localid="2007" type="Class" name="epo-ful:Carrier"/>
@@ -8268,7 +9143,7 @@
 				</target>
 				<model ea_localid="4244"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="https://docs.peppol.eu/poacc/billing/3.0/codelist/UNCL5189/&#xA;&#xA;https://docs.peppol.eu/poacc/billing/3.0/codelist/UNCL7161/"/>
+				<documentation value="The justification for using the Allowance or the Charge.&#xA;&#xA;WG approval 10/06/2024&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasAllowanceChargeReason"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -8518,6 +9393,41 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_FF0A4C18_97A9_450b_83FC_E7F2ADB8020E">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_CF553CC8_8DC9_4ea2_B386_8ACB39A17657">
+					<model ea_localid="3235" type="Class" name="epo-ful:ReceiptAdvice"/>
+					<role name="epo-inv:refersToReceiptAdvice" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5347"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:refersToReceiptAdvice"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_11D3CF7A_4949_410c_A7E5_91AB91646B43">
 				<source xmi:idref="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73">
 					<model ea_localid="3236" type="Class" name="epo-ful:ReceiptAdviceLine"/>
@@ -8804,209 +9714,230 @@
 		<profiles/>
 		<diagrams>
 			<diagram xmi:id="EAID_85FB2EE8_AEBD_45d4_92DD_8FC795FDE413">
-				<model package="EAPK_9F90CA42_2AD5_4086_8537_A3D0531D27FD" localID="399" owner="EAPK_9F90CA42_2AD5_4086_8537_A3D0531D27FD" tpos="2"/>
+				<model package="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" localID="399" owner="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" tpos="2"/>
 				<properties name="despatch advice line" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-01-18 14:49:25" modified="2024-03-13 16:05:34"/>
+				<project author="andreea" version="1.0" created="2023-01-18 14:49:25" modified="2024-07-16 16:47:52"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=1;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=1EF2F411;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=431FA9E3;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=592;Top=349;Right=682;Bottom=409;" subject="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12" seqno="1" style="DUID=853AAA7D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=550;Top=149;Right=721;Bottom=219;" subject="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" seqno="2" style="DUID=0EB87A77;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=645;Top=646;Right=864;Bottom=736;" subject="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" seqno="3" style="DUID=8FD6B150;NSL=0;"/>
-					<element geometry="Left=158;Top=290;Right=374;Bottom=430;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="4" style="DUID=C48E7FC3;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=209;Top=657;Right=414;Bottom=727;" subject="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" seqno="5" style="DUID=E4E0C7CE;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=889;Top=646;Right=1117;Bottom=716;" subject="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E" seqno="6" style="DUID=AE53B0C6;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=209;Top=557;Right=322;Bottom=592;" subject="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD" seqno="7" style="DUID=64B06E91;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=914;Top=493;Right=1004;Bottom=553;" subject="EAID_B0937CD2_46D2_48d7_849F_409BCB726909" seqno="8" style="DUID=54331A39;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=815;Top=368;Right=1054;Bottom=443;" subject="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" seqno="9" style="DUID=E3938C5A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=889;Top=270;Right=979;Bottom=314;" subject="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" seqno="10" style="DUID=2649757E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=506;Top=452;Right=752;Bottom=592;" subject="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" seqno="11" style="DUID=9B351146;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=501;Top=259;Right=772;Bottom=324;" subject="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" seqno="12" style="DUID=17035B52;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="SX=0;SY=-9;EX=-2;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=158:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9E47E1C8_547C_4dfc_AE71_4354D7B1ADDB" style="Mode=3;EOID=54331A39;SOID=9B351146;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_65E8EC44_CB4C_4aa9_8218_75D01ED44538" style="Mode=3;EOID=E4E0C7CE;SOID=17035B52;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_95D24239_8F4D_44c8_97D1_1C26296607DA" style="Mode=3;EOID=E4E0C7CE;SOID=17035B52;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SX=1;SY=1;EX=1;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A88D0B55_1D01_4b73_B27A_8F69BE5B1455" style="Mode=3;EOID=0EB87A77;SOID=17035B52;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=3;SY=0;EX=0;EY=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=123:CY=14:OX=71:OY=13:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7EF1D4F7_398F_4f04_A19A_C5D793FA14E3" style="Mode=3;EOID=853AAA7D;SOID=9B351146;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=736;SCTR.TOP=-492;SCTR.RIGHT=767;SCTR.BOTTOM=-477;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=752:-492$767:-492$767:-477$752:-477$;" subject="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F" style="Mode=3;EOID=9B351146;SOID=9B351146;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=736;SCTR.TOP=-492;SCTR.RIGHT=767;SCTR.BOTTOM=-477;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=752:-492$767:-492$767:-477$752:-477$;" subject="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24" style="Mode=3;EOID=9B351146;SOID=9B351146;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="Left=1118;Top=377;Right=1233;Bottom=432;" subject="EAID_C94A7466_0773_451f_8CF7_C481027E03FA" seqno="1" style="DUID=DF4ACB7E;ImageID=0;"/>
+					<element geometry="Left=818;Top=290;Right=1053;Bottom=360;" subject="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE" seqno="2" style="DUID=FE4058C5;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=874;Top=419;Right=998;Bottom=461;" subject="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" seqno="3" style="DUID=0008A159;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=592;Top=349;Right=682;Bottom=409;" subject="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12" seqno="4" style="DUID=853AAA7D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=522;Top=56;Right=754;Bottom=126;" subject="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" seqno="5" style="DUID=0EB87A77;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=645;Top=646;Right=888;Bottom=736;" subject="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" seqno="6" style="DUID=8FD6B150;NSL=0;"/>
+					<element geometry="Left=158;Top=290;Right=374;Bottom=430;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="7" style="DUID=C48E7FC3;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=209;Top=657;Right=414;Bottom=727;" subject="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" seqno="8" style="DUID=E4E0C7CE;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=929;Top=646;Right=1157;Bottom=716;" subject="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E" seqno="9" style="DUID=AE53B0C6;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=209;Top=557;Right=322;Bottom=592;" subject="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD" seqno="10" style="DUID=64B06E91;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=914;Top=493;Right=1004;Bottom=553;" subject="EAID_B0937CD2_46D2_48d7_849F_409BCB726909" seqno="11" style="DUID=54331A39;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1123;Top=161;Right=1362;Bottom=236;" subject="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" seqno="12" style="DUID=E3938C5A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=892;Top=186;Right=982;Bottom=214;" subject="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" seqno="13" style="DUID=2649757E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=506;Top=452;Right=752;Bottom=592;" subject="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" seqno="14" style="DUID=9B351146;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=502;Top=167;Right=773;Bottom=232;" subject="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" seqno="15" style="DUID=17035B52;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="SX=-72;SY=0;EX=0;EY=13;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=121:CY=14:OX=11:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=557:-347$;" subject="EAID_E507D198_1A41_4b43_873A_F9E88411186D" style="Mode=3;EOID=C48E7FC3;SOID=9B351146;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-91;SY=0;EX=0;EY=-15;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=17:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=1:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=538:-375$;" subject="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA" style="Mode=3;EOID=C48E7FC3;SOID=9B351146;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=-3;EX=30;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=62:OY=20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=296:-525$;" subject="EAID_15464872_BFB6_40bb_84F1_8A3969FE662E" style="Mode=3;EOID=C48E7FC3;SOID=9B351146;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=3;SX=-70;SY=0;EX=0;EY=28;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=4:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=559:-664$;" subject="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65" style="Mode=3;EOID=E4E0C7CE;SOID=9B351146;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=736;SCTR.TOP=-499;SCTR.RIGHT=790;SCTR.BOTTOM=-477;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=752:-499$790:-499$790:-477$752:-477$;" subject="EAID_574DB5D8_4929_4670_9014_608B3C5534ED" style="Mode=3;EOID=9B351146;SOID=9B351146;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=735;SCTR.TOP=-541;SCTR.RIGHT=768;SCTR.BOTTOM=-526;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=752:-541$768:-541$768:-526$752:-526$;" subject="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991" style="Mode=3;EOID=9B351146;SOID=9B351146;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B0259612_87E6_4f34_A3AA_B5B7E513AEA0" style="Mode=3;EOID=2649757E;SOID=17035B52;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B0259612_87E6_4f34_A3AA_B5B7E513AEA0" style="Mode=3;EOID=2649757E;SOID=17035B52;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;EX=0;EY=4;SX=0;SY=-48;$LLB=;LLT=;LMT=;LMB=;LRT=CX=108:CY=14:OX=0:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F58320C5_899E_4f5f_971B_BF5DE149A892" style="Mode=3;EOID=64B06E91;SOID=9B351146;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=3;EX=-12;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=36:CY=27:OX=51:OY=-28:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=254:-181$;" subject="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044" style="Mode=3;EOID=C48E7FC3;SOID=0EB87A77;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=736;SCTR.TOP=-453;SCTR.RIGHT=774;SCTR.BOTTOM=-429;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=752:-453$774:-453$774:-429$736:-429$736:-452$;" subject="EAID_AF2B738F_531D_4495_9397_CE5771200854" style="Mode=3;EOID=9B351146;SOID=9B351146;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=735;SCTR.TOP=-541;SCTR.RIGHT=768;SCTR.BOTTOM=-526;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=752:-541$768:-541$768:-526$752:-526$;" subject="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991" style="Mode=3;EOID=9B351146;SOID=9B351146;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=736;SCTR.TOP=-499;SCTR.RIGHT=790;SCTR.BOTTOM=-477;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=752:-499$790:-499$790:-477$752:-477$;" subject="EAID_574DB5D8_4929_4670_9014_608B3C5534ED" style="Mode=3;EOID=9B351146;SOID=9B351146;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=3;SX=-70;SY=0;EX=0;EY=28;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=4:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=559:-664$;" subject="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65" style="Mode=3;EOID=E4E0C7CE;SOID=9B351146;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=27;EX=89;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=57:OY=40:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=355:-495$;" subject="EAID_ECEFDC69_19B4_47d7_A201_D8391B5C67DF" style="Mode=3;EOID=C48E7FC3;SOID=9B351146;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-118;SY=0;EX=0;EY=-48;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=69:CY=14:OX=32:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=511:-408$;" subject="EAID_BBC722BA_3236_4fcb_B51A_14A66F3D627C" style="Mode=3;EOID=C48E7FC3;SOID=9B351146;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_0AC5D04E_7364_4118_9D94_CE93A68B3CF9" style="Mode=3;EOID=E4E0C7CE;SOID=2649757E;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SX=-1;SY=0;EX=0;EY=-8;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=933:-192$;" subject="EAID_AA589EDA_B26B_44c3_BCCC_37421BA960DE" style="Mode=3;EOID=0EB87A77;SOID=2649757E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=65:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_46338F2C_8F52_4c58_8FE0_29F2F5CFCD7E" style="Mode=3;EOID=2649757E;SOID=E3938C5A;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=108:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D42B1380_78A6_4579_B0FD_C3609EBD8AFD" style="Mode=3;EOID=C48E7FC3;SOID=E3938C5A;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SX=-28;SY=-6;EX=-28;EY=-6;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=60:OY=50:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_31D80540_9E04_44d6_B0B4_339ED74111CC" style="Mode=3;EOID=C48E7FC3;SOID=64B06E91;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-91;SY=0;EX=0;EY=-15;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=17:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=1:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=538:-375$;" subject="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA" style="Mode=3;EOID=C48E7FC3;SOID=9B351146;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-6;SY=-15;EX=-6;EY=-15;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_52CB7369_B0C2_4acc_A513_76150076F808" style="Mode=3;EOID=C48E7FC3;SOID=9B351146;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=736;SCTR.TOP=-492;SCTR.RIGHT=767;SCTR.BOTTOM=-477;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=752:-492$767:-492$767:-477$752:-477$;" subject="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24" style="Mode=3;EOID=9B351146;SOID=9B351146;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=736;SCTR.TOP=-492;SCTR.RIGHT=767;SCTR.BOTTOM=-477;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=752:-492$767:-492$767:-477$752:-477$;" subject="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F" style="Mode=3;EOID=9B351146;SOID=9B351146;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=1;SX=3;SY=0;EX=0;EY=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=123:CY=14:OX=71:OY=13:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7EF1D4F7_398F_4f04_A19A_C5D793FA14E3" style="Mode=3;EOID=853AAA7D;SOID=9B351146;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=1;SY=1;EX=1;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A88D0B55_1D01_4b73_B27A_8F69BE5B1455" style="Mode=3;EOID=0EB87A77;SOID=17035B52;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_95D24239_8F4D_44c8_97D1_1C26296607DA" style="Mode=3;EOID=E4E0C7CE;SOID=17035B52;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_65E8EC44_CB4C_4aa9_8218_75D01ED44538" style="Mode=3;EOID=E4E0C7CE;SOID=17035B52;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=0;SY=-3;EX=30;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=62:OY=20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=296:-525$;" subject="EAID_15464872_BFB6_40bb_84F1_8A3969FE662E" style="Mode=3;EOID=C48E7FC3;SOID=9B351146;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=-53;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=993:-575$;" subject="EAID_65A0DAC3_2E18_40c1_BB08_B80EA400868A" style="Mode=3;EOID=9B351146;SOID=AE53B0C6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=164:CY=14:OX=99:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9D8A2FCD_752D_45a9_9023_77697592FF3C" style="Mode=3;EOID=FE4058C5;SOID=0008A159;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=5;EX=80;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=130:CY=14:OX=74:OY=23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=717:-435$;" subject="EAID_121E7032_36A3_4c8b_8FFF_C8B67B4CF87D" style="Mode=3;EOID=17035B52;SOID=0008A159;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=3;EX=1;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=93:CY=14:OX=57:OY=20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1243:-437$;" subject="EAID_05ABFF05_AE37_4d14_9F45_D060A347AAB9" style="Mode=3;EOID=E3938C5A;SOID=0008A159;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=3;EX=-12;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=51:OY=-28:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=254:-88$;" subject="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044" style="Mode=3;EOID=C48E7FC3;SOID=0EB87A77;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=13;EX=0;EY=36;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=92:CY=14:OX=16:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1107:-78$1107:-486$;" subject="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807" style="Mode=3;EOID=9B351146;SOID=0EB87A77;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=27;SY=0;EX=0;EY=-13;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=112:CY=14:OX=15:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B9C9C412_36FA_46d5_AA00_34CA1CC60CA2" style="Mode=3;EOID=E4E0C7CE;SOID=8FD6B150;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-9;EX=-2;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=158:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9E47E1C8_547C_4dfc_AE71_4354D7B1ADDB" style="Mode=3;EOID=54331A39;SOID=9B351146;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=4;SY=0;EX=-85;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=46:CY=27:OX=52:OY=20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=997:-747$181:-747$;" subject="EAID_ACCA405B_7FF7_41ad_9ACB_A1015C643C97" style="Mode=3;EOID=C48E7FC3;SOID=AE53B0C6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-3;SY=0;EX=0;EY=-24;$LLB=;LLT=;LMT=;LMB=;LRT=CX=117:CY=14:OX=25:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=932:-223$;" subject="EAID_EA77B614_F9B2_464f_9F87_43543F10AEA4" style="Mode=3;EOID=17035B52;SOID=FE4058C5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-28;SY=-6;EX=-28;EY=-6;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=60:OY=50:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_31D80540_9E04_44d6_B0B4_339ED74111CC" style="Mode=3;EOID=C48E7FC3;SOID=64B06E91;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D42B1380_78A6_4579_B0FD_C3609EBD8AFD" style="Mode=3;EOID=C48E7FC3;SOID=E3938C5A;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=3:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_46338F2C_8F52_4c58_8FE0_29F2F5CFCD7E" style="Mode=3;EOID=2649757E;SOID=E3938C5A;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-1;SY=0;EX=0;EY=-8;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=936:-99$;" subject="EAID_AA589EDA_B26B_44c3_BCCC_37421BA960DE" style="Mode=3;EOID=0EB87A77;SOID=2649757E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_0AC5D04E_7364_4118_9D94_CE93A68B3CF9" style="Mode=3;EOID=E4E0C7CE;SOID=2649757E;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=-118;SY=0;EX=0;EY=-48;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=69:CY=14:OX=32:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=511:-408$;" subject="EAID_BBC722BA_3236_4fcb_B51A_14A66F3D627C" style="Mode=3;EOID=C48E7FC3;SOID=9B351146;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-80;SY=-2;EX=123;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=95:CY=14:OX=55:OY=16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0692BD51_5113_4e40_A80A_3CDDD84D3629" style="Mode=3;EOID=9B351146;SOID=8FD6B150;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=27;SY=0;EX=0;EY=-13;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=112:CY=14:OX=15:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B9C9C412_36FA_46d5_AA00_34CA1CC60CA2" style="Mode=3;EOID=E4E0C7CE;SOID=8FD6B150;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=13;EX=0;EY=36;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=92:CY=14:OX=16:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1107:-171$1107:-486$;" subject="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807" style="Mode=3;EOID=9B351146;SOID=0EB87A77;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=736;SCTR.TOP=-453;SCTR.RIGHT=774;SCTR.BOTTOM=-429;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=752:-453$774:-453$774:-429$736:-429$736:-452$;" subject="EAID_AF2B738F_531D_4495_9397_CE5771200854" style="Mode=3;EOID=9B351146;SOID=9B351146;Color=-1;LWidth=0;Hidden=1;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_2B157CDB_0A9A_43f4_BB8C_F112D7DC954A">
-				<model package="EAPK_9F90CA42_2AD5_4086_8537_A3D0531D27FD" localID="400" owner="EAPK_9F90CA42_2AD5_4086_8537_A3D0531D27FD" tpos="1"/>
+				<model package="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" localID="400" owner="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" tpos="1"/>
 				<properties name="despatch advice advanced" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-01-18 15:32:02" modified="2024-03-13 16:04:50"/>
+				<project author="andreea" version="1.0" created="2023-01-18 15:32:02" modified="2024-07-23 10:28:55"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=029F4250;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=BE1EC943;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=637;Top=250;Right=727;Bottom=320;" subject="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" seqno="1" style="DUID=4598B1B3;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1057;Top=1112;Right=1257;Bottom=1182;" subject="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" seqno="2" style="DUID=A695DE14;NSL=0;"/>
-					<element geometry="Left=1613;Top=61;Right=1808;Bottom=131;" subject="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" seqno="3" style="DUID=4BEE7FA3;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=316;Top=915;Right=466;Bottom=973;" subject="EAID_27ECEEC8_871D_4826_8EA1_8E10F63A1500" seqno="4" style="DUID=37965F83;"/>
-					<element geometry="Left=1235;Top=973;Right=1406;Bottom=1043;" subject="EAID_EA36CA1F_5963_4ff6_86BE_1ACC9D34E843" seqno="5" style="DUID=A703E726;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=2077;Top=640;Right=2167;Bottom=700;" subject="EAID_54C25D5B_33E1_4ec5_BCDB_3E876216F668" seqno="6" style="DUID=8788E4B7;"/>
-					<element geometry="Left=774;Top=708;Right=864;Bottom=768;" subject="EAID_894938CF_E95C_498c_9C4C_0FD3115E2A2A" seqno="7" style="DUID=E34BF9E4;"/>
-					<element geometry="Left=749;Top=279;Right=839;Bottom=339;" subject="EAID_0648E479_6FDB_4549_8A77_989FA3BA7568" seqno="8" style="DUID=8DA46B89;"/>
-					<element geometry="Left=637;Top=116;Right=727;Bottom=176;" subject="EAID_274424DF_415D_400f_99C0_FDA108C74C7A" seqno="9" style="DUID=CC1E646E;"/>
-					<element geometry="Left=494;Top=737;Right=584;Bottom=780;" subject="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" seqno="10" style="DUID=38A46E46;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=429;Top=509;Right=648;Bottom=594;" subject="EAID_96B284C4_E759_4bad_9655_04521F703750" seqno="11" style="DUID=491777FC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=140;Top=181;Right=352;Bottom=344;" subject="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" seqno="12" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=C5C4DC70;"/>
-					<element geometry="Left=1650;Top=242;Right=1740;Bottom=302;" subject="EAID_D72442ED_835D_455e_970E_3D4CAF26A2F5" seqno="13" style="DUID=F7EC382B;"/>
-					<element geometry="Left=1924;Top=152;Right=2014;Bottom=212;" subject="EAID_33A89700_846B_47cb_93D9_9D4729194EA6" seqno="14" style="DUID=429A5F6E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1924;Top=66;Right=2014;Bottom=126;" subject="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A" seqno="15" style="DUID=EECBC32C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=648;Top=633;Right=785;Bottom=682;" subject="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D" seqno="16" style="DUID=29149230;"/>
-					<element geometry="Left=1825;Top=748;Right=1915;Bottom=808;" subject="EAID_41E9A77E_E3B5_48df_BE17_4B4411613470" seqno="17" style="DUID=8A1E2962;"/>
-					<element geometry="Left=1767;Top=513;Right=1973;Bottom=583;" subject="EAID_9099AF4F_0019_4768_B85A_99820F3E6307" seqno="18" style="DUID=ACC64AC8;"/>
-					<element geometry="Left=822;Top=61;Right=1089;Bottom=159;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="19" style="DUID=BC306B02;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=298;Top=987;Right=549;Bottom=1057;" subject="EAID_C215EC75_82FD_45d3_832A_B3989A897692" seqno="20" style="DUID=C36AAD75;"/>
-					<element geometry="Left=530;Top=896;Right=620;Bottom=956;" subject="EAID_BA97F7F9_0B9C_4d96_8E10_3AC087F5FF2A" seqno="21" style="DUID=D707A28A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=96;Top=847;Right=186;Bottom=912;" subject="EAID_4CD4C360_C8F1_4565_9570_087A142343D6" seqno="22" style="DUID=70EA38D3;"/>
-					<element geometry="Left=96;Top=722;Right=186;Bottom=782;" subject="EAID_9DC1B8F7_FF27_4120_A538_C3E64CC643BA" seqno="23" style="DUID=63F33198;"/>
-					<element geometry="Left=1422;Top=1112;Right=1648;Bottom=1182;" subject="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" seqno="24" style="DUID=4C51C866;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=314;Top=671;Right=466;Bottom=722;" subject="EAID_3C8EEF69_1346_4dbe_B505_7C2D920B97B9" seqno="25" style="DUID=DF23D4C6;"/>
-					<element geometry="Left=1248;Top=421;Right=1434;Bottom=491;" subject="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" seqno="26" style="DUID=F78B14B3;NSL=0;"/>
-					<element geometry="Left=1767;Top=408;Right=1973;Bottom=467;" subject="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" seqno="27" style="DUID=68A6C818;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1813;Top=649;Right=1927;Bottom=691;" subject="EAID_9E80131F_7D1C_452d_98B2_308983569ECB" seqno="28" style="DUID=B09A20CC;"/>
-					<element geometry="Left=1191;Top=237;Right=1491;Bottom=307;" subject="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" seqno="29" style="DUID=FE498B72;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=928;Top=1246;Right=1109;Bottom=1316;" subject="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" seqno="30" style="DUID=8B73DB2F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1058;Top=887;Right=1255;Bottom=967;" subject="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" seqno="31" style="DUID=16651651;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1481;Top=655;Right=1680;Bottom=738;" subject="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6" seqno="32" style="DUID=72C68B10;"/>
-					<element geometry="Left=667;Top=987;Right=928;Bottom=1057;" subject="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B" seqno="33" style="DUID=885CF94F;"/>
-					<element geometry="Left=285;Top=808;Right=495;Bottom=896;" subject="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA" seqno="34" style="DUID=5D167675;"/>
-					<element geometry="Left=680;Top=817;Right=915;Bottom=887;" subject="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE" seqno="35" style="DUID=95C4F4AA;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1142;Top=421;Right=1232;Bottom=491;" subject="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184" seqno="36" style="DUID=8DD0BF2A;"/>
-					<element geometry="Left=1020;Top=421;Right=1110;Bottom=491;" subject="EAID_CE66C7F9_83F7_479f_89C7_9BC5ACC1EEFB" seqno="37" style="DUID=91B373BB;"/>
-					<element geometry="Left=1522;Top=513;Right=1612;Bottom=583;" subject="EAID_78459D23_BCB4_42bb_83F6_F9D8F550B19D" seqno="38" style="DUID=0B8FB2B7;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1030;Top=633;Right=1285;Bottom=760;" subject="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" seqno="39" style="DUID=1617B0F0;"/>
-					<element geometry="Left=140;Top=420;Right=411;Bottom=490;" subject="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" seqno="40" style="DUID=C8BCA07D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=656;Top=421;Right=777;Bottom=491;" subject="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" seqno="41" style="DUID=DAD8F405;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=512;Top=866;Right=627;Bottom=921;" subject="EAID_D25408FD_102C_45ac_8B0F_E2AD6B66BE37" seqno="1" style="DUID=9FC2FFB0;"/>
+					<element geometry="Left=1050;Top=329;Right=1165;Bottom=384;" subject="EAID_D5D11C8E_0306_4f62_986A_C58347A2EB63" seqno="2" style="DUID=CB245F24;"/>
+					<element geometry="Left=736;Top=184;Right=867;Bottom=263;" subject="EAID_864B4AE7_D2C6_4c67_93BC_19F9D69F8197" seqno="3" style="DUID=E123C2F4;"/>
+					<element geometry="Left=636;Top=701;Right=751;Bottom=768;" subject="EAID_AFF2FF49_6801_472a_B12C_681ECC691BB8" seqno="4" style="DUID=D5EABF9D;"/>
+					<element geometry="Left=1296;Top=800;Right=1411;Bottom=855;" subject="EAID_D8A8B96C_BD80_4776_8875_507427F96AF2" seqno="5" style="DUID=1B36C5C3;"/>
+					<element geometry="Left=637;Top=250;Right=727;Bottom=320;" subject="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" seqno="6" style="DUID=4598B1B3;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1057;Top=1119;Right=1257;Bottom=1189;" subject="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" seqno="7" style="DUID=A695DE14;NSL=0;"/>
+					<element geometry="Left=1613;Top=61;Right=1808;Bottom=131;" subject="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" seqno="8" style="DUID=4BEE7FA3;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=316;Top=915;Right=466;Bottom=973;" subject="EAID_27ECEEC8_871D_4826_8EA1_8E10F63A1500" seqno="9" style="DUID=37965F83;"/>
+					<element geometry="Left=1235;Top=973;Right=1406;Bottom=1043;" subject="EAID_EA36CA1F_5963_4ff6_86BE_1ACC9D34E843" seqno="10" style="DUID=A703E726;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=2075;Top=640;Right=2165;Bottom=700;" subject="EAID_54C25D5B_33E1_4ec5_BCDB_3E876216F668" seqno="11" style="DUID=8788E4B7;"/>
+					<element geometry="Left=774;Top=708;Right=864;Bottom=768;" subject="EAID_894938CF_E95C_498c_9C4C_0FD3115E2A2A" seqno="12" style="DUID=E34BF9E4;"/>
+					<element geometry="Left=756;Top=301;Right=846;Bottom=361;" subject="EAID_0648E479_6FDB_4549_8A77_989FA3BA7568" seqno="13" style="DUID=8DA46B89;"/>
+					<element geometry="Left=637;Top=116;Right=727;Bottom=176;" subject="EAID_274424DF_415D_400f_99C0_FDA108C74C7A" seqno="14" style="DUID=CC1E646E;"/>
+					<element geometry="Left=481;Top=737;Right=571;Bottom=780;" subject="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" seqno="15" style="DUID=38A46E46;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=391;Top=509;Right=610;Bottom=594;" subject="EAID_96B284C4_E759_4bad_9655_04521F703750" seqno="16" style="DUID=491777FC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=140;Top=181;Right=352;Bottom=344;" subject="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" seqno="17" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=C5C4DC70;"/>
+					<element geometry="Left=1650;Top=242;Right=1740;Bottom=302;" subject="EAID_D72442ED_835D_455e_970E_3D4CAF26A2F5" seqno="18" style="DUID=F7EC382B;"/>
+					<element geometry="Left=1924;Top=152;Right=2014;Bottom=212;" subject="EAID_33A89700_846B_47cb_93D9_9D4729194EA6" seqno="19" style="DUID=429A5F6E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1924;Top=66;Right=2014;Bottom=126;" subject="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A" seqno="20" style="DUID=EECBC32C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=673;Top=633;Right=810;Bottom=682;" subject="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D" seqno="21" style="DUID=29149230;"/>
+					<element geometry="Left=1825;Top=748;Right=1915;Bottom=808;" subject="EAID_41E9A77E_E3B5_48df_BE17_4B4411613470" seqno="22" style="DUID=8A1E2962;"/>
+					<element geometry="Left=1767;Top=513;Right=1973;Bottom=583;" subject="EAID_9099AF4F_0019_4768_B85A_99820F3E6307" seqno="23" style="DUID=ACC64AC8;"/>
+					<element geometry="Left=822;Top=61;Right=1089;Bottom=159;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="24" style="DUID=BC306B02;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=266;Top=987;Right=517;Bottom=1057;" subject="EAID_C215EC75_82FD_45d3_832A_B3989A897692" seqno="25" style="DUID=C36AAD75;"/>
+					<element geometry="Left=752;Top=1109;Right=842;Bottom=1169;" subject="EAID_BA97F7F9_0B9C_4d96_8E10_3AC087F5FF2A" seqno="26" style="DUID=D707A28A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=96;Top=847;Right=186;Bottom=912;" subject="EAID_4CD4C360_C8F1_4565_9570_087A142343D6" seqno="27" style="DUID=70EA38D3;"/>
+					<element geometry="Left=96;Top=722;Right=186;Bottom=782;" subject="EAID_9DC1B8F7_FF27_4120_A538_C3E64CC643BA" seqno="28" style="DUID=63F33198;"/>
+					<element geometry="Left=1421;Top=1112;Right=1647;Bottom=1197;" subject="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" seqno="29" style="DUID=4C51C866;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=315;Top=671;Right=467;Bottom=722;" subject="EAID_3C8EEF69_1346_4dbe_B505_7C2D920B97B9" seqno="30" style="DUID=DF23D4C6;"/>
+					<element geometry="Left=1248;Top=421;Right=1434;Bottom=491;" subject="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" seqno="31" style="DUID=F78B14B3;NSL=0;"/>
+					<element geometry="Left=1767;Top=408;Right=1973;Bottom=467;" subject="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" seqno="32" style="DUID=68A6C818;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1813;Top=649;Right=1927;Bottom=691;" subject="EAID_9E80131F_7D1C_452d_98B2_308983569ECB" seqno="33" style="DUID=B09A20CC;"/>
+					<element geometry="Left=1191;Top=237;Right=1491;Bottom=307;" subject="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" seqno="34" style="DUID=FE498B72;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=928;Top=1246;Right=1109;Bottom=1316;" subject="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" seqno="35" style="DUID=8B73DB2F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1058;Top=887;Right=1255;Bottom=967;" subject="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" seqno="36" style="DUID=16651651;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1481;Top=655;Right=1680;Bottom=738;" subject="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6" seqno="37" style="DUID=72C68B10;"/>
+					<element geometry="Left=667;Top=987;Right=928;Bottom=1057;" subject="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B" seqno="38" style="DUID=885CF94F;"/>
+					<element geometry="Left=286;Top=808;Right=496;Bottom=896;" subject="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA" seqno="39" style="DUID=5D167675;"/>
+					<element geometry="Left=680;Top=817;Right=915;Bottom=887;" subject="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE" seqno="40" style="DUID=95C4F4AA;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1142;Top=421;Right=1232;Bottom=491;" subject="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184" seqno="41" style="DUID=8DD0BF2A;"/>
+					<element geometry="Left=1020;Top=421;Right=1110;Bottom=491;" subject="EAID_CE66C7F9_83F7_479f_89C7_9BC5ACC1EEFB" seqno="42" style="DUID=91B373BB;"/>
+					<element geometry="Left=1522;Top=513;Right=1612;Bottom=583;" subject="EAID_78459D23_BCB4_42bb_83F6_F9D8F550B19D" seqno="43" style="DUID=0B8FB2B7;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1031;Top=633;Right=1286;Bottom=760;" subject="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" seqno="44" style="DUID=1617B0F0;"/>
+					<element geometry="Left=140;Top=420;Right=411;Bottom=490;" subject="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" seqno="45" style="DUID=C8BCA07D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=649;Top=421;Right=770;Bottom=491;" subject="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" seqno="46" style="DUID=DAD8F405;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_2AB47C99_7B9A_495c_838D_198E22FE4C02" style="Mode=3;EOID=885CF94F;SOID=95C4F4AA;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=5;SY=-21;EX=6;EY=-21;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=167:CY=14:OX=94:OY=-15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_FBFFE3B6_925B_4b80_A519_F160F8927173" style="Mode=3;EOID=16651651;SOID=1617B0F0;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=7;SY=21;EX=7;EY=21;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=166:CY=14:OX=-3:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_783AAD71_420E_40ee_B221_B2A54F890D2D" style="Mode=3;EOID=72C68B10;SOID=1617B0F0;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EX=-1;EY=0;SX=-14;SY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=84:CY=14:OX=49:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F48C13D8_6CDE_4da6_A4A1_7512C3E0591E" style="Mode=3;EOID=0B8FB2B7;SOID=72C68B10;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-5;SY=-30;EX=-5;EY=-30;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=158:CY=14:OX=-21:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1D18BED8_E786_4a53_A9AC_93AD55744288" style="Mode=3;EOID=72C68B10;SOID=1617B0F0;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=1;SY=-2;EX=1;EY=-2;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=157:CY=14:OX=-16:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_22815C4E_A421_45ce_B940_8E07DDB6E493" style="Mode=3;EOID=72C68B10;SOID=1617B0F0;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=33;EX=-24;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=155:CY=14:OX=145:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=931:-663$;" subject="EAID_2E9FE66A_E025_4563_9A59_461990838D96" style="Mode=3;EOID=BC306B02;SOID=1617B0F0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=1;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_618070AC_783D_48ae_9723_9C69BB0EB7B4" style="Mode=3;EOID=C5C4DC70;SOID=4598B1B3;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=1;SY=-2;EX=1;EY=-2;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=157:CY=14:OX=-24:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_22815C4E_A421_45ce_B940_8E07DDB6E493" style="Mode=3;EOID=72C68B10;SOID=1617B0F0;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=37;EX=-30;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=155:CY=14:OX=145:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=925:-659$;" subject="EAID_2E9FE66A_E025_4563_9A59_461990838D96" style="Mode=3;EOID=BC306B02;SOID=1617B0F0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=47;EX=11;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=147:CY=14:OX=134:OY=11:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=966:-649$;" subject="EAID_A287E36F_7CEB_4668_B1A5_01DDEE025D3A" style="Mode=3;EOID=BC306B02;SOID=1617B0F0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=54;EX=40;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=107:CY=14:OX=69:OY=20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1381:-642$;" subject="EAID_6DA6B6C9_7964_4102_A413_050778056B72" style="Mode=3;EOID=F78B14B3;SOID=1617B0F0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=5;SY=-21;EX=6;EY=-21;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=167:CY=14:OX=94:OY=-23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_FBFFE3B6_925B_4b80_A519_F160F8927173" style="Mode=3;EOID=16651651;SOID=1617B0F0;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=136:CY=14:OX=1:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_A3907E97_8458_42ef_B2AC_3DB623B8AA78" style="Mode=3;EOID=5D167675;SOID=95C4F4AA;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87:CY=14:OX=63:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3C454BB2_FC26_49ad_948C_F84C001C68E4" style="Mode=3;EOID=8DD0BF2A;SOID=1617B0F0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=31;SY=-1;EX=-3;EY=-4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=112:CY=27:OX=66:OY=23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_27E9E48A_CCBA_48c3_A27B_53F4397FF22D" style="Mode=3;EOID=E34BF9E4;SOID=95C4F4AA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=114;SY=0;EX=-68;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=148:CY=14:OX=93:OY=53:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_053FA551_E0F4_4d8a_9787_DB2496C70148" style="Mode=3;EOID=F78B14B3;SOID=1617B0F0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=31;SY=-1;EX=-3;EY=-4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=148:CY=14:OX=84:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_27E9E48A_CCBA_48c3_A27B_53F4397FF22D" style="Mode=3;EOID=E34BF9E4;SOID=95C4F4AA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=9;EX=-2;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=149:CY=14:OX=90:OY=15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_BA43B026_B4D0_426b_AB39_1D8D064F10A5" style="Mode=3;EOID=DF23D4C6;SOID=5D167675;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=22;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=152:CY=14:OX=85:OY=12:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=141:-830$;" subject="EAID_506D198C_F014_4656_84A2_E0CF23F0C305" style="Mode=3;EOID=63F33198;SOID=5D167675;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-1;SY=-10;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_CEFBB7DC_83F7_430a_B9C9_3A70FB20574B" style="Mode=3;EOID=70EA38D3;SOID=5D167675;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-74;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=112:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=723:-926$;" subject="EAID_169F95CD_4B6A_4e39_994B_4700B802E440" style="Mode=3;EOID=D707A28A;SOID=885CF94F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=1;SY=3;EX=1;EY=3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=112:CY=14:OX=51:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_169F95CD_4B6A_4e39_994B_4700B802E440" style="Mode=3;EOID=D707A28A;SOID=885CF94F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;SCME=1;SCTR=1;EDGE=1;SCTR.LEFT=850;SCTR.TOP=-1004;SCTR.RIGHT=886;SCTR.BOTTOM=-966;$LLB=;LLT=;LMT=;LMB=;LRT=CX=122:CY=14:OX=92:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=886:-987$886:-966$850:-966$850:-987$;" subject="EAID_A219EBC4_BBC6_421b_A4B4_978BEF67A273" style="Mode=3;EOID=885CF94F;SOID=885CF94F;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_EA77B614_F9B2_464f_9F87_43543F10AEA4" style="Mode=3;EOID=C8BCA07D;SOID=95C4F4AA;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=0;SY=0;EX=1;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_618070AC_783D_48ae_9723_9C69BB0EB7B4" style="Mode=3;EOID=C5C4DC70;SOID=4598B1B3;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_EA77B614_F9B2_464f_9F87_43543F10AEA4" style="Mode=3;EOID=C8BCA07D;SOID=95C4F4AA;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=1;SX=0;SY=35;EX=0;EY=-16;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D8E29289_C54A_4d5e_987B_AEF828189A10" style="Mode=3;EOID=4598B1B3;SOID=DAD8F405;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-43;SY=-1;EX=2;EY=-1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=104:CY=14:OX=63:OY=18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_2B89940C_0005_4c86_BE14_3F84B34FF9D8" style="Mode=3;EOID=CC1E646E;SOID=4598B1B3;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=130:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_121E7032_36A3_4c8b_8FFF_C8B67B4CF87D" style="Mode=3;EOID=C8BCA07D;SOID=DAD8F405;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_79AEE9C5_EA86_424b_9486_C235014D3693" style="Mode=3;EOID=16651651;SOID=DAD8F405;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9D8A2FCD_752D_45a9_9023_77697592FF3C" style="Mode=3;EOID=95C4F4AA;SOID=DAD8F405;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SX=-6;SY=0;EX=0;EY=6;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=514:-252$;" subject="EAID_6A127BB3_2702_45c1_99BF_B659211FD91B" style="Mode=3;EOID=C5C4DC70;SOID=DAD8F405;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
-					<element geometry="SX=0;SY=11;EX=3;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=135:CY=14:OX=66:OY=33:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=797:-445$;" subject="EAID_6E467C8A_6420_4dec_A268_3FC6AF39C084" style="Mode=3;EOID=8DA46B89;SOID=DAD8F405;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=58;EX=13;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=148:CY=14:OX=93:OY=53:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1354:-638$;" subject="EAID_053FA551_E0F4_4d8a_9787_DB2496C70148" style="Mode=3;EOID=F78B14B3;SOID=1617B0F0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=1;SY=1;EX=1;EY=1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=153:CY=14:OX=87:OY=-16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0A78D73E_7BA7_4bf0_9D36_DD776DFC8538" style="Mode=3;EOID=29149230;SOID=DAD8F405;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-63;SY=0;EX=0;EY=11;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=159:CY=14:OX=-1:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1094:-841$;" subject="EAID_A0665A13_AEF0_4cf6_ACC2_F2FE3A90C76A" style="Mode=3;EOID=95C4F4AA;SOID=1617B0F0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-25;SY=0;EX=4;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=135:CY=14:OX=82:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_6ADD570C_FEF5_4342_A009_CBC3D19B20B5" style="Mode=3;EOID=C5C4DC70;SOID=C8BCA07D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=107;SY=-20;EX=2;EY=6;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=112:CY=27:OX=6:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7D11F407_8C9D_4214_8774_289769C50390" style="Mode=3;EOID=E34BF9E4;SOID=1617B0F0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=21;EX=-71;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=196:CY=14:OX=185:OY=17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=884:-675$;" subject="EAID_569C582B_2F50_4a11_B7B6_50CA2F0A9B94" style="Mode=3;EOID=BC306B02;SOID=1617B0F0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=52;EX=24;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=179:CY=14:OX=168:OY=9:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=979:-644$;" subject="EAID_5009F883_10B2_4e9c_96A3_A1F92BE8EA63" style="Mode=3;EOID=BC306B02;SOID=1617B0F0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-79;SY=0;EX=12;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=127:CY=14:OX=86:OY=48:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4D018782_9090_4ec2_95E6_BC660BB6F161" style="Mode=3;EOID=91B373BB;SOID=1617B0F0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=3;SX=-55;SY=0;EX=0;EY=19;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=654:-908$;" subject="EAID_79AEE9C5_EA86_424b_9486_C235014D3693" style="Mode=3;EOID=16651651;SOID=DAD8F405;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=4;SX=0;SY=-15;EX=0;EY=19;$LLB=;LLT=;LMT=;LMB=;LRT=CX=164:CY=14:OX=68:OY=-30:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=631:-471$631:-833$;" subject="EAID_9D8A2FCD_752D_45a9_9023_77697592FF3C" style="Mode=3;EOID=95C4F4AA;SOID=DAD8F405;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-51;SY=0;EX=0;EY=-71;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=135:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=658:-333$;" subject="EAID_6A127BB3_2702_45c1_99BF_B659211FD91B" style="Mode=3;EOID=C5C4DC70;SOID=DAD8F405;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=11;EX=3;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=135:CY=14:OX=74:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=804:-445$;" subject="EAID_6E467C8A_6420_4dec_A268_3FC6AF39C084" style="Mode=3;EOID=8DA46B89;SOID=DAD8F405;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=7;SY=21;EX=7;EY=21;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=166:CY=14:OX=-8:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_783AAD71_420E_40ee_B221_B2A54F890D2D" style="Mode=3;EOID=72C68B10;SOID=1617B0F0;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=6;SY=1;EX=5;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=153:CY=14:OX=87:OY=-16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0A78D73E_7BA7_4bf0_9D36_DD776DFC8538" style="Mode=3;EOID=29149230;SOID=DAD8F405;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=7;SY=0;EX=5;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=121:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4E226C0E_C79A_44dd_9052_55D13D688E6F" style="Mode=3;EOID=B09A20CC;SOID=72C68B10;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=-16;EX=0;EY=3;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=122:CY=14:OX=-4:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=817:-472$817:-693$;" subject="EAID_D6B12A9D_029A_4c46_9583_5FF42CA3E096" style="Mode=3;EOID=1617B0F0;SOID=DAD8F405;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=4;SX=0;SY=31;EX=0;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=18:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_470D1B16_C07B_4868_91B2_799578663395" style="Mode=3;EOID=BC306B02;SOID=4BEE7FA3;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-25;SY=0;EX=4;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=135:CY=14:OX=74:OY=23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_6ADD570C_FEF5_4342_A009_CBC3D19B20B5" style="Mode=3;EOID=C5C4DC70;SOID=C8BCA07D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=107;SY=-20;EX=2;EY=6;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=148:CY=14:OX=6:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7D11F407_8C9D_4214_8774_289769C50390" style="Mode=3;EOID=E34BF9E4;SOID=1617B0F0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=25;EX=-69;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=196:CY=14:OX=185:OY=17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=886:-671$;" subject="EAID_569C582B_2F50_4a11_B7B6_50CA2F0A9B94" style="Mode=3;EOID=BC306B02;SOID=1617B0F0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=55;EX=46;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=179:CY=14:OX=168:OY=9:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1001:-641$;" subject="EAID_5009F883_10B2_4e9c_96A3_A1F92BE8EA63" style="Mode=3;EOID=BC306B02;SOID=1617B0F0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-79;SY=0;EX=12;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=127:CY=14:OX=86:OY=48:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4D018782_9090_4ec2_95E6_BC660BB6F161" style="Mode=3;EOID=91B373BB;SOID=1617B0F0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87:CY=14:OX=63:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3C454BB2_FC26_49ad_948C_F84C001C68E4" style="Mode=3;EOID=8DD0BF2A;SOID=1617B0F0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-63;SY=0;EX=0;EY=11;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=159:CY=14:OX=-1:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1095:-841$;" subject="EAID_A0665A13_AEF0_4cf6_ACC2_F2FE3A90C76A" style="Mode=3;EOID=95C4F4AA;SOID=1617B0F0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-19;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=122:CY=14:OX=-4:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=843:-475$843:-696$;" subject="EAID_D6B12A9D_029A_4c46_9583_5FF42CA3E096" style="Mode=3;EOID=1617B0F0;SOID=DAD8F405;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=14;EX=0;EY=-4;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=123:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=86:-1008$86:-459$;" subject="EAID_D57BCA2B_F949_4607_84FB_38E506A895B7" style="Mode=3;EOID=C8BCA07D;SOID=C36AAD75;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=114:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7EAB192B_82DE_4520_A51F_2425A6DBF32F" style="Mode=3;EOID=C36AAD75;SOID=885CF94F;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=138:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D8FEF002_D274_4157_BCA8_CFEC07ED34AE" style="Mode=3;EOID=A695DE14;SOID=4C51C866;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EX=0;EY=4;SX=7;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=112:CY=14:OX=15:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=6:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1542:-1277$;" subject="EAID_DCA21CBC_3D4F_480a_B24B_49A69CC51624" style="Mode=3;EOID=8B73DB2F;SOID=4C51C866;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-23;SY=0;EX=0;EY=-25;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=183:CY=14:OX=2:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1512:-1033$;" subject="EAID_ED2DCABC_3EFA_4af4_B368_9AA9D2B6757D" style="Mode=3;EOID=A703E726;SOID=4C51C866;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=9;SY=0;EX=0;EY=17;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=182:CY=14:OX=3:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1544:-991$;" subject="EAID_F79B2205_58A2_42e8_ACA2_4C099B935E15" style="Mode=3;EOID=A703E726;SOID=4C51C866;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=0;EY=3;SX=-12;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=112:CY=14:OX=15:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=6:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1522:-1278$;" subject="EAID_DCA21CBC_3D4F_480a_B24B_49A69CC51624" style="Mode=3;EOID=8B73DB2F;SOID=4C51C866;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-23;SY=0;EX=0;EY=-25;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=183:CY=14:OX=2:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1511:-1033$;" subject="EAID_ED2DCABC_3EFA_4af4_B368_9AA9D2B6757D" style="Mode=3;EOID=A703E726;SOID=4C51C866;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=9;SY=0;EX=0;EY=17;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=182:CY=14:OX=3:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1543:-991$;" subject="EAID_F79B2205_58A2_42e8_ACA2_4C099B935E15" style="Mode=3;EOID=A703E726;SOID=4C51C866;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=-7:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0D4101FD_7720_417c_B62C_6F674CDB3888" style="Mode=3;EOID=EECBC32C;SOID=4BEE7FA3;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=-12;EX=-5;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=55:OY=-14:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=534:-669$;" subject="EAID_06DB4B0B_7B20_475e_895E_9E7177239DE8" style="Mode=3;EOID=38A46E46;SOID=29149230;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=4;SX=15;SY=3;EX=4;EY=-4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85:CY=14:OX=22:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_87123434_C2AD_43de_925D_13E9A7667A18" style="Mode=3;EOID=BC306B02;SOID=4BEE7FA3;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=1;EX=-5;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=98:CY=14:OX=55:OY=14:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=533:-656$;" subject="EAID_8C74AF3F_89A0_4039_8257_A68F3DC30CC3" style="Mode=3;EOID=491777FC;SOID=29149230;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=14;EX=0;EY=-4;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=123:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=86:-1008$86:-459$;" subject="EAID_D57BCA2B_F949_4607_84FB_38E506A895B7" style="Mode=3;EOID=C8BCA07D;SOID=C36AAD75;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=3;EX=0;EY=1;SX=16;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=-10:OY=-7:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1726:-181$;" subject="EAID_4D92CD55_08CD_4d21_806C_38F93CA90719" style="Mode=3;EOID=429A5F6E;SOID=4BEE7FA3;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-7;EX=13;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=185:CY=14:OX=138:OY=-32:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1170:-1015$;" subject="EAID_6A549AF3_1E2A_4cd7_9F26_8CD173F2F4F7" style="Mode=3;EOID=A695DE14;SOID=A703E726;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=4;SX=0;SY=31;EX=0;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=18:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_470D1B16_C07B_4868_91B2_799578663395" style="Mode=3;EOID=BC306B02;SOID=4BEE7FA3;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-12;EX=-5;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=55:OY=-14:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=521:-669$;" subject="EAID_06DB4B0B_7B20_475e_895E_9E7177239DE8" style="Mode=3;EOID=38A46E46;SOID=29149230;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=-22;EX=0;EY=5;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=147:CY=14:OX=-18:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=27:-1044$27:-105$;" subject="EAID_AB852C7E_4390_46da_9255_1C4C8BE7B02F" style="Mode=3;EOID=BC306B02;SOID=C36AAD75;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=61:CY=14:OX=38:OY=18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3F693B40_13CE_47d1_A051_E627959E09EF" style="Mode=3;EOID=68A6C818;SOID=ACC64AC8;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=230;SCTR.TOP=-182;SCTR.RIGHT=275;SCTR.BOTTOM=-158;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=75:OY=-24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=275:-181$275:-158$230:-158$230:-181$;" subject="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9" style="Mode=3;EOID=C5C4DC70;SOID=C5C4DC70;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=336;SCTR.TOP=-194;SCTR.RIGHT=374;SCTR.BOTTOM=-159;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=83:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=352:-194$374:-194$374:-159$336:-159$336:-181$;" subject="EAID_39F3583F_0D40_4e9f_8018_10297955785C" style="Mode=3;EOID=C5C4DC70;SOID=C5C4DC70;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=351;SCTR.TOP=-268;SCTR.RIGHT=384;SCTR.BOTTOM=-219;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=118:OY=35:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=352:-268$384:-268$384:-219$352:-219$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=C5C4DC70;SOID=C5C4DC70;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=3;EX=0;EY=1;SX=16;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=-10:OY=-7:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1726:-181$;" subject="EAID_4D92CD55_08CD_4d21_806C_38F93CA90719" style="Mode=3;EOID=429A5F6E;SOID=4BEE7FA3;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=149:CY=14:OX=-4:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-10:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_AF8C5388_D443_4b59_918C_44D86E9AC3CF" style="Mode=3;EOID=F7EC382B;SOID=FE498B72;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_357EE20B_991E_4359_99A9_85E159FD3FDA" style="Mode=3;EOID=5D167675;SOID=37965F83;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_7162EBB6_46B3_40ef_B911_26A9D3F39745" style="Mode=3;EOID=1617B0F0;SOID=1B36C5C3;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=4;SX=15;SY=3;EX=4;EY=-4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85:CY=14:OX=22:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_87123434_C2AD_43de_925D_13E9A7667A18" style="Mode=3;EOID=BC306B02;SOID=4BEE7FA3;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=149:CY=14:OX=-4:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-10:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_AF8C5388_D443_4b59_918C_44D86E9AC3CF" style="Mode=3;EOID=F7EC382B;SOID=FE498B72;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-72;SY=0;EX=0;EY=26;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=149:CY=14:OX=16:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1508:-901$;" subject="EAID_A0F3C1F4_862B_474a_B6CF_EA7D771FF0D0" style="Mode=3;EOID=16651651;SOID=72C68B10;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-25;SY=0;EX=0;EY=-10;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=176:CY=14:OX=20:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1555:-937$;" subject="EAID_1CEAF5CC_EFD4_41e4_BD2B_E606551D42C8" style="Mode=3;EOID=16651651;SOID=72C68B10;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-62;SY=4;EX=-62;EY=4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=139:CY=14:OX=72:OY=-53:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F53AAA5F_2719_4ea3_8E3F_AB7111A1C8C8" style="Mode=3;EOID=A695DE14;SOID=16651651;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_FD183E35_6937_4f66_AFD3_4B863C07ABEE" style="Mode=3;EOID=C8BCA07D;SOID=16651651;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="EX=-9;EY=0;SX=0;SY=-6;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=149:CY=14:OX=86:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1009:-933$;" subject="EAID_11C78626_167C_4c06_AF8A_1D37420731A9" style="Mode=3;EOID=8B73DB2F;SOID=16651651;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=-7;EX=7;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=185:CY=14:OX=138:OY=-32:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1164:-1015$;" subject="EAID_6A549AF3_1E2A_4cd7_9F26_8CD173F2F4F7" style="Mode=3;EOID=A695DE14;SOID=A703E726;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-62;SY=4;EX=-62;EY=4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=139:CY=14:OX=78:OY=-54:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F53AAA5F_2719_4ea3_8E3F_AB7111A1C8C8" style="Mode=3;EOID=A695DE14;SOID=16651651;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=4;SX=0;SY=-3;EX=-24;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=136:CY=14:OX=64:OY=25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=251:-930$;" subject="EAID_FD183E35_6937_4f66_AFD3_4B863C07ABEE" style="Mode=3;EOID=C8BCA07D;SOID=16651651;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=-1;EY=0;SX=0;SY=-30;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=149:CY=14:OX=120:OY=-24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1017:-957$;" subject="EAID_11C78626_167C_4c06_AF8A_1D37420731A9" style="Mode=3;EOID=8B73DB2F;SOID=16651651;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-33;EX=81;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=150:CY=14:OX=88:OY=-27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1615:-960$;" subject="EAID_B9BA1AAD_DA48_4953_9445_B3D0C269B4E6" style="Mode=3;EOID=4C51C866;SOID=16651651;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=138:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D8FEF002_D274_4157_BCA8_CFEC07ED34AE" style="Mode=3;EOID=A695DE14;SOID=4C51C866;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;EX=0;EY=-17;SX=5;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85:CY=14:OX=15:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1346:-127$;" subject="EAID_516CC611_B255_4c67_AAF8_2E19960E553F" style="Mode=3;EOID=BC306B02;SOID=FE498B72;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EX=-1;EY=0;SX=-14;SY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=84:CY=14:OX=49:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F48C13D8_6CDE_4da6_A4A1_7512C3E0591E" style="Mode=3;EOID=0B8FB2B7;SOID=72C68B10;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_54B7C02C_C045_45c7_B877_9B2219A80C72" style="Mode=3;EOID=95C4F4AA;SOID=D5EABF9D;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-67;SY=0;EX=0;EY=-41;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=18:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1274:-151$;" subject="EAID_202AF5A1_B4FE_48a4_91D4_F6387465413F" style="Mode=3;EOID=BC306B02;SOID=FE498B72;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=71;SY=0;EX=0;EY=-27;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=-29:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1412:-123$;" subject="EAID_2EEE05CA_6A1E_4946_A54F_BC6967C07ADF" style="Mode=3;EOID=4BEE7FA3;SOID=FE498B72;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=21;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=37:OY=18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9219D833_E02D_4663_AAEC_E4DC2FD36641" style="Mode=3;EOID=ACC64AC8;SOID=B09A20CC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-2;SY=-20;EX=5;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=113:CY=14:OX=70:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=-2:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_507F5BF2_9FDB_496a_84EC_413BB95A2AB6" style="Mode=3;EOID=8A1E2962;SOID=B09A20CC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=2;SY=21;EX=2;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=37:OY=18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9219D833_E02D_4663_AAEC_E4DC2FD36641" style="Mode=3;EOID=ACC64AC8;SOID=B09A20CC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=1;SY=-20;EX=8;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=113:CY=14:OX=70:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=-2:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_507F5BF2_9FDB_496a_84EC_413BB95A2AB6" style="Mode=3;EOID=8A1E2962;SOID=B09A20CC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=137:CY=14:OX=-3:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_37038B3F_FA49_401f_B4D4_B3EE0610F79E" style="Mode=3;EOID=8788E4B7;SOID=B09A20CC;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D8788651_B092_4dea_82FA_E8F122CD0638" style="Mode=3;EOID=FE498B72;SOID=F78B14B3;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=-33;EX=81;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=150:CY=14:OX=88:OY=-27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1616:-960$;" subject="EAID_B9BA1AAD_DA48_4953_9445_B3D0C269B4E6" style="Mode=3;EOID=4C51C866;SOID=16651651;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=1;EX=-5;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=98:CY=14:OX=55:OY=14:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=495:-656$;" subject="EAID_8C74AF3F_89A0_4039_8257_A68F3DC30CC3" style="Mode=3;EOID=491777FC;SOID=29149230;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-14;EX=-61;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=113:CY=14:OX=59:OY=-48:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=957:-941$;" subject="EAID_3A930003_5665_43a6_9887_A78953BBB2E2" style="Mode=3;EOID=8B73DB2F;SOID=16651651;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_D210A255_85F8_4c7e_8376_ED3954C42486">
-				<model package="EAPK_9F90CA42_2AD5_4086_8537_A3D0531D27FD" localID="406" owner="EAPK_9F90CA42_2AD5_4086_8537_A3D0531D27FD" tpos="5"/>
+				<model package="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" localID="406" owner="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" tpos="5"/>
 				<properties name="despatch identifiers" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-02-03 15:33:43" modified="2023-07-14 14:15:55"/>
+				<project author="andreea" version="1.0" created="2023-02-03 15:33:43" modified="2024-07-16 16:46:28"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=A1CDB09D;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=C55E8112;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=418;Top=134;Right=635;Bottom=204;" subject="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" seqno="1" style="DUID=D75F0FB9;NSL=0;"/>
-					<element geometry="Left=141;Top=587;Right=367;Bottom=657;" subject="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" seqno="2" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=331337D2;"/>
-					<element geometry="Left=657;Top=143;Right=758;Bottom=196;" subject="EAID_C215EC75_82FD_45d3_832A_B3989A897692" seqno="3" style="DUID=B4281BB7;NSL=0;"/>
-					<element geometry="Left=911;Top=347;Right=1024;Bottom=406;" subject="EAID_9E80131F_7D1C_452d_98B2_308983569ECB" seqno="4" style="DUID=4E85D65A;NSL=0;"/>
-					<element geometry="Left=852;Top=283;Right=1051;Bottom=334;" subject="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6" seqno="5" style="DUID=8B65B842;NSL=0;"/>
-					<element geometry="Left=827;Top=587;Right=1024;Bottom=657;" subject="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" seqno="6" style="DUID=F544AF9B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=489;Top=559;Right=744;Bottom=686;" subject="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" seqno="7" style="DUID=FBB59465;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=173;Top=143;Right=334;Bottom=213;" subject="EAID_3C8EEF69_1346_4dbe_B505_7C2D920B97B9" seqno="8" style="DUID=86F369D1;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=148;Top=309;Right=358;Bottom=397;" subject="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA" seqno="9" style="DUID=7131A7BC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=508;Top=283;Right=724;Bottom=423;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="10" style="DUID=2ED1A55B;NSL=0;"/>
+					<element geometry="Left=374;Top=500;Right=489;Bottom=555;" subject="EAID_ED784F3F_23C1_491d_A870_BC4A0B51E6B7" seqno="1" style="DUID=A059DCAE;"/>
+					<element geometry="Left=983;Top=470;Right=1098;Bottom=525;" subject="EAID_0A77CA66_1049_4c72_8493_0DB77A3F5DD2" seqno="2" style="DUID=E3647BE3;"/>
+					<element geometry="Left=418;Top=134;Right=635;Bottom=204;" subject="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" seqno="3" style="DUID=D75F0FB9;NSL=0;"/>
+					<element geometry="Left=141;Top=587;Right=367;Bottom=672;" subject="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" seqno="4" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=331337D2;"/>
+					<element geometry="Left=657;Top=143;Right=758;Bottom=196;" subject="EAID_C215EC75_82FD_45d3_832A_B3989A897692" seqno="5" style="DUID=B4281BB7;NSL=0;"/>
+					<element geometry="Left=911;Top=347;Right=1024;Bottom=406;" subject="EAID_9E80131F_7D1C_452d_98B2_308983569ECB" seqno="6" style="DUID=4E85D65A;NSL=0;"/>
+					<element geometry="Left=852;Top=283;Right=1051;Bottom=334;" subject="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6" seqno="7" style="DUID=8B65B842;NSL=0;"/>
+					<element geometry="Left=827;Top=587;Right=1024;Bottom=657;" subject="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" seqno="8" style="DUID=F544AF9B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=489;Top=559;Right=744;Bottom=686;" subject="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" seqno="9" style="DUID=FBB59465;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=173;Top=143;Right=334;Bottom=213;" subject="EAID_3C8EEF69_1346_4dbe_B505_7C2D920B97B9" seqno="10" style="DUID=86F369D1;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=148;Top=309;Right=358;Bottom=397;" subject="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA" seqno="11" style="DUID=7131A7BC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=508;Top=283;Right=724;Bottom=423;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="12" style="DUID=2ED1A55B;NSL=0;"/>
 					<element geometry="EDGE=1;SX=-10;SY=0;EX=0;EY=-63;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=23:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=14:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=915:-416$;" subject="EAID_C7C433B7_9297_4921_9069_80DF68AD408A" style="Mode=3;EOID=2ED1A55B;SOID=F544AF9B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=-23:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_5A707B7A_A266_46a0_9CA9_EBF5B2C9D483" style="Mode=3;EOID=2ED1A55B;SOID=7131A7BC;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EX=0;EY=54;SX=-10;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=-19:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=1:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=243:-299$;" subject="EAID_96C5B633_908F_48e5_82F6_C10FBDBF1DE3" style="Mode=3;EOID=2ED1A55B;SOID=86F369D1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-88;SY=2;EX=-88;EY=2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=138:CY=14:OX=61:OY=36:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9F290187_06CC_4af8_83C9_F475091E0C14" style="Mode=3;EOID=2ED1A55B;SOID=FBB59465;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=35;SY=22;EX=35;EY=-70;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=39:OY=20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_11702782_CA5B_4035_84B7_1E5035469B29" style="Mode=3;EOID=2ED1A55B;SOID=FBB59465;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=20;SY=24;EX=20;EY=-68;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=39:OY=20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_11702782_CA5B_4035_84B7_1E5035469B29" style="Mode=3;EOID=2ED1A55B;SOID=FBB59465;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_FBFFE3B6_925B_4b80_A519_F160F8927173" style="Mode=3;EOID=F544AF9B;SOID=FBB59465;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=2;SX=0;SY=0;EX=0;EY=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1185:-616$1084:-236$;" subject="EAID_783AAD71_420E_40ee_B221_B2A54F890D2D" style="Mode=3;EOID=8B65B842;SOID=FBB59465;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="EDGE=1;SX=-38;SY=-19;EX=-38;EY=-3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_1D18BED8_E786_4a53_A9AC_93AD55744288" style="Mode=3;EOID=8B65B842;SOID=FBB59465;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_22815C4E_A421_45ce_B940_8E07DDB6E493" style="Mode=3;EOID=8B65B842;SOID=FBB59465;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=65;SY=-19;EX=65;EY=-19;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=153:CY=14:OX=91:OY=65:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F3CD32F8_8180_4939_A987_53BA66264912" style="Mode=3;EOID=2ED1A55B;SOID=FBB59465;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BA43B026_B4D0_426b_AB39_1D8D064F10A5" style="Mode=3;EOID=86F369D1;SOID=7131A7BC;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SX=89;SY=0;EX=89;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=181:CY=14:OX=121:OY=90:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-2:OY=9:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7DD90B0C_4D89_4d64_AC1D_F32A308572D4" style="Mode=3;EOID=2ED1A55B;SOID=FBB59465;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=102;SY=1;EX=102;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=157:CY=14:OX=143:OY=30:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_36284C1D_C098_4082_BE39_99AFCAAF2C1F" style="Mode=3;EOID=2ED1A55B;SOID=FBB59465;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=24;SY=0;EX=-32;EY=70;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=36:OY=-37:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-10:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_DA6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D" style="Mode=3;EOID=2ED1A55B;SOID=D75F0FB9;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-98;SY=0;EX=0;EY=-5;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=836:-584$;" subject="EAID_B9BA1AAD_DA48_4953_9445_B3D0C269B4E6" style="Mode=3;EOID=331337D2;SOID=F544AF9B;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="SX=-2;SY=-1;EX=-2;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4E226C0E_C79A_44dd_9052_55D13D688E6F" style="Mode=3;EOID=4E85D65A;SOID=8B65B842;Color=-1;LWidth=0;Hidden=1;"/>
@@ -9015,27 +9946,28 @@
 					<element geometry="EDGE=3;SX=57;SY=-3;EX=87;EY=-3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_1CEAF5CC_EFD4_41e4_BD2B_E606551D42C8" style="Mode=3;EOID=F544AF9B;SOID=8B65B842;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=5;SY=12;EX=5;EY=-20;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=12:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_A489FF3B_9E63_4b65_9418_542A437B67E4" style="Mode=3;EOID=2ED1A55B;SOID=4E85D65A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=6;SY=-10;EX=10;EY=-36;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=125:CY=14:OX=24:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_77553B39_DB4D_4388_9D1B_8C8E24EB522C" style="Mode=3;EOID=2ED1A55B;SOID=4E85D65A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-18;SY=-2;EX=64;EY=64;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=82:CY=14:OX=44:OY=-30:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-9:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_51A6863A_1079_4af7_AE53_091E3E0514AF" style="Mode=3;EOID=2ED1A55B;SOID=B4281BB7;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-18;SY=-2;EX=64;EY=64;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=82:CY=14:OX=44:OY=-30:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-35:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_51A6863A_1079_4af7_AE53_091E3E0514AF" style="Mode=3;EOID=2ED1A55B;SOID=B4281BB7;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-5;SY=0;EX=0;EY=-58;$LLB=;LLT=;LMT=;LMB=;LRT=CX=94:CY=14:OX=-9:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=249:-411$;" subject="EAID_F0951C5B_94E2_4a5f_BF21_25D103CB3656" style="Mode=3;EOID=2ED1A55B;SOID=331337D2;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-21;SY=-8;EX=-21;EY=-8;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=153:CY=14:OX=91:OY=65:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F3CD32F8_8180_4939_A987_53BA66264912" style="Mode=3;EOID=2ED1A55B;SOID=FBB59465;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-32;SY=-9;EX=-32;EY=-9;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=181:CY=14:OX=101:OY=91:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-2:OY=9:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7DD90B0C_4D89_4d64_AC1D_F32A308572D4" style="Mode=3;EOID=2ED1A55B;SOID=FBB59465;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_EC284203_FAC5_4d56_86F8_EC99545F97B4">
-				<model package="EAPK_9F90CA42_2AD5_4086_8537_A3D0531D27FD" localID="407" owner="EAPK_9F90CA42_2AD5_4086_8537_A3D0531D27FD" tpos="6"/>
+				<model package="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" localID="407" owner="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" tpos="6"/>
 				<properties name="despatch quantities" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-02-08 12:40:02" modified="2023-06-01 21:15:55"/>
+				<project author="andreea" version="1.0" created="2023-02-08 12:40:02" modified="2024-06-18 16:54:35"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=227E9D0C;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=20326E63;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=584;Top=663;Right=874;Bottom=790;" subject="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" seqno="1" style="DUID=8CB9A886;NSL=0;"/>
-					<element geometry="Left=1051;Top=126;Right=1222;Bottom=196;" subject="EAID_BB1AAA4C_E66B_4fde_A0B6_1A30FC13503B" seqno="2" style="DUID=48A006E9;NSL=0;"/>
-					<element geometry="Left=584;Top=125;Right=874;Bottom=195;" subject="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" seqno="3" style="DUID=DDD85E4C;NSL=0;"/>
-					<element geometry="Left=1005;Top=419;Right=1156;Bottom=457;" subject="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3" seqno="4" style="DUID=42ABAFB8;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=123;Top=381;Right=394;Bottom=451;" subject="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" seqno="5" style="DUID=C872A7A9;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=584;Top=375;Right=874;Bottom=457;" subject="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" seqno="6" style="DUID=0928599F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=435;Top=682;Right=550;Bottom=737;" subject="EAID_78B45A5F_C144_44a4_AA5E_1F31B11EAC62" seqno="1" style="DUID=6415052B;"/>
+					<element geometry="Left=584;Top=663;Right=874;Bottom=790;" subject="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" seqno="2" style="DUID=8CB9A886;NSL=0;"/>
+					<element geometry="Left=1051;Top=126;Right=1222;Bottom=196;" subject="EAID_BB1AAA4C_E66B_4fde_A0B6_1A30FC13503B" seqno="3" style="DUID=48A006E9;NSL=0;"/>
+					<element geometry="Left=584;Top=125;Right=874;Bottom=195;" subject="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" seqno="4" style="DUID=DDD85E4C;NSL=0;"/>
+					<element geometry="Left=1005;Top=419;Right=1156;Bottom=457;" subject="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3" seqno="5" style="DUID=42ABAFB8;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=123;Top=381;Right=394;Bottom=451;" subject="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" seqno="6" style="DUID=C872A7A9;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=584;Top=375;Right=874;Bottom=457;" subject="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" seqno="7" style="DUID=0928599F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="SX=-32;SY=0;EX=0;EY=35;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=144:CY=14:OX=28:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1104:-381$;" subject="EAID_B1577190_0947_4041_ACDC_BC0C377734AF" style="Mode=3;EOID=0928599F;SOID=48A006E9;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-66;SY=-16;EX=79;EY=19;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=94:OY=-135:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=-34:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0167DB54_9519_42f6_BD3B_F46B589F376C" style="Mode=3;EOID=0928599F;SOID=DDD85E4C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-144;SY=-7;EX=1;EY=28;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=104:CY=14:OX=93:OY=-115:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=-32:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_2ECAEC7F_2186_4280_A2C0_6DC585D1EE96" style="Mode=3;EOID=0928599F;SOID=DDD85E4C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -9047,20 +9979,21 @@
 					<element geometry="SX=95;SY=0;EX=95;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=77:CY=14:OX=68:OY=-108:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=-31:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_87DEA454_B158_4e44_91D6_F1D258049A37" style="Mode=3;EOID=0928599F;SOID=DDD85E4C;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=6;SY=-19;EX=4;EY=-7;$LLB=;LLT=;LMT=;LMB=;LRT=CX=74:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_30CBA4D5_2CA0_4043_A8BC_8FBCF102380D" style="Mode=3;EOID=42ABAFB8;SOID=0928599F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=18;SY=0;EX=0;EY=9;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=26:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1154:-407$;" subject="EAID_F70CA1D5_5E5E_4028_8583_6B810BB672CD" style="Mode=3;EOID=0928599F;SOID=48A006E9;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-14;SY=-3;EX=-93;EY=-16;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=98:OY=17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_75378C4F_ABAD_440f_8E1B_502A7CDA0486" style="Mode=3;EOID=0928599F;SOID=8CB9A886;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-56;SY=0;EX=-56;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=107:CY=14:OX=96:OY=17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_73E249AD_BE82_405c_AC1C_956CD538804F" style="Mode=3;EOID=0928599F;SOID=8CB9A886;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=4;SY=16;EX=4;EY=16;$LLB=;LLT=;LMT=;LMB=;LRT=CX=133:CY=14:OX=-27:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_65E8EC44_CB4C_4aa9_8218_75D01ED44538" style="Mode=3;EOID=0928599F;SOID=C872A7A9;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=4;SY=-17;EX=4;EY=-17;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=135:CY=14:OX=-24:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_95D24239_8F4D_44c8_97D1_1C26296607DA" style="Mode=3;EOID=0928599F;SOID=C872A7A9;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=0;SY=0;EX=-50;EY=-6;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=92:OY=24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F9F5CFA7_D31A_4c48_80EF_346FB3152195" style="Mode=3;EOID=0928599F;SOID=8CB9A886;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-42;SY=-2;EX=-92;EY=-8;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=92:OY=24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F9F5CFA7_D31A_4c48_80EF_346FB3152195" style="Mode=3;EOID=0928599F;SOID=8CB9A886;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-35;SY=59;EX=-145;EY=-4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=104:CY=14:OX=95:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_8C56C81B_B46D_49ef_B3BF_333FDA416F39" style="Mode=3;EOID=0928599F;SOID=8CB9A886;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=53;SY=-3;EX=145;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=94:CY=14:OX=84:OY=24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3D54F6F9_658D_40fe_9D16_D79F46DB945C" style="Mode=3;EOID=0928599F;SOID=8CB9A886;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=1;SY=-3;EX=1;EY=-9;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=125:CY=14:OX=115:OY=23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_45480564_D6B2_41da_8694_DC63D52825C1" style="Mode=3;EOID=0928599F;SOID=8CB9A886;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=20;SY=-2;EX=98;EY=-21;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=175:CY=14:OX=160:OY=17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_5C5BD66A_585D_4646_9A7B_894EA99DED44" style="Mode=3;EOID=0928599F;SOID=8CB9A886;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=10;SY=-4;EX=52;EY=-16;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=150:CY=14:OX=137:OY=17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F93A2AAD_C014_4fa4_88EE_23DE2339DB3C" style="Mode=3;EOID=0928599F;SOID=8CB9A886;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=24;SY=-2;EX=24;EY=-8;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=125:CY=14:OX=116:OY=19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_45480564_D6B2_41da_8694_DC63D52825C1" style="Mode=3;EOID=0928599F;SOID=8CB9A886;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=29;SY=-2;EX=107;EY=-21;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=175:CY=14:OX=160:OY=17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_5C5BD66A_585D_4646_9A7B_894EA99DED44" style="Mode=3;EOID=0928599F;SOID=8CB9A886;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=26;SY=-3;EX=68;EY=-15;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=150:CY=14:OX=137:OY=17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F93A2AAD_C014_4fa4_88EE_23DE2339DB3C" style="Mode=3;EOID=0928599F;SOID=8CB9A886;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=58;SY=6;EX=-21;EY=-7;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=98:OY=17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_75378C4F_ABAD_440f_8E1B_502A7CDA0486" style="Mode=3;EOID=0928599F;SOID=8CB9A886;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=131;SY=-4;EX=131;EY=-4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=75:CY=14:OX=66:OY=-104:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=-36:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_770594A4_09FD_4b6e_8D27_8D44BA5CA36A" style="Mode=3;EOID=0928599F;SOID=DDD85E4C;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_0E0367BE_EF6C_459c_9C87_3B64208EE574">
-				<model package="EAPK_9F90CA42_2AD5_4086_8537_A3D0531D27FD" localID="408" owner="EAPK_9F90CA42_2AD5_4086_8537_A3D0531D27FD" tpos="4"/>
+				<model package="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" localID="408" owner="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" tpos="4"/>
 				<properties name="abstract container" type="Logical"/>
 				<project author="andreea" version="1.0" created="2023-02-08 15:56:53" modified="2024-03-13 16:06:25"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
@@ -9112,48 +10045,52 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_9F7EC64C_05DC_429f_B68B_6CE04C3F8991">
-				<model package="EAPK_9F90CA42_2AD5_4086_8537_A3D0531D27FD" localID="421" owner="EAPK_9F90CA42_2AD5_4086_8537_A3D0531D27FD" tpos="7"/>
+				<model package="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" localID="421" owner="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" tpos="7"/>
 				<properties name="despatch roles" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-03-07 17:16:42" modified="2023-07-14 14:16:01"/>
+				<project author="andreea" version="1.0" created="2023-03-07 17:16:42" modified="2024-06-25 16:55:35"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=DF4097FD;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=02BCE252;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=94;Top=200;Right=293;Bottom=270;" subject="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6" seqno="1" style="DUID=4A110E01;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1005;Top=429;Right=1095;Bottom=499;" subject="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E" seqno="2" style="DUID=0FEEEEAC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=476;Top=429;Right=566;Bottom=499;" subject="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184" seqno="3" style="DUID=EC1A1044;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=641;Top=429;Right=731;Bottom=499;" subject="EAID_CE66C7F9_83F7_479f_89C7_9BC5ACC1EEFB" seqno="4" style="DUID=8D7B03F0;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=149;Top=429;Right=239;Bottom=499;" subject="EAID_78459D23_BCB4_42bb_83F6_F9D8F550B19D" seqno="5" style="DUID=B4EA321A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=476;Top=172;Right=731;Bottom=299;" subject="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" seqno="6" style="DUID=F9CF8FE0;NSL=0;"/>
-					<element geometry="Left=1289;Top=217;Right=1395;Bottom=287;" subject="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D" seqno="7" style="DUID=A18501E8;NSL=0;"/>
-					<element geometry="Left=883;Top=217;Right=998;Bottom=287;" subject="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" seqno="8" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=F58747E9;"/>
-					<element geometry="Left=793;Top=429;Right=883;Bottom=499;" subject="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695" seqno="9" style="NSL=0;DUID=C6434902;"/>
-					<element geometry="Left=1128;Top=415;Right=1345;Bottom=513;" subject="EAID_96B284C4_E759_4bad_9655_04521F703750" seqno="10" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=560F1C09;"/>
-					<element geometry="Left=1376;Top=429;Right=1466;Bottom=499;" subject="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" seqno="11" style="DUID=5EFFB351;NSL=0;"/>
-					<element geometry="Left=896;Top=429;Right=986;Bottom=499;" subject="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3" seqno="12" style="DUID=FE9E0A66;NSL=0;"/>
+					<element geometry="Left=534;Top=557;Right=649;Bottom=658;" subject="EAID_37B4C249_5774_4d78_8572_20C458910F29" seqno="1" style="DUID=B911E23D;"/>
+					<element geometry="Left=398;Top=430;Right=506;Bottom=500;" subject="EAID_0D5BCA5B_42CB_4202_9453_012E0A141952" seqno="2" style="DUID=DE117DF7;"/>
+					<element geometry="Left=94;Top=200;Right=293;Bottom=270;" subject="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6" seqno="3" style="DUID=4A110E01;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1005;Top=429;Right=1095;Bottom=499;" subject="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E" seqno="4" style="DUID=0FEEEEAC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=546;Top=429;Right=636;Bottom=499;" subject="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184" seqno="5" style="DUID=EC1A1044;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=666;Top=429;Right=756;Bottom=499;" subject="EAID_CE66C7F9_83F7_479f_89C7_9BC5ACC1EEFB" seqno="6" style="DUID=8D7B03F0;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=149;Top=429;Right=239;Bottom=499;" subject="EAID_78459D23_BCB4_42bb_83F6_F9D8F550B19D" seqno="7" style="DUID=B4EA321A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=476;Top=172;Right=731;Bottom=299;" subject="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" seqno="8" style="DUID=F9CF8FE0;NSL=0;"/>
+					<element geometry="Left=1289;Top=217;Right=1395;Bottom=287;" subject="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D" seqno="9" style="DUID=A18501E8;NSL=0;"/>
+					<element geometry="Left=883;Top=217;Right=1004;Bottom=287;" subject="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" seqno="10" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=F58747E9;"/>
+					<element geometry="Left=793;Top=429;Right=883;Bottom=499;" subject="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695" seqno="11" style="NSL=0;DUID=C6434902;"/>
+					<element geometry="Left=1128;Top=415;Right=1345;Bottom=513;" subject="EAID_96B284C4_E759_4bad_9655_04521F703750" seqno="12" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=560F1C09;"/>
+					<element geometry="Left=1376;Top=429;Right=1466;Bottom=499;" subject="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" seqno="13" style="DUID=5EFFB351;NSL=0;"/>
+					<element geometry="Left=896;Top=429;Right=986;Bottom=499;" subject="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3" seqno="14" style="DUID=FE9E0A66;NSL=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A4C29886_C9D8_48eb_A107_DA46C0358E53" style="Mode=3;EOID=EC1A1044;SOID=B911E23D;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=24;SY=-30;EX=6;EY=34;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=52:OY=-25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1070:-209$;" subject="EAID_06DB4B0B_7B20_475e_895E_9E7177239DE8" style="Mode=1;EOID=5EFFB351;SOID=A18501E8;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-33;SY=-35;EX=5;EY=48;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=98:CY=14:OX=53:OY=-27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=816:-219$;" subject="EAID_8C74AF3F_89A0_4039_8257_A68F3DC30CC3" style="Mode=1;EOID=560F1C09;SOID=A18501E8;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-42;SY=1;EX=-42;EY=1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=153:CY=14:OX=-4:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-13:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0A78D73E_7BA7_4bf0_9D36_DD776DFC8538" style="Mode=3;EOID=A18501E8;SOID=F58747E9;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=3;EX=0;EY=-6;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=122:CY=14:OX=18:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D6B12A9D_029A_4c46_9583_5FF42CA3E096" style="Mode=3;EOID=F9CF8FE0;SOID=F58747E9;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=13;SY=-1;EX=13;EY=-1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=111:CY=14:OX=63:OY=-22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_95042A72_F34F_4e88_A8B6_7BE5B0CB8B20" style="Mode=3;EOID=0FEEEEAC;SOID=F58747E9;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=3;SX=-12;SY=0;EX=-12;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=112:CY=14:OX=74:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=9:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_850FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD" style="Mode=3;EOID=C6434902;SOID=F58747E9;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;SX=-12;SY=0;EX=-12;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=112:CY=14:OX=75:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=9:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_850FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD" style="Mode=3;EOID=C6434902;SOID=F58747E9;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=116:CY=14:OX=70:OY=-54:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=5:OY=6:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_E91C243F_824F_48fd_8601_BEA52AB5E730" style="Mode=3;EOID=FE9E0A66;SOID=F58747E9;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=-4;SY=-30;EX=-4;EY=-29;$LLB=;LLT=;LMT=;LMB=;LRT=CX=157:CY=14:OX=16:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_22815C4E_A421_45ce_B940_8E07DDB6E493" style="Mode=3;EOID=4A110E01;SOID=F9CF8FE0;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=2;SY=27;EX=2;EY=28;$LLB=;LLT=;LMT=;LMB=;LRT=CX=158:CY=14:OX=13:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1D18BED8_E786_4a53_A9AC_93AD55744288" style="Mode=3;EOID=4A110E01;SOID=F9CF8FE0;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=166:CY=14:OX=14:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_783AAD71_420E_40ee_B221_B2A54F890D2D" style="Mode=3;EOID=4A110E01;SOID=F9CF8FE0;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-17;SY=-2;EX=-17;EY=-2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87:CY=14:OX=71:OY=-40:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3C454BB2_FC26_49ad_948C_F84C001C68E4" style="Mode=3;EOID=EC1A1044;SOID=F9CF8FE0;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-13;SY=-63;EX=-1;EY=-5;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87:CY=14:OX=71:OY=-40:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3C454BB2_FC26_49ad_948C_F84C001C68E4" style="Mode=3;EOID=EC1A1044;SOID=F9CF8FE0;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=3;SY=0;EX=3;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=127:CY=14:OX=66:OY=-18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4D018782_9090_4ec2_95E6_BC660BB6F161" style="Mode=3;EOID=8D7B03F0;SOID=F9CF8FE0;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-18;SY=0;EX=-18;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=137:CY=14:OX=117:OY=-18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_C466B869_99C4_4539_8CD9_ECD02C462F1D" style="Mode=3;EOID=DE117DF7;SOID=F9CF8FE0;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=2;SY=-4;EX=2;EY=-4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=84:CY=14:OX=62:OY=-35:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F48C13D8_6CDE_4da6_A4A1_7512C3E0591E" style="Mode=3;EOID=B4EA321A;SOID=4A110E01;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_1BD1C3F1_A1B2_4395_9499_3C88CA228A42">
-				<model package="EAPK_9F90CA42_2AD5_4086_8537_A3D0531D27FD" localID="444" owner="EAPK_9F90CA42_2AD5_4086_8537_A3D0531D27FD" tpos="3"/>
+				<model package="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" localID="444" owner="EAPK_2862E732_468C_425f_AB69_5F67101EF9E1" tpos="3"/>
 				<properties name="despatch advice allowance charge" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-04-24 11:04:32" modified="2023-09-11 18:15:55"/>
+				<project author="andreea" version="1.0" created="2023-04-24 11:04:32" modified="2024-07-23 10:30:24"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=980A90E4;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=E1FCF6B1;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
@@ -9165,43 +10102,46 @@
 					<element geometry="Left=857;Top=254;Right=1124;Bottom=352;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="5" style="DUID=07C505DB;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=556;Top=138;Right=751;Bottom=208;" subject="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" seqno="6" style="DUID=E0069E36;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=451;Top=268;Right=751;Bottom=338;" subject="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" seqno="7" style="DUID=ED9B95B0;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=542;Top=415;Right=659;Bottom=456;" subject="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" seqno="8" style="DUID=57BC767B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=542;Top=415;Right=659;Bottom=470;" subject="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" seqno="8" style="DUID=57BC767B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=136;Top=371;Right=391;Bottom=498;" subject="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" seqno="9" style="DUID=AA79A031;NSL=0;"/>
 					<element geometry="Left=128;Top=102;Right=399;Bottom=172;" subject="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" seqno="10" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=EE5BB57D;"/>
 					<element geometry="Left=207;Top=237;Right=328;Bottom=307;" subject="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" seqno="11" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=8906E3A9;"/>
-					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_202AF5A1_B4FE_48a4_91D4_F6387465413F" style="Mode=3;EOID=07C505DB;SOID=ED9B95B0;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-18;SY=0;EX=-19;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=149:CY=14:OX=80:OY=18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_AF8C5388_D443_4b59_918C_44D86E9AC3CF" style="Mode=3;EOID=46C2772C;SOID=ED9B95B0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=5;SY=0;EX=5;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=122:CY=14:OX=63:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D6B12A9D_029A_4c46_9583_5FF42CA3E096" style="Mode=3;EOID=AA79A031;SOID=8906E3A9;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_569C582B_2F50_4a11_B7B6_50CA2F0A9B94" style="Mode=3;EOID=07C505DB;SOID=AA79A031;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=60;SY=-63;EX=60;EY=-49;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_5009F883_10B2_4e9c_96A3_A1F92BE8EA63" style="Mode=3;EOID=07C505DB;SOID=AA79A031;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=148:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_053FA551_E0F4_4d8a_9787_DB2496C70148" style="Mode=3;EOID=57BC767B;SOID=AA79A031;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;SX=-7;SY=21;EX=-7;EY=9;$LLB=;LLT=;LMT=;LMB=;LRT=CX=148:CY=14:OX=2:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_053FA551_E0F4_4d8a_9787_DB2496C70148" style="Mode=3;EOID=57BC767B;SOID=AA79A031;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=-45;EX=-121;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=869:-479$;" subject="EAID_2E9FE66A_E025_4563_9A59_461990838D96" style="Mode=3;EOID=07C505DB;SOID=AA79A031;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
-					<element geometry="EDGE=1;SX=-1;SY=0;EX=-1;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D8788651_B092_4dea_82FA_E8F122CD0638" style="Mode=3;EOID=ED9B95B0;SOID=57BC767B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-56;EX=103;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=147:CY=14:OX=115:OY=53:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1093:-490$;" subject="EAID_A287E36F_7CEB_4668_B1A5_01DDEE025D3A" style="Mode=3;EOID=07C505DB;SOID=AA79A031;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=4;SY=-41;EX=-4;EY=-14;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=107:CY=14:OX=-12:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_6DA6B6C9_7964_4102_A413_050778056B72" style="Mode=3;EOID=57BC767B;SOID=AA79A031;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=130:CY=14:OX=63:OY=20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_121E7032_36A3_4c8b_8FFF_C8B67B4CF87D" style="Mode=3;EOID=EE5BB57D;SOID=8906E3A9;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-18;SY=0;EX=-19;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=149:CY=14:OX=80:OY=18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_AF8C5388_D443_4b59_918C_44D86E9AC3CF" style="Mode=3;EOID=46C2772C;SOID=ED9B95B0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=144:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4F4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38" style="Mode=3;EOID=57BC767B;SOID=8D0EC452;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_516CC611_B255_4c67_AAF8_2E19960E553F" style="Mode=3;EOID=07C505DB;SOID=ED9B95B0;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-37;SY=-3;EX=-37;EY=-3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=139:CY=14:OX=55:OY=25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_47E28283_E9BB_4790_9AB4_37A6F31DF36A" style="Mode=3;EOID=07C505DB;SOID=8D0EC452;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_202AF5A1_B4FE_48a4_91D4_F6387465413F" style="Mode=3;EOID=07C505DB;SOID=ED9B95B0;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=22;SY=-1;EX=22;EY=-1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=62:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_2EEE05CA_6A1E_4946_A54F_BC6967C07ADF" style="Mode=3;EOID=E0069E36;SOID=ED9B95B0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=23;SY=2;EX=23;EY=2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=50:OY=11:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0D4101FD_7720_417c_B62C_6F674CDB3888" style="Mode=3;EOID=3495A676;SOID=E0069E36;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-14;SY=-4;EX=-14;EY=-4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=57:OY=14:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4D92CD55_08CD_4d21_806C_38F93CA90719" style="Mode=3;EOID=8825FB8E;SOID=E0069E36;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=-69;EY=0;SX=0;SY=-19;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85:CY=14:OX=41:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=921:-192$;" subject="EAID_87123434_C2AD_43de_925D_13E9A7667A18" style="Mode=3;EOID=07C505DB;SOID=E0069E36;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=37;EY=0;SX=0;SY=14;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=82:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1027:-159$;" subject="EAID_470D1B16_C07B_4868_91B2_799578663395" style="Mode=3;EOID=07C505DB;SOID=E0069E36;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=2;SY=6;EX=2;EY=6;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=130:CY=14:OX=64:OY=16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7" style="Mode=3;EOID=07C505DB;SOID=8D0EC452;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_516CC611_B255_4c67_AAF8_2E19960E553F" style="Mode=3;EOID=07C505DB;SOID=ED9B95B0;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=40;SY=6;EX=40;EY=6;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=130:CY=14:OX=72:OY=13:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7" style="Mode=3;EOID=07C505DB;SOID=8D0EC452;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=4;EX=0;EY=-8;SX=0;SY=-8;$LLB=;LLT=;LMT=;LMB=;LRT=CX=144:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4F4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38" style="Mode=3;EOID=57BC767B;SOID=8D0EC452;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-1;SY=0;EX=-1;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D8788651_B092_4dea_82FA_E8F122CD0638" style="Mode=3;EOID=ED9B95B0;SOID=57BC767B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_14ABD635_4FA5_417e_86EB_10A484C84B2B">
-				<model package="EAPK_BA11696D_6ACD_40f7_958C_DB383E6E89FD" localID="489" owner="EAPK_BA11696D_6ACD_40f7_958C_DB383E6E89FD"/>
+				<model package="EAPK_007403A6_1B13_47c8_AAFD_D00C4DF6FA72" localID="489" owner="EAPK_007403A6_1B13_47c8_AAFD_D00C4DF6FA72"/>
 				<properties name="receipt advice" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-09-27 15:58:34" modified="2024-07-09 16:20:23"/>
+				<project author="andreea" version="1.0" created="2023-09-27 15:58:34" modified="2024-07-11 13:52:11"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=33346121;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=36CFA4C7;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
 					<element geometry="Left=1225;Top=142;Right=1315;Bottom=202;" subject="EAID_274424DF_415D_400f_99C0_FDA108C74C7A" seqno="1" style="DUID=846069FE;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=999;Top=51;Right=1089;Bottom=111;" subject="EAID_C3684D7C_E07D_415a_B935_B52376928738" seqno="2" style="DUID=2876C4F0;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=88;Top=125;Right=334;Bottom=239;" subject="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" seqno="3" style="DUID=80169286;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=125;Top=285;Right=296;Bottom=355;" subject="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" seqno="4" style="DUID=BB60E30F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=118;Top=130;Right=364;Bottom=244;" subject="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" seqno="3" style="DUID=80169286;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=125;Top=285;Right=357;Bottom=355;" subject="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" seqno="4" style="DUID=BB60E30F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=570;Top=298;Right=660;Bottom=340;" subject="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" seqno="5" style="DUID=2DD44606;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=478;Top=144;Right=673;Bottom=284;" subject="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" seqno="6" style="DUID=FDE32EC3;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=977;Top=154;Right=1111;Bottom=189;" subject="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" seqno="7" style="DUID=545F8CB2;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
@@ -9241,12 +10181,12 @@
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=161:CY=14:OX=92:OY=27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B2AD75A2_6A44_447c_856D_A5FD0F996EF5" style="Mode=3;EOID=BEB178B7;SOID=CE99C1B4;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=7;SY=45;EX=7;EY=43;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=107:CY=14:OX=22:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_76005691_B905_4be3_99BF_394E56A591CE" style="Mode=3;EOID=85356D08;SOID=9AE9AF1A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=584;SCTR.TOP=-148;SCTR.RIGHT=620;SCTR.BOTTOM=-121;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=70:OY=-21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=620:-144$620:-121$584:-121$584:-144$;" subject="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9" style="Mode=3;EOID=FDE32EC3;SOID=FDE32EC3;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=333;SCTR.TOP=-150;SCTR.RIGHT=364;SCTR.BOTTOM=-135;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=334:-150$364:-150$364:-135$334:-135$;" subject="EAID_AF2B738F_531D_4495_9397_CE5771200854" style="Mode=3;EOID=80169286;SOID=80169286;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=333;SCTR.TOP=-150;SCTR.RIGHT=364;SCTR.BOTTOM=-135;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=334:-150$364:-150$364:-135$334:-135$;" subject="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991" style="Mode=3;EOID=80169286;SOID=80169286;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=333;SCTR.TOP=-150;SCTR.RIGHT=364;SCTR.BOTTOM=-135;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=334:-150$364:-150$364:-135$334:-135$;" subject="EAID_574DB5D8_4929_4670_9014_608B3C5534ED" style="Mode=3;EOID=80169286;SOID=80169286;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=363;SCTR.TOP=-155;SCTR.RIGHT=394;SCTR.BOTTOM=-140;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=364:-155$394:-155$394:-140$364:-140$;" subject="EAID_AF2B738F_531D_4495_9397_CE5771200854" style="Mode=3;EOID=80169286;SOID=80169286;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=363;SCTR.TOP=-155;SCTR.RIGHT=394;SCTR.BOTTOM=-140;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=364:-155$394:-155$394:-140$364:-140$;" subject="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991" style="Mode=3;EOID=80169286;SOID=80169286;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=363;SCTR.TOP=-155;SCTR.RIGHT=394;SCTR.BOTTOM=-140;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=364:-155$394:-155$394:-140$364:-140$;" subject="EAID_574DB5D8_4929_4670_9014_608B3C5534ED" style="Mode=3;EOID=80169286;SOID=80169286;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65" style="Mode=3;EOID=85356D08;SOID=80169286;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=333;SCTR.TOP=-150;SCTR.RIGHT=364;SCTR.BOTTOM=-135;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=334:-150$364:-150$364:-135$334:-135$;" subject="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24" style="Mode=3;EOID=80169286;SOID=80169286;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=333;SCTR.TOP=-150;SCTR.RIGHT=364;SCTR.BOTTOM=-135;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=334:-150$364:-150$364:-135$334:-135$;" subject="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F" style="Mode=3;EOID=80169286;SOID=80169286;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=363;SCTR.TOP=-155;SCTR.RIGHT=394;SCTR.BOTTOM=-140;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=364:-155$394:-155$394:-140$364:-140$;" subject="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24" style="Mode=3;EOID=80169286;SOID=80169286;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=363;SCTR.TOP=-155;SCTR.RIGHT=394;SCTR.BOTTOM=-140;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=364:-155$394:-155$394:-140$364:-140$;" subject="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F" style="Mode=3;EOID=80169286;SOID=80169286;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=92:CY=14:OX=51:OY=20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807" style="Mode=3;EOID=80169286;SOID=BB60E30F;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=4;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_AA589EDA_B26B_44c3_BCCC_37421BA960DE" style="Mode=3;EOID=BB60E30F;SOID=2DD44606;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-24;SY=17;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=570:-563$;" subject="EAID_0AC5D04E_7364_4118_9D94_CE93A68B3CF9" style="Mode=3;EOID=85356D08;SOID=2DD44606;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
@@ -9261,7 +10201,7 @@
 					<element geometry="EX=0;EY=-57;SX=112;SY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=135:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=751:-271$;" subject="EAID_6ADD570C_FEF5_4342_A009_CBC3D19B20B5" style="Mode=3;EOID=FDE32EC3;SOID=E1FC4763;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=-49;EY=0;SX=0;SY=15;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=135:CY=14:OX=85:OY=-26:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=219:-419$;" subject="EAID_95D24239_8F4D_44c8_97D1_1C26296607DA" style="Mode=3;EOID=85356D08;SOID=E1FC4763;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=56;EY=0;SX=0;SY=-14;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=133:CY=14:OX=85:OY=-52:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=324:-448$;" subject="EAID_65E8EC44_CB4C_4aa9_8218_75D01ED44538" style="Mode=3;EOID=85356D08;SOID=E1FC4763;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-5;SY=-1;EX=-5;EY=-1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=59:OY=17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B0259612_87E6_4f34_A3AA_B5B7E513AEA0" style="Mode=3;EOID=2DD44606;SOID=E1FC4763;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-5;SY=-1;EX=-5;EY=-1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=59:OY=17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B0259612_87E6_4f34_A3AA_B5B7E513AEA0" style="Mode=3;EOID=2DD44606;SOID=E1FC4763;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=614;SCTR.TOP=-145;SCTR.RIGHT=663;SCTR.BOTTOM=-115;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=663:-144$663:-115$614:-115$614:-144$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=FDE32EC3;SOID=FDE32EC3;Color=-1;LWidth=0;Hidden=1;"/>
 				</elements>
 			</diagram>
diff --git a/implementation/eInvoicing/model2owl-config/config-parameters.xsl b/implementation/eInvoicing/model2owl-config/config-parameters.xsl
new file mode 100644
index 00000000..d1a6aea6
--- /dev/null
+++ b/implementation/eInvoicing/model2owl-config/config-parameters.xsl
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" exclude-result-prefixes="xd xsl dc fn"
+    xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:dct="http://purl.org/dc/terms/" xmlns:fn="http://www.w3.org/2005/xpath-functions"
+    xmlns:functx="http://www.functx.com" xmlns:owl="http://www.w3.org/2002/07/owl#"
+    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:vann="http://purl.org/vocab/vann/"
+    version="3.0">
+
+    <xd:doc scope="stylesheet">
+        <xd:desc>
+            <xd:p><xd:b>Created on:</xd:b> Mar 22, 2020</xd:p>
+            <xd:p><xd:b>Author:</xd:b> lps</xd:p>
+            <xd:p>This module defines project level variables and parameters</xd:p>
+        </xd:desc>
+    </xd:doc>
+
+
+
+    <!-- a set of prefix-baseURI definitions -->
+    <xsl:variable name="namespacePrefixes" select="fn:doc('namespaces.xml')"/>
+
+    <!-- a mapping between UML atomic types to XSD datatypes  -->
+    <xsl:variable name="umlDataTypesMapping" select="fn:doc('umlToXsdDataTypes.xml')"/>
+
+    <!-- XSD datatypes that conform to OWL2 requirements   -->
+    <xsl:variable name="xsdAndRdfDataTypes" select="fn:doc('xsdAndRdfDataTypes.xml')"/>
+    <!--    set default namespace interpretation for lexical Qnames that are not prefix:localSegment or :localSegment. If this 
+    is set to true localSegment will transform to :localSegment-->
+    <xsl:variable name="defaultNamespaceInterpretation" select="fn:true()"/>
+
+    <!-- Ontology base URI, configure as necessary. Do not use a trailing local delimiter 
+        like in the namespace definition-->
+    <!--<xsl:variable name="base-uri" select="'http://publications.europa.eu/ontology/ePO'"/>-->
+    <xsl:variable name="base-ontology-uri" select="'http://data.europa.eu/a4g/ontology'"/>
+    <xsl:variable name="base-shape-uri" select="'http://data.europa.eu/a4g/data-shape'"/>
+    <xsl:variable name="base-restriction-uri" select="$base-ontology-uri"/>
+    <!--    Shapes Module URI-->
+    <xsl:variable name="shapeArtefactURI"
+        select="fn:concat($base-shape-uri, $defaultDelimiter, $moduleReference, '-shape')"/>
+    <!--    Restrictions Module URI-->
+    <xsl:variable name="restrictionsArtefactURI"
+        select="fn:concat($base-restriction-uri, $defaultDelimiter, $moduleReference, '-restriction')"/>
+    <!--    Core Module URI-->
+    <xsl:variable name="coreArtefactURI"
+        select="fn:concat($base-ontology-uri, $defaultDelimiter, $moduleReference)"/>
+
+    <!-- when a delimiter is missing in the base URI of a namespace, use this default value-->
+    <xsl:variable name="defaultDelimiter" select="'#'"/>
+
+    <!-- types of elements and names for attribute types that are acceptable to produce object properties -->
+    <xsl:variable name="acceptableTypesForObjectProperties"
+        select="('epo:Identifier', 'rdfs:Literal')"/>
+    <!--    the type of attributes which takes values from a controlled list-->
+    <xsl:variable name="controlledListType" select="'epo:Code'"/>
+    <!-- Acceptable stereotypes -->
+    <xsl:variable name="stereotypeValidOnAttributes" select="()"/>
+    <xsl:variable name="stereotypeValidOnObjects" select="()"/>
+    <xsl:variable name="stereotypeValidOnGeneralisations"
+        select="('Disjoint', 'Equivalent', 'Complete')"/>
+    <xsl:variable name="stereotypeValidOnAssociations" select="()"/>
+    <xsl:variable name="stereotypeValidOnDependencies" select="('Disjoint', 'disjoint', 'join')"/>
+    <xsl:variable name="stereotypeValidOnClasses" select="('Abstract')"/>
+    <xsl:variable name="stereotypeValidOnDatatypes" select="()"/>
+    <xsl:variable name="stereotypeValidOnEnumerations" select="()"/>
+    <xsl:variable name="stereotypeValidOnPackages" select="()"/>
+
+    <xsl:variable name="abstractClassesStereotypes" select="('Abstract', 'abstract class', 'abstract')"/>
+
+    <!--    This variable controls whether the enumeration items are transformed into skos concepts or ignored-->
+    <xsl:variable name="enableGenerationOfSkosConcept" select="fn:false()"/>
+
+    <!--    This variable controls whether the enumerations are transformed into skos schemes or ignored-->
+    <xsl:variable name="enableGenerationOfConceptSchemes" select="fn:false()"/>
+
+    <!--Allowed characters for a normalized string-->
+    <xsl:variable name="allowedStrings" select="'^[\w\d-_:]+$'"/>
+
+    <!--    Generate reused classes, attributes and connectors-->
+    <xsl:variable name="generateReusedConcepts" select="fn:true()"/>
+
+
+    <xsl:variable name="reference-to-external-classes-in-glossary" select="fn:true()"/>
+
+    <xsl:variable name="generateObjectsAndRealisations" select="fn:false()"/>
+
+    <xsl:variable name="conventionReportCopyrightText" select="'Publications Office of the European Union, 2023'"/>
+    <xsl:variable name="conventionReportAuthor" select="'Publications Office of the European Union'"/>
+    <xsl:variable name="conventionReportAuthorLocation" select="'Luxembourg'"/>
+    <xsl:variable name="conventionReportAuthorWebsite" select="'https://op.europa.eu'"/>
+    <xsl:variable name="conventionReportUMLModelName" select="'eProcurement'"/>
+
+    <!-- _______________________________________________________________________   -->
+    <!--                            METADATA SECTION                               -->
+    <!-- _______________________________________________________________________   -->
+    <!--    This section contains the variables used to build the ontology metadata-->
+    <xsl:variable name="moduleReference" select="'inv'"/>
+    <!--    rdfs:label -->
+    <xsl:variable name="ontologyLabelCore" select="'eProcurement Ontology Invoicing - core'"/>
+    <xsl:variable name="ontologyLabelRestrictions" select="'eProcurement Ontology Invoicing - core restrictions'"/>
+    <xsl:variable name="ontologyLabelShapes" select="'eProcurement Ontology Invoicing - core shapes'"/>
+    <!--    dct:title -->
+    <xsl:variable name="ontologyTitleCore" select="'eProcurement Ontology Invoicing - core'"/>
+    <xsl:variable name="ontologyTitleRestrictions" select="'eProcurement Ontology Invoicing - core restrictions'"/>
+    <xsl:variable name="ontologyTitleShapes" select="'eProcurement Ontology Invoicing - core shapes'"/>
+    <!--    dct:description-->
+    <xsl:variable name="ontologyDescriptionCore"
+        select="'The eProcurement Ontology Invoicing core describes the concepts and properties representing the European Public Procurement Invoicing domain. The provision of these semantics offers the basis for a common understanding of the domain for all stakeholders ensuring the quality of data exchange and transparency. The ontology restrictions are published in a separate artefact.'"/>
+    <xsl:variable name="ontologyDescriptionRestrictions"
+        select="'The eProcurement Ontology Invoicing core restrictions provides the restrictions and the inference-related specifications on the concepts and properties in the eProcurement Ontology Invoicing core.'"/>
+    <xsl:variable name="ontologyDescriptionShapes"
+        select="'The eProcurement Ontology Invoicing core shapes provides the generic datashape specifications for the eProcurement Ontology Invoicing core.'"/>
+    <!--    rdfs:seeAlso -->
+    <xsl:variable name="seeAlsoResources"
+        select="
+            ('https://github.com/OP-TED/ePO/releases',
+            'https://joinup.ec.europa.eu/collection/eprocurement/solution/eprocurement-ontology/about',
+            'https://op.europa.eu/en/web/eu-vocabularies/e-procurement',
+            'https://docs.ted.europa.eu/home/index.html')"/>
+    <!--    dct:issued-->
+    <xsl:variable name="issuedDate" select="format-date(current-date(), '[Y0001]-[M01]-[D01]')"/>
+    <!--    owl:incompatibleWith -->
+    <xsl:variable name="incompatibleWith" select="'3.1.0'"/>
+    <!--    owl:versionInfo -->
+    <xsl:variable name="versionInfo" select="'4.2.0'"/>
+    <!--    bibo:status-->
+    <xsl:variable name="ontologyStatus" select="'Semantic Specification Release'"/>
+    <!--    owl:priorVersion -->
+    <xsl:variable name="priorVersion" select="'4.1.0'"/>
+    <!--    vann:preferredNamespaceUri -->
+    <xsl:variable name="preferredNamespaceUri" select="'http://data.europa.eu/a4g/ontology#'"/>
+    <!--    vann:preferredNamespacePrefix -->
+    <xsl:variable name="preferredNamespacePrefix" select="'epo'"/>
+    <!--    dct:license-->
+    <xsl:variable name="licenseLiteral" select="'© European Union, 2014. Unless otherwise noted, the reuse of the Ontology is authorised under the European Union Public Licence v1.2 (https://eupl.eu/).'"/>
+    <!--    dct:created-->
+    <xsl:variable name="createdDate" select="'2021-06-01'"/>
+    <!--    dct:publisher-->
+    <xsl:variable name="publisher" select="'http://publications.europa.eu/resource/authority/corporate-body/PUBL'"/>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/implementation/eInvoicing/model2owl-config/namespaces.xml b/implementation/eInvoicing/model2owl-config/namespaces.xml
new file mode 100644
index 00000000..8e7e7eb3
--- /dev/null
+++ b/implementation/eInvoicing/model2owl-config/namespaces.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<prefixes xmlns="http://publications.europa.eu/ns/">
+    <prefix name="" value="http://data.europa.eu/a4g/ontology#"/>
+
+    <prefix name="owl" value="http://www.w3.org/2002/07/owl#"/>
+    <prefix name="rdf" value="http://www.w3.org/1999/02/22-rdf-syntax-ns#"/>
+    <prefix name="xml" value="http://www.w3.org/XML/1998/namespace"/>
+    <prefix name="xsd" value="http://www.w3.org/2001/XMLSchema#"/>
+    <prefix name="rdfs" value="http://www.w3.org/2000/01/rdf-schema#"/>
+
+    <prefix name="foaf" value="http://xmlns.com/foaf/0.1/" importURI="http://xmlns.com/foaf/0.1/"/>
+    <prefix name="dct" value="http://purl.org/dc/terms/" importURI="http://purl.org/dc/terms/"/>
+    <prefix name="org" value="http://www.w3.org/ns/org#" importURI="http://www.w3.org/ns/org#"/>
+    <prefix name="skos" value="http://www.w3.org/2004/02/skos/core#" importURI="http://www.w3.org/2004/02/skos/core"/>
+
+    <prefix name="epo" value="http://data.europa.eu/a4g/ontology#" importURI="http://data.europa.eu/a4g/ontology#core"/>
+    <prefix name="epo-cat" value="http://data.europa.eu/a4g/ontology#" importURI="http://data.europa.eu/a4g/ontology#cat"/>
+    <prefix name="epo-con" value="http://data.europa.eu/a4g/ontology#"/>
+    <prefix name="epo-ord" value="http://data.europa.eu/a4g/ontology#" importURI="http://data.europa.eu/a4g/ontology#ord"/>
+    <prefix name="epo-not" value="http://data.europa.eu/a4g/ontology#"/>
+    <prefix name="epo-ful" value="http://data.europa.eu/a4g/ontology#" importURI="http://data.europa.eu/a4g/ontology#ful"/>
+    <prefix name="epo-acc" value="http://data.europa.eu/a4g/ontology#"/>
+    <prefix name="epo-sub" value="http://data.europa.eu/a4g/ontology#"/>
+    <prefix name="epo-inv" value="http://data.europa.eu/a4g/ontology#"/>
+
+    <prefix name="nuts" value="http://data.europa.eu/nuts/"/>
+    <prefix name="espd" value="https://github.com/ESPD/ESPD-EDM/"/>
+    <prefix name="at-voc" value="http://publications.europa.eu/resource/authority/"/>
+    <prefix name="time" value="http://www.w3.org/2006/time#" importURI="http://www.w3.org/2006/time"/>
+    <prefix name="locn" value="http://www.w3.org/ns/locn#" importURI="http://www.w3.org/ns/locn"/>
+    <prefix name="cv" value="http://data.europa.eu/m8g/" importURI="http://data.europa.eu/m8g/"/>
+    <prefix name="core" value="http://data.europa.eu/m8g/" importURI="http://data.europa.eu/m8g/"/>
+    <prefix name="cpv" value="http://data.europa.eu/m8g/" importURI="http://data.europa.eu/m8g/"/>
+    <prefix name="cpsv" value="http://data.europa.eu/m8g/" importURI="http://data.europa.eu/m8g/"/>
+    <prefix name="cpov" value="http://data.europa.eu/m8g/" importURI="http://data.europa.eu/m8g/"/>
+    <prefix name="cccev" value="http://data.europa.eu/m8g/" importURI="http://data.europa.eu/m8g/"/>
+    <prefix name="geosparql" value="http://www.opengis.net/ont/geosparql#"/>
+    <prefix name="dul" value="http://www.ontologydesignpatterns.org/ont/dul/DUL.owl#"/>
+    <prefix name="person" value="http://www.w3.org/ns/person#" importURI="http://www.w3.org/ns/person"/>
+    <prefix name="at-voc-new" value="http://publications.europa.eu/resource/authority/new/" />
+    <prefix name="adms" value="http://www.w3.org/ns/adms#" importURI="http://www.w3.org/ns/adms"/>
+    <prefix name="vann" value="http://purl.org/vocab/vann/" importURI="http://purl.org/vocab/vann/"/>
+    <prefix name="eli" value="http://data.europa.eu/eli/ontology#" importURI="http://data.europa.eu/eli/ontology#"/>
+    <prefix name="frbroo" value="http://iflastandards.info/ns/fr/frbr/frbroo/" importURI="http://iflastandards.info/ns/fr/frbr/frbroo/"/>
+
+<!--    <prefix name="bibo" value="http://purl.org/ontology/bibo/"/>-->
+</prefixes>
\ No newline at end of file
diff --git a/implementation/eInvoicing/model2owl-config/umlToXsdDataTypes.xml b/implementation/eInvoicing/model2owl-config/umlToXsdDataTypes.xml
new file mode 100644
index 00000000..69bfd64d
--- /dev/null
+++ b/implementation/eInvoicing/model2owl-config/umlToXsdDataTypes.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mappings xmlns="http://publications.europa.eu/ns/">
+    
+    <!-- epo prefixed datatypes -->
+    <mapping>
+        <from  qname="epo:Indicator"/>
+        <to  qname="xsd:boolean"/>
+    </mapping>
+    <mapping>
+        <from  qname="epo:Date"/>
+        <to  qname="xsd:date"/>
+    </mapping>
+    <mapping>
+        <from  qname="epo:DateTime"/>
+        <to  qname="xsd:dateTime"/>
+    </mapping>    
+    <mapping>
+        <from  qname="epo:Numeric"/>
+        <to  qname="xsd:decimal"/>
+    </mapping>
+    <mapping>
+        <from  qname="epo:Text"/>
+        <to  qname="rdfs:Literal"/>
+    </mapping>
+    <mapping>
+        <from  qname="epo:Time"/>
+        <to  qname="xsd:time"/>
+    </mapping>
+    <mapping>
+        <from  qname="epo:URI"/>
+        <to  qname="xsd:anyURI"/>
+    </mapping>
+    <mapping>
+        <from  qname="epo:Integer"/>
+        <to  qname="xsd:integer"/>
+    </mapping>
+    <mapping>
+        <from  qname="epo:Code"/>
+        <to  qname="skos:Concept"/>
+    </mapping>
+<!-- end of section -->
+
+
+<!-- XSD datatypes -->
+    <!-- no mapping necessary as they are already defined in xsdAndRdfDataTypes.xml as the valid set of OWL2 datatypes in -->
+<!-- end of section -->
+       
+</mappings>
\ No newline at end of file
diff --git a/implementation/eInvoicing/model2owl-config/xsdAndRdfDataTypes.xml b/implementation/eInvoicing/model2owl-config/xsdAndRdfDataTypes.xml
new file mode 100644
index 00000000..249ee805
--- /dev/null
+++ b/implementation/eInvoicing/model2owl-config/xsdAndRdfDataTypes.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<datatypes xmlns="http://publications.europa.eu/ns/">
+    <datatype namespace="xsd" qname="xsd:anyURI"/>
+    <datatype namespace="xsd" qname="xsd:base64Binary"/>
+    <datatype namespace="xsd" qname="xsd:boolean"/>
+    <datatype namespace="xsd" qname="xsd:byte"/>
+    <datatype namespace="xsd" qname="xsd:date"/>
+    <datatype namespace="xsd" qname="xsd:dateTime"/>
+    <datatype namespace="xsd" qname="xsd:dateTimeStamp"/>
+    <datatype namespace="xsd" qname="xsd:time"/>
+    <datatype namespace="xsd" qname="xsd:decimal"/>
+    <datatype namespace="xsd" qname="xsd:double"/>
+    <datatype namespace="xsd" qname="xsd:float"/>
+    <datatype namespace="xsd" qname="xsd:hexBinary"/>
+    <datatype namespace="xsd" qname="xsd:int"/>
+    <datatype namespace="xsd" qname="xsd:integer"/>
+    <datatype namespace="xsd" qname="xsd:language"/>
+    <datatype namespace="xsd" qname="xsd:long"/>
+    <datatype namespace="xsd" qname="xsd:Name"/>
+    <datatype namespace="xsd" qname="xsd:NCName"/>
+    <datatype namespace="xsd" qname="xsd:NMTOKEN"/>
+    <datatype namespace="xsd" qname="xsd:negativeInteger"/>
+    <datatype namespace="xsd" qname="xsd:nonNegativeInteger"/>
+    <datatype namespace="xsd" qname="xsd:nonPositiveInteger"/>
+    <datatype namespace="xsd" qname="xsd:normalizedString"/>
+    <datatype namespace="xsd" qname="xsd:positiveInteger"/>
+    <datatype namespace="xsd" qname="xsd:short"/>
+    <datatype namespace="xsd" qname="xsd:string"/>
+    <datatype namespace="xsd" qname="xsd:token"/>
+    <datatype namespace="xsd" qname="xsd:unsignedByte"/>
+    <datatype namespace="xsd" qname="xsd:unsignedInt"/>
+    <datatype namespace="xsd" qname="xsd:unsignedLong"/>
+    <datatype namespace="xsd" qname="xsd:unsignedShort"/>
+    
+    <datatype namespace="rdf" qname="rdf:HTML"/>
+    <datatype namespace="rdf" qname="rdf:XMLLiteral"/>
+    <datatype namespace="rdf" qname="rdf:langString"/>
+    
+    <datatype namespace="rdf" qname="rdf:PlainLiteral"/>
+
+    
+</datatypes>
\ No newline at end of file
diff --git a/implementation/eInvoicing/xmi_conceptual_model/eInvoicing.xml b/implementation/eInvoicing/xmi_conceptual_model/eInvoicing.xml
new file mode 100644
index 00000000..a336525f
--- /dev/null
+++ b/implementation/eInvoicing/xmi_conceptual_model/eInvoicing.xml
@@ -0,0 +1,6062 @@
+<?xml version="1.0" encoding="windows-1252"?>
+<xmi:XMI xmlns:uml="http://www.omg.org/spec/UML/20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:umldi="http://www.omg.org/spec/UML/20131001/UMLDI" xmlns:dc="http://www.omg.org/spec/UML/20131001/UMLDC">
+	<xmi:Documentation exporter="Enterprise Architect" exporterVersion="6.5" exporterID="1559"/>
+	<uml:Model xmi:type="uml:Model" name="EA_Model">
+		<packagedElement xmi:type="uml:Package" xmi:id="EAPK_9497FD7C_A2D0_4068_8D18_341098748957" name="Invoicing">
+			<packagedElement xmi:type="uml:Package" xmi:id="EAPK_4262A8F2_C836_431e_93B1_11A72B7D363B" name="invoicing">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" name="diagrams">
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_F6DE73A8_A504_40b6_8920_6C702CB1228E" body="are these the same?">
+						<annotatedElement xmi:idref="EAID_D8A21C51_ABAE_473e_819D_1729AC275BCF"/>
+						<annotatedElement xmi:idref="EAID_9866393B_8067_4f18_9B28_69541B862505"/>
+					</ownedComment>
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_81226A46_D82E_45a6_9FF0_E3132CF8BB02" body="this is a sub-property of epo:associatedWith? can be deprecated.">
+						<annotatedElement xmi:idref="EAID_6A127BB3_2702_45c1_99BF_B659211FD91B"/>
+						<annotatedElement xmi:idref="EAID_39F3583F_0D40_4e9f_8018_10297955785C"/>
+						<annotatedElement xmi:idref="EAID_6563C83C_6869_4a08_BAC3_0D8EE5BAF10E"/>
+					</ownedComment>
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_2C4871BB_2DFB_424c_B8C0_041EEF1D803D" body="check https://skr.se/download/18.42336a32177c8ab158d77219/1616148012158/Referencing_and_Matching_3.pdf">
+						<annotatedElement xmi:idref="EAID_27A758A5_D658_4005_919F_992C4207B974"/>
+					</ownedComment>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_119CC125_3338_4d92_B1AC_9656FAB69479" name="ProxyConnector"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_90ECE48B_7614_4efa_B90D_F964CC48D88F" name="ProxyConnector">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_9E6525F3_95EC_40a8_A04C_8DBE25A452AC" general="EAID_119CC125_3338_4d92_B1AC_9656FAB69479"/>
+					</packagedElement>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_FD0A4C81_A614_4022_8835_906C9079EF26" name="classes">
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_08C029B6_D4CA_4b3f_932A_FE0341103DDA" name="epo-inv:CreditNote">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstB4EBAA_337C_4029_8899_771627409CB7" name="epo-inv:refersToInvoice" association="EAID_18B4EBAA_337C_4029_8899_771627409CB7">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000001__337C_4029_8899_771627409CB7" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000002__337C_4029_8899_771627409CB7" value="1"/>
+						</ownedAttribute>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_206A035D_9984_470b_B11B_8D183EDF5B42" general="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst3091EC_C442_43be_A2FC_C86EE11EAC7C" name="epo-inv:comprisesCreditNoteLine" association="EAID_313091EC_C442_43be_A2FC_C86EE11EAC7C">
+							<type xmi:idref="EAID_666DA030_1385_4c0a_BDEA_7E543A745220"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000003__C442_43be_A2FC_C86EE11EAC7C" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000004__C442_43be_A2FC_C86EE11EAC7C" value="*"/>
+						</ownedAttribute>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_18B4EBAA_337C_4029_8899_771627409CB7">
+						<memberEnd xmi:idref="EAID_dstB4EBAA_337C_4029_8899_771627409CB7"/>
+						<memberEnd xmi:idref="EAID_srcB4EBAA_337C_4029_8899_771627409CB7"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB4EBAA_337C_4029_8899_771627409CB7" association="EAID_18B4EBAA_337C_4029_8899_771627409CB7">
+							<type xmi:idref="EAID_08C029B6_D4CA_4b3f_932A_FE0341103DDA"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_313091EC_C442_43be_A2FC_C86EE11EAC7C">
+						<memberEnd xmi:idref="EAID_dst3091EC_C442_43be_A2FC_C86EE11EAC7C"/>
+						<memberEnd xmi:idref="EAID_src3091EC_C442_43be_A2FC_C86EE11EAC7C"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3091EC_C442_43be_A2FC_C86EE11EAC7C" association="EAID_313091EC_C442_43be_A2FC_C86EE11EAC7C">
+							<type xmi:idref="EAID_08C029B6_D4CA_4b3f_932A_FE0341103DDA"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_666DA030_1385_4c0a_BDEA_7E543A745220" name="epo-inv:CreditNoteLine">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_B721C9F4_7411_44f0_8C18_F21C663487A4" general="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst33E621_C963_47fe_BD58_E0A4DB42E28A" name="epo-inv:isSubmittedForInvoiceLine" association="EAID_D733E621_C963_47fe_BD58_E0A4DB42E28A">
+							<type xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000005__C963_47fe_BD58_E0A4DB42E28A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000006__C963_47fe_BD58_E0A4DB42E28A" value="1"/>
+						</ownedAttribute>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D733E621_C963_47fe_BD58_E0A4DB42E28A">
+						<memberEnd xmi:idref="EAID_dst33E621_C963_47fe_BD58_E0A4DB42E28A"/>
+						<memberEnd xmi:idref="EAID_src33E621_C963_47fe_BD58_E0A4DB42E28A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src33E621_C963_47fe_BD58_E0A4DB42E28A" association="EAID_D733E621_C963_47fe_BD58_E0A4DB42E28A">
+							<type xmi:idref="EAID_666DA030_1385_4c0a_BDEA_7E543A745220"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D" name="epo-inv:CreditTransferInformation">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_DD1D1185_60ED_47e3_B2C2_84C182FDEDF0" name="epo-inv:hasPaymentAccountName">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000007_60ED_47e3_B2C2_84C182FDEDF0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000008_60ED_47e3_B2C2_84C182FDEDF0" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst6185BE_FF6A_41c6_A77B_474BD1F071E0" name="epo-inv:hasPaymentAccountIdentifier" association="EAID_016185BE_FF6A_41c6_A77B_474BD1F071E0">
+							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000009__FF6A_41c6_A77B_474BD1F071E0" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000010__FF6A_41c6_A77B_474BD1F071E0" value="1"/>
+						</ownedAttribute>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_DCA67557_A587_48db_87FC_5179F7A10647" general="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE5075B_3605_44e1_9693_42DB89B5FE8A" name="epo-inv:hasPaymentServiceProviderIdentifier" association="EAID_E6E5075B_3605_44e1_9693_42DB89B5FE8A">
+							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000011__3605_44e1_9693_42DB89B5FE8A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000012__3605_44e1_9693_42DB89B5FE8A" value="1"/>
+						</ownedAttribute>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_016185BE_FF6A_41c6_A77B_474BD1F071E0">
+						<memberEnd xmi:idref="EAID_dst6185BE_FF6A_41c6_A77B_474BD1F071E0"/>
+						<memberEnd xmi:idref="EAID_src6185BE_FF6A_41c6_A77B_474BD1F071E0"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6185BE_FF6A_41c6_A77B_474BD1F071E0" association="EAID_016185BE_FF6A_41c6_A77B_474BD1F071E0">
+							<type xmi:idref="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_E6E5075B_3605_44e1_9693_42DB89B5FE8A">
+						<memberEnd xmi:idref="EAID_dstE5075B_3605_44e1_9693_42DB89B5FE8A"/>
+						<memberEnd xmi:idref="EAID_srcE5075B_3605_44e1_9693_42DB89B5FE8A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE5075B_3605_44e1_9693_42DB89B5FE8A" association="EAID_E6E5075B_3605_44e1_9693_42DB89B5FE8A">
+							<type xmi:idref="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_784ABA29_6A29_40cd_92A7_01703B8F5CBC">
+						<memberEnd xmi:idref="EAID_dst4ABA29_6A29_40cd_92A7_01703B8F5CBC"/>
+						<memberEnd xmi:idref="EAID_src4ABA29_6A29_40cd_92A7_01703B8F5CBC"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src4ABA29_6A29_40cd_92A7_01703B8F5CBC" association="EAID_784ABA29_6A29_40cd_92A7_01703B8F5CBC">
+							<type xmi:idref="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" name="epo-inv:Invoice">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_1711B30E_37F2_41ca_8564_4BBC4C13BF02" name="epo-inv:hasTaxPointDate">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000013_37F2_41ca_8564_4BBC4C13BF02" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000014_37F2_41ca_8564_4BBC4C13BF02" value="1"/>
+							<type xmi:idref="EAJava_xsd_date"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_D7FCAEBB_5199_4842_8007_2A8A8337D6A5" name="epo-inv:hasPaymentDueDate">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000015_5199_4842_8007_2A8A8337D6A5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000016_5199_4842_8007_2A8A8337D6A5" value="1"/>
+							<type xmi:idref="EAJava_xsd_date"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_1EB4CFFE_BB99_4a0e_9268_1A2AA729F463" name="epo-ord:hasPaymentTerm">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000017_BB99_4a0e_9268_1A2AA729F463" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000018_BB99_4a0e_9268_1A2AA729F463" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_1748B258_25BE_41e0_8396_EEAFC8CAC094" name="epo-ord:hasAccountingCost">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000019_25BE_41e0_8396_EEAFC8CAC094" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000020_25BE_41e0_8396_EEAFC8CAC094" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_3598581C_D748_410e_9057_32199151B5F1" name="epo-ord:hasCustomerReference">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000021_D748_410e_9057_32199151B5F1" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000022_D748_410e_9057_32199151B5F1" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstACAC30_71BA_444b_B7E9_7062F4927536" name="epo-inv:hasTotalTaxAmount" association="EAID_11ACAC30_71BA_444b_B7E9_7062F4927536">
+							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000023__71BA_444b_B7E9_7062F4927536" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000024__71BA_444b_B7E9_7062F4927536" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstB7672E_A531_45a7_BB29_EB9C02AF1551" name="epo-ord:hasPrepaidAmount" association="EAID_14B7672E_A531_45a7_BB29_EB9C02AF1551">
+							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000025__A531_45a7_BB29_EB9C02AF1551" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000026__A531_45a7_BB29_EB9C02AF1551" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF72C1B_7093_491e_82BB_04BA37F9657F" name="epo-inv:hasPaymentInstructionsInformation" association="EAID_1BF72C1B_7093_491e_82BB_04BA37F9657F">
+							<type xmi:idref="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000027__7093_491e_82BB_04BA37F9657F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000028__7093_491e_82BB_04BA37F9657F" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstA758A5_D658_4005_919F_992C4207B974" name="epo-inv:hasInvoicedObjectIdentifier" association="EAID_27A758A5_D658_4005_919F_992C4207B974">
+							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000029__D658_4005_919F_992C4207B974" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000030__D658_4005_919F_992C4207B974" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst42AA39_2FDA_4a8e_AFCA_D79514F19CB1" name="epo-inv:hasInvoiceNote" association="EAID_2F42AA39_2FDA_4a8e_AFCA_D79514F19CB1">
+							<type xmi:idref="EAID_CA3B8B0A_6937_4e26_99FB_D084CA7BE4B2"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000031__2FDA_4a8e_AFCA_D79514F19CB1" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000032__2FDA_4a8e_AFCA_D79514F19CB1" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst7DB7CB_140F_4167_B4ED_129923676841" name="epo-ord:hasTotalTaxExclusiveAmount" association="EAID_357DB7CB_140F_4167_B4ED_129923676841">
+							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000033__140F_4167_B4ED_129923676841" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000034__140F_4167_B4ED_129923676841" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst248DFF_252A_4130_A663_5B676B14A992" name="epo-ord:specifiesAllowanceInformation" association="EAID_38248DFF_252A_4130_A663_5B676B14A992">
+							<type xmi:idref="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000035__252A_4130_A663_5B676B14A992" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000036__252A_4130_A663_5B676B14A992" value="*"/>
+						</ownedAttribute>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_387C6C7A_CC14_4b5e_BAB7_F3D1FB910F35" general="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstDE6A43_058C_45b5_9BD1_786F801B344D" name="epo-inv:hasInvoicingPeriod" association="EAID_45DE6A43_058C_45b5_9BD1_786F801B344D">
+							<type xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000037__058C_45b5_9BD1_786F801B344D" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000038__058C_45b5_9BD1_786F801B344D" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstA59C5B_A5BD_4ae9_A4FB_1ADCCECB44D6" name="epo-inv:comprisesInvoiceLine" association="EAID_46A59C5B_A5BD_4ae9_A4FB_1ADCCECB44D6">
+							<type xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000039__A5BD_4ae9_A4FB_1ADCCECB44D6" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000040__A5BD_4ae9_A4FB_1ADCCECB44D6" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst597CB9_3064_430b_A49F_DC0D80093AA3" name="epo-inv:hasTotalAccountingCurrencyTaxAmount" association="EAID_5A597CB9_3064_430b_A49F_DC0D80093AA3">
+							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000041__3064_430b_A49F_DC0D80093AA3" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000042__3064_430b_A49F_DC0D80093AA3" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst923E1F_6373_4e4c_BC58_974BA33F469A" name="epo:refersToContract" association="EAID_63923E1F_6373_4e4c_BC58_974BA33F469A">
+							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000043__6373_4e4c_BC58_974BA33F469A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000044__6373_4e4c_BC58_974BA33F469A" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstA08C54_54FE_402e_8B58_8804E01D8889" name="epo-cat:specifiesChargeInformation" association="EAID_6AA08C54_54FE_402e_8B58_8804E01D8889">
+							<type xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000045__54FE_402e_8B58_8804E01D8889" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000046__54FE_402e_8B58_8804E01D8889" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst579730_463A_4857_B85E_6B8274FE3291" name="epo-ord:hasTotalChargeAmount" association="EAID_6B579730_463A_4857_B85E_6B8274FE3291">
+							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000047__463A_4857_B85E_6B8274FE3291" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000048__463A_4857_B85E_6B8274FE3291" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE3CABC_FE13_4dc0_BA12_FFFFA0D54042" name="epo-ful:refersToOrder" association="EAID_78E3CABC_FE13_4dc0_BA12_FFFFA0D54042">
+							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000049__FE13_4dc0_BA12_FFFFA0D54042" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000050__FE13_4dc0_BA12_FFFFA0D54042" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst0B5419_84AA_4cbc_BD0F_1B682068D4FB" name="epo-ord:specifiesDeliveryInformation" association="EAID_810B5419_84AA_4cbc_BD0F_1B682068D4FB">
+							<type xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000051__84AA_4cbc_BD0F_1B682068D4FB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000052__84AA_4cbc_BD0F_1B682068D4FB" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst3AB883_9FE4_42fd_AFC8_322B44CBDADD" name="epo-ord:hasAmountDueForPayment" association="EAID_8A3AB883_9FE4_42fd_AFC8_322B44CBDADD">
+							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000053__9FE4_42fd_AFC8_322B44CBDADD" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000054__9FE4_42fd_AFC8_322B44CBDADD" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstEABBA1_FA04_4d98_97DE_5E69567FADBC" name="epo-ord:hasTotalAllowanceAmount" association="EAID_9BEABBA1_FA04_4d98_97DE_5E69567FADBC">
+							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000055__FA04_4d98_97DE_5E69567FADBC" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000056__FA04_4d98_97DE_5E69567FADBC" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst8A07FF_5921_4cfe_AF6B_AD0A239766EE" name="epo-inv:specifiesSellerTaxRepresentative" association="EAID_A48A07FF_5921_4cfe_AF6B_AD0A239766EE">
+							<type xmi:idref="EAID_8335C0F2_1EB0_4dcb_94E3_EFE2E0DF3118"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000057__5921_4cfe_AF6B_AD0A239766EE" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000058__5921_4cfe_AF6B_AD0A239766EE" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst59BE8D_107A_4aaf_BE64_567414A2ABCC" name="epo:hasLotReference" association="EAID_A959BE8D_107A_4aaf_BE64_567414A2ABCC">
+							<type xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000059__107A_4aaf_BE64_567414A2ABCC" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000060__107A_4aaf_BE64_567414A2ABCC" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstB3D05D_CE75_486d_B38A_27314A2F62B2" name="epo:specifiesBuyer" association="EAID_ADB3D05D_CE75_486d_B38A_27314A2F62B2">
+							<type xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000061__CE75_486d_B38A_27314A2F62B2" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000062__CE75_486d_B38A_27314A2F62B2" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst0953AE_CF64_46a1_9C57_33B27067739D" name="epo-ord:hasRoundingAmount" association="EAID_B20953AE_CF64_46a1_9C57_33B27067739D">
+							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000063__CF64_46a1_9C57_33B27067739D" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000064__CF64_46a1_9C57_33B27067739D" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst64ED52_1D30_4395_ABC1_3473F1CBCDE7" name="epo-ord:hasTotalLineAmount" association="EAID_BB64ED52_1D30_4395_ABC1_3473F1CBCDE7">
+							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000065__1D30_4395_ABC1_3473F1CBCDE7" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000066__1D30_4395_ABC1_3473F1CBCDE7" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst18E81E_AC8E_4fec_BB96_E8521FBBE52E" name="epo-inv:specifiesPayee" association="EAID_D018E81E_AC8E_4fec_BB96_E8521FBBE52E">
+							<type xmi:idref="EAID_6161E37F_B166_4ecf_A645_92E7667F0CC8"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000067__AC8E_4fec_BB96_E8521FBBE52E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000068__AC8E_4fec_BB96_E8521FBBE52E" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstBBBC22_877C_48dd_86DE_6D678DB27890" name="epo-inv:hasTaxBreakdownInformation" association="EAID_D4BBBC22_877C_48dd_86DE_6D678DB27890">
+							<type xmi:idref="EAID_BE27BBA5_3E46_4b8b_96B2_9B6152688E23"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000069__877C_48dd_86DE_6D678DB27890" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000070__877C_48dd_86DE_6D678DB27890" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstA21C51_ABAE_473e_819D_1729AC275BCF" name="epo:refersToProject" association="EAID_D8A21C51_ABAE_473e_819D_1729AC275BCF">
+							<type xmi:idref="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000071__ABAE_473e_819D_1729AC275BCF" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000072__ABAE_473e_819D_1729AC275BCF" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst71486E_B9DA_432e_B070_BFF4ECEF7300" name="epo-ord:hasTaxInformation" association="EAID_DB71486E_B9DA_432e_B070_BFF4ECEF7300">
+							<type xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000073__B9DA_432e_B070_BFF4ECEF7300" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000074__B9DA_432e_B070_BFF4ECEF7300" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstBF523C_66C7_4412_825C_9D63A7DB9BFF" name="epo:specifiesSeller" association="EAID_E8BF523C_66C7_4412_825C_9D63A7DB9BFF">
+							<type xmi:idref="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000075__66C7_4412_825C_9D63A7DB9BFF" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000076__66C7_4412_825C_9D63A7DB9BFF" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst221739_F0D9_41f5_A179_C864AC960D8F" name="epo-ord:hasTotalTaxInclusiveAmount" association="EAID_F8221739_F0D9_41f5_A179_C864AC960D8F">
+							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000077__F0D9_41f5_A179_C864AC960D8F" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000078__F0D9_41f5_A179_C864AC960D8F" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstAC08B7_4534_4c6e_98AB_31083434E530" name="epo-inv:refersToDespatchAdvice" association="EAID_FEAC08B7_4534_4c6e_98AB_31083434E530">
+							<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000079__4534_4c6e_98AB_31083434E530" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000080__4534_4c6e_98AB_31083434E530" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst0A4C18_97A9_450b_83FC_E7F2ADB8020E" name="epo-inv:refersToReceiptAdvice" association="EAID_FF0A4C18_97A9_450b_83FC_E7F2ADB8020E">
+							<type xmi:idref="EAID_CF553CC8_8DC9_4ea2_B386_8ACB39A17657"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000081__97A9_450b_83FC_E7F2ADB8020E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000082__97A9_450b_83FC_E7F2ADB8020E" value="1"/>
+						</ownedAttribute>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_11ACAC30_71BA_444b_B7E9_7062F4927536">
+						<memberEnd xmi:idref="EAID_dstACAC30_71BA_444b_B7E9_7062F4927536"/>
+						<memberEnd xmi:idref="EAID_srcACAC30_71BA_444b_B7E9_7062F4927536"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcACAC30_71BA_444b_B7E9_7062F4927536" association="EAID_11ACAC30_71BA_444b_B7E9_7062F4927536">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_14B7672E_A531_45a7_BB29_EB9C02AF1551">
+						<memberEnd xmi:idref="EAID_dstB7672E_A531_45a7_BB29_EB9C02AF1551"/>
+						<memberEnd xmi:idref="EAID_srcB7672E_A531_45a7_BB29_EB9C02AF1551"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB7672E_A531_45a7_BB29_EB9C02AF1551" association="EAID_14B7672E_A531_45a7_BB29_EB9C02AF1551">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1BF72C1B_7093_491e_82BB_04BA37F9657F">
+						<memberEnd xmi:idref="EAID_dstF72C1B_7093_491e_82BB_04BA37F9657F"/>
+						<memberEnd xmi:idref="EAID_srcF72C1B_7093_491e_82BB_04BA37F9657F"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF72C1B_7093_491e_82BB_04BA37F9657F" association="EAID_1BF72C1B_7093_491e_82BB_04BA37F9657F">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_27A758A5_D658_4005_919F_992C4207B974">
+						<memberEnd xmi:idref="EAID_dstA758A5_D658_4005_919F_992C4207B974"/>
+						<memberEnd xmi:idref="EAID_srcA758A5_D658_4005_919F_992C4207B974"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA758A5_D658_4005_919F_992C4207B974" association="EAID_27A758A5_D658_4005_919F_992C4207B974">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_2F42AA39_2FDA_4a8e_AFCA_D79514F19CB1">
+						<memberEnd xmi:idref="EAID_dst42AA39_2FDA_4a8e_AFCA_D79514F19CB1"/>
+						<memberEnd xmi:idref="EAID_src42AA39_2FDA_4a8e_AFCA_D79514F19CB1"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src42AA39_2FDA_4a8e_AFCA_D79514F19CB1" association="EAID_2F42AA39_2FDA_4a8e_AFCA_D79514F19CB1">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_357DB7CB_140F_4167_B4ED_129923676841">
+						<memberEnd xmi:idref="EAID_dst7DB7CB_140F_4167_B4ED_129923676841"/>
+						<memberEnd xmi:idref="EAID_src7DB7CB_140F_4167_B4ED_129923676841"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src7DB7CB_140F_4167_B4ED_129923676841" association="EAID_357DB7CB_140F_4167_B4ED_129923676841">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_38248DFF_252A_4130_A663_5B676B14A992">
+						<memberEnd xmi:idref="EAID_dst248DFF_252A_4130_A663_5B676B14A992"/>
+						<memberEnd xmi:idref="EAID_src248DFF_252A_4130_A663_5B676B14A992"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src248DFF_252A_4130_A663_5B676B14A992" association="EAID_38248DFF_252A_4130_A663_5B676B14A992">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_45DE6A43_058C_45b5_9BD1_786F801B344D">
+						<memberEnd xmi:idref="EAID_dstDE6A43_058C_45b5_9BD1_786F801B344D"/>
+						<memberEnd xmi:idref="EAID_srcDE6A43_058C_45b5_9BD1_786F801B344D"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDE6A43_058C_45b5_9BD1_786F801B344D" association="EAID_45DE6A43_058C_45b5_9BD1_786F801B344D">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_46A59C5B_A5BD_4ae9_A4FB_1ADCCECB44D6">
+						<memberEnd xmi:idref="EAID_dstA59C5B_A5BD_4ae9_A4FB_1ADCCECB44D6"/>
+						<memberEnd xmi:idref="EAID_srcA59C5B_A5BD_4ae9_A4FB_1ADCCECB44D6"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA59C5B_A5BD_4ae9_A4FB_1ADCCECB44D6" association="EAID_46A59C5B_A5BD_4ae9_A4FB_1ADCCECB44D6">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_5A597CB9_3064_430b_A49F_DC0D80093AA3">
+						<memberEnd xmi:idref="EAID_dst597CB9_3064_430b_A49F_DC0D80093AA3"/>
+						<memberEnd xmi:idref="EAID_src597CB9_3064_430b_A49F_DC0D80093AA3"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src597CB9_3064_430b_A49F_DC0D80093AA3" association="EAID_5A597CB9_3064_430b_A49F_DC0D80093AA3">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_63923E1F_6373_4e4c_BC58_974BA33F469A">
+						<memberEnd xmi:idref="EAID_dst923E1F_6373_4e4c_BC58_974BA33F469A"/>
+						<memberEnd xmi:idref="EAID_src923E1F_6373_4e4c_BC58_974BA33F469A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src923E1F_6373_4e4c_BC58_974BA33F469A" association="EAID_63923E1F_6373_4e4c_BC58_974BA33F469A">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6AA08C54_54FE_402e_8B58_8804E01D8889">
+						<memberEnd xmi:idref="EAID_dstA08C54_54FE_402e_8B58_8804E01D8889"/>
+						<memberEnd xmi:idref="EAID_srcA08C54_54FE_402e_8B58_8804E01D8889"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA08C54_54FE_402e_8B58_8804E01D8889" association="EAID_6AA08C54_54FE_402e_8B58_8804E01D8889">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6B579730_463A_4857_B85E_6B8274FE3291">
+						<memberEnd xmi:idref="EAID_dst579730_463A_4857_B85E_6B8274FE3291"/>
+						<memberEnd xmi:idref="EAID_src579730_463A_4857_B85E_6B8274FE3291"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src579730_463A_4857_B85E_6B8274FE3291" association="EAID_6B579730_463A_4857_B85E_6B8274FE3291">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_78E3CABC_FE13_4dc0_BA12_FFFFA0D54042">
+						<memberEnd xmi:idref="EAID_dstE3CABC_FE13_4dc0_BA12_FFFFA0D54042"/>
+						<memberEnd xmi:idref="EAID_srcE3CABC_FE13_4dc0_BA12_FFFFA0D54042"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE3CABC_FE13_4dc0_BA12_FFFFA0D54042" association="EAID_78E3CABC_FE13_4dc0_BA12_FFFFA0D54042">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_810B5419_84AA_4cbc_BD0F_1B682068D4FB">
+						<memberEnd xmi:idref="EAID_dst0B5419_84AA_4cbc_BD0F_1B682068D4FB"/>
+						<memberEnd xmi:idref="EAID_src0B5419_84AA_4cbc_BD0F_1B682068D4FB"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0B5419_84AA_4cbc_BD0F_1B682068D4FB" association="EAID_810B5419_84AA_4cbc_BD0F_1B682068D4FB">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_8A3AB883_9FE4_42fd_AFC8_322B44CBDADD">
+						<memberEnd xmi:idref="EAID_dst3AB883_9FE4_42fd_AFC8_322B44CBDADD"/>
+						<memberEnd xmi:idref="EAID_src3AB883_9FE4_42fd_AFC8_322B44CBDADD"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3AB883_9FE4_42fd_AFC8_322B44CBDADD" association="EAID_8A3AB883_9FE4_42fd_AFC8_322B44CBDADD">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9BEABBA1_FA04_4d98_97DE_5E69567FADBC">
+						<memberEnd xmi:idref="EAID_dstEABBA1_FA04_4d98_97DE_5E69567FADBC"/>
+						<memberEnd xmi:idref="EAID_srcEABBA1_FA04_4d98_97DE_5E69567FADBC"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcEABBA1_FA04_4d98_97DE_5E69567FADBC" association="EAID_9BEABBA1_FA04_4d98_97DE_5E69567FADBC">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A48A07FF_5921_4cfe_AF6B_AD0A239766EE">
+						<memberEnd xmi:idref="EAID_dst8A07FF_5921_4cfe_AF6B_AD0A239766EE"/>
+						<memberEnd xmi:idref="EAID_src8A07FF_5921_4cfe_AF6B_AD0A239766EE"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8A07FF_5921_4cfe_AF6B_AD0A239766EE" association="EAID_A48A07FF_5921_4cfe_AF6B_AD0A239766EE">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A959BE8D_107A_4aaf_BE64_567414A2ABCC">
+						<memberEnd xmi:idref="EAID_dst59BE8D_107A_4aaf_BE64_567414A2ABCC"/>
+						<memberEnd xmi:idref="EAID_src59BE8D_107A_4aaf_BE64_567414A2ABCC"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src59BE8D_107A_4aaf_BE64_567414A2ABCC" association="EAID_A959BE8D_107A_4aaf_BE64_567414A2ABCC">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_ADB3D05D_CE75_486d_B38A_27314A2F62B2">
+						<memberEnd xmi:idref="EAID_dstB3D05D_CE75_486d_B38A_27314A2F62B2"/>
+						<memberEnd xmi:idref="EAID_srcB3D05D_CE75_486d_B38A_27314A2F62B2"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB3D05D_CE75_486d_B38A_27314A2F62B2" association="EAID_ADB3D05D_CE75_486d_B38A_27314A2F62B2">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B20953AE_CF64_46a1_9C57_33B27067739D">
+						<memberEnd xmi:idref="EAID_dst0953AE_CF64_46a1_9C57_33B27067739D"/>
+						<memberEnd xmi:idref="EAID_src0953AE_CF64_46a1_9C57_33B27067739D"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0953AE_CF64_46a1_9C57_33B27067739D" association="EAID_B20953AE_CF64_46a1_9C57_33B27067739D">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_B6DB5C80_A65D_4323_B0B5_168D05C9EA24" supplier="EAID_9B4DBA8E_59B3_4141_97A1_6AE83FE02D1C" client="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_BB64ED52_1D30_4395_ABC1_3473F1CBCDE7">
+						<memberEnd xmi:idref="EAID_dst64ED52_1D30_4395_ABC1_3473F1CBCDE7"/>
+						<memberEnd xmi:idref="EAID_src64ED52_1D30_4395_ABC1_3473F1CBCDE7"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src64ED52_1D30_4395_ABC1_3473F1CBCDE7" association="EAID_BB64ED52_1D30_4395_ABC1_3473F1CBCDE7">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D018E81E_AC8E_4fec_BB96_E8521FBBE52E">
+						<memberEnd xmi:idref="EAID_dst18E81E_AC8E_4fec_BB96_E8521FBBE52E"/>
+						<memberEnd xmi:idref="EAID_src18E81E_AC8E_4fec_BB96_E8521FBBE52E"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src18E81E_AC8E_4fec_BB96_E8521FBBE52E" association="EAID_D018E81E_AC8E_4fec_BB96_E8521FBBE52E">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D4BBBC22_877C_48dd_86DE_6D678DB27890">
+						<memberEnd xmi:idref="EAID_dstBBBC22_877C_48dd_86DE_6D678DB27890"/>
+						<memberEnd xmi:idref="EAID_srcBBBC22_877C_48dd_86DE_6D678DB27890"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBBBC22_877C_48dd_86DE_6D678DB27890" association="EAID_D4BBBC22_877C_48dd_86DE_6D678DB27890">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D8A21C51_ABAE_473e_819D_1729AC275BCF">
+						<memberEnd xmi:idref="EAID_dstA21C51_ABAE_473e_819D_1729AC275BCF"/>
+						<memberEnd xmi:idref="EAID_srcA21C51_ABAE_473e_819D_1729AC275BCF"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA21C51_ABAE_473e_819D_1729AC275BCF" association="EAID_D8A21C51_ABAE_473e_819D_1729AC275BCF">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_DB71486E_B9DA_432e_B070_BFF4ECEF7300">
+						<memberEnd xmi:idref="EAID_dst71486E_B9DA_432e_B070_BFF4ECEF7300"/>
+						<memberEnd xmi:idref="EAID_src71486E_B9DA_432e_B070_BFF4ECEF7300"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src71486E_B9DA_432e_B070_BFF4ECEF7300" association="EAID_DB71486E_B9DA_432e_B070_BFF4ECEF7300">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_E8BF523C_66C7_4412_825C_9D63A7DB9BFF">
+						<memberEnd xmi:idref="EAID_dstBF523C_66C7_4412_825C_9D63A7DB9BFF"/>
+						<memberEnd xmi:idref="EAID_srcBF523C_66C7_4412_825C_9D63A7DB9BFF"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBF523C_66C7_4412_825C_9D63A7DB9BFF" association="EAID_E8BF523C_66C7_4412_825C_9D63A7DB9BFF">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F8221739_F0D9_41f5_A179_C864AC960D8F">
+						<memberEnd xmi:idref="EAID_dst221739_F0D9_41f5_A179_C864AC960D8F"/>
+						<memberEnd xmi:idref="EAID_src221739_F0D9_41f5_A179_C864AC960D8F"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src221739_F0D9_41f5_A179_C864AC960D8F" association="EAID_F8221739_F0D9_41f5_A179_C864AC960D8F">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_FEAC08B7_4534_4c6e_98AB_31083434E530">
+						<memberEnd xmi:idref="EAID_dstAC08B7_4534_4c6e_98AB_31083434E530"/>
+						<memberEnd xmi:idref="EAID_srcAC08B7_4534_4c6e_98AB_31083434E530"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcAC08B7_4534_4c6e_98AB_31083434E530" association="EAID_FEAC08B7_4534_4c6e_98AB_31083434E530">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_FF0A4C18_97A9_450b_83FC_E7F2ADB8020E">
+						<memberEnd xmi:idref="EAID_dst0A4C18_97A9_450b_83FC_E7F2ADB8020E"/>
+						<memberEnd xmi:idref="EAID_src0A4C18_97A9_450b_83FC_E7F2ADB8020E"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0A4C18_97A9_450b_83FC_E7F2ADB8020E" association="EAID_FF0A4C18_97A9_450b_83FC_E7F2ADB8020E">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" name="epo-inv:InvoiceLine">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_CAC89994_CA34_40c2_8DF8_F7EC152D6B72" name="epo-ord:hasAccountingCost">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000083_CA34_40c2_8DF8_F7EC152D6B72" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000084_CA34_40c2_8DF8_F7EC152D6B72" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstBBBEAA_ED71_4eaf_B786_4BBE7F52C5D5" name="epo-cat:hasPrice" association="EAID_02BBBEAA_ED71_4eaf_B786_4BBE7F52C5D5">
+							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000085__ED71_4eaf_B786_4BBE7F52C5D5" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000086__ED71_4eaf_B786_4BBE7F52C5D5" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstA83FCD_B7E1_4f9c_95D1_48B460BCC4B8" name="epo-cat:hasQuantity" association="EAID_30A83FCD_B7E1_4f9c_95D1_48B460BCC4B8">
+							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000087__B7E1_4f9c_95D1_48B460BCC4B8" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000088__B7E1_4f9c_95D1_48B460BCC4B8" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstDC73B7_1ABC_4e6f_9003_79369EBD749D" name="epo-inv:hasNetAmount" association="EAID_5EDC73B7_1ABC_4e6f_9003_79369EBD749D">
+							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000089__1ABC_4e6f_9003_79369EBD749D" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000090__1ABC_4e6f_9003_79369EBD749D" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst166D58_F0F4_4650_92D7_DAC20DD7E2F8" name="epo-inv:hasInvoiceLinePeriod" association="EAID_6D166D58_F0F4_4650_92D7_DAC20DD7E2F8">
+							<type xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000091__F0F4_4650_92D7_DAC20DD7E2F8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000092__F0F4_4650_92D7_DAC20DD7E2F8" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst54F8D7_D6F0_4c63_A478_9179AAD0DF81" name="epo-inv:refersToOrderLine" association="EAID_8254F8D7_D6F0_4c63_A478_9179AAD0DF81">
+							<type xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000093__D6F0_4c63_A478_9179AAD0DF81" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000094__D6F0_4c63_A478_9179AAD0DF81" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE282D8_21BB_4e43_8F2A_1B37812ADCA1" name="epo-ord:hasTaxInformation" association="EAID_8FE282D8_21BB_4e43_8F2A_1B37812ADCA1">
+							<type xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000095__21BB_4e43_8F2A_1B37812ADCA1" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000096__21BB_4e43_8F2A_1B37812ADCA1" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF2C561_D263_44c6_A9E0_140763A1B061" name="epo-inv:hasInvoiceLineObjectIdentifier" association="EAID_ABF2C561_D263_44c6_A9E0_140763A1B061">
+							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000097__D263_44c6_A9E0_140763A1B061" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000098__D263_44c6_A9E0_140763A1B061" value="1"/>
+						</ownedAttribute>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_CF00A26F_CB76_4971_854A_CE68DE5CB673" general="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_02BBBEAA_ED71_4eaf_B786_4BBE7F52C5D5">
+						<memberEnd xmi:idref="EAID_dstBBBEAA_ED71_4eaf_B786_4BBE7F52C5D5"/>
+						<memberEnd xmi:idref="EAID_srcBBBEAA_ED71_4eaf_B786_4BBE7F52C5D5"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBBBEAA_ED71_4eaf_B786_4BBE7F52C5D5" association="EAID_02BBBEAA_ED71_4eaf_B786_4BBE7F52C5D5">
+							<type xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_30A83FCD_B7E1_4f9c_95D1_48B460BCC4B8">
+						<memberEnd xmi:idref="EAID_dstA83FCD_B7E1_4f9c_95D1_48B460BCC4B8"/>
+						<memberEnd xmi:idref="EAID_srcA83FCD_B7E1_4f9c_95D1_48B460BCC4B8"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA83FCD_B7E1_4f9c_95D1_48B460BCC4B8" association="EAID_30A83FCD_B7E1_4f9c_95D1_48B460BCC4B8">
+							<type xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_5EDC73B7_1ABC_4e6f_9003_79369EBD749D">
+						<memberEnd xmi:idref="EAID_dstDC73B7_1ABC_4e6f_9003_79369EBD749D"/>
+						<memberEnd xmi:idref="EAID_srcDC73B7_1ABC_4e6f_9003_79369EBD749D"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDC73B7_1ABC_4e6f_9003_79369EBD749D" association="EAID_5EDC73B7_1ABC_4e6f_9003_79369EBD749D">
+							<type xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6D166D58_F0F4_4650_92D7_DAC20DD7E2F8">
+						<memberEnd xmi:idref="EAID_dst166D58_F0F4_4650_92D7_DAC20DD7E2F8"/>
+						<memberEnd xmi:idref="EAID_src166D58_F0F4_4650_92D7_DAC20DD7E2F8"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src166D58_F0F4_4650_92D7_DAC20DD7E2F8" association="EAID_6D166D58_F0F4_4650_92D7_DAC20DD7E2F8">
+							<type xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_8254F8D7_D6F0_4c63_A478_9179AAD0DF81">
+						<memberEnd xmi:idref="EAID_dst54F8D7_D6F0_4c63_A478_9179AAD0DF81"/>
+						<memberEnd xmi:idref="EAID_src54F8D7_D6F0_4c63_A478_9179AAD0DF81"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src54F8D7_D6F0_4c63_A478_9179AAD0DF81" association="EAID_8254F8D7_D6F0_4c63_A478_9179AAD0DF81">
+							<type xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_8FE282D8_21BB_4e43_8F2A_1B37812ADCA1">
+						<memberEnd xmi:idref="EAID_dstE282D8_21BB_4e43_8F2A_1B37812ADCA1"/>
+						<memberEnd xmi:idref="EAID_srcE282D8_21BB_4e43_8F2A_1B37812ADCA1"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE282D8_21BB_4e43_8F2A_1B37812ADCA1" association="EAID_8FE282D8_21BB_4e43_8F2A_1B37812ADCA1">
+							<type xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_ABF2C561_D263_44c6_A9E0_140763A1B061">
+						<memberEnd xmi:idref="EAID_dstF2C561_D263_44c6_A9E0_140763A1B061"/>
+						<memberEnd xmi:idref="EAID_srcF2C561_D263_44c6_A9E0_140763A1B061"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF2C561_D263_44c6_A9E0_140763A1B061" association="EAID_ABF2C561_D263_44c6_A9E0_140763A1B061">
+							<type xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_363E463C_04A8_41ba_94C0_F1ACF5EF8818">
+						<memberEnd xmi:idref="EAID_dst3E463C_04A8_41ba_94C0_F1ACF5EF8818"/>
+						<memberEnd xmi:idref="EAID_src3E463C_04A8_41ba_94C0_F1ACF5EF8818"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3E463C_04A8_41ba_94C0_F1ACF5EF8818" association="EAID_363E463C_04A8_41ba_94C0_F1ACF5EF8818">
+							<type xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F3984A8F_8800_4bd8_89A8_7BF01AA3F7CB">
+						<memberEnd xmi:idref="EAID_dst984A8F_8800_4bd8_89A8_7BF01AA3F7CB"/>
+						<memberEnd xmi:idref="EAID_src984A8F_8800_4bd8_89A8_7BF01AA3F7CB"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src984A8F_8800_4bd8_89A8_7BF01AA3F7CB" association="EAID_F3984A8F_8800_4bd8_89A8_7BF01AA3F7CB">
+							<type xmi:idref="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_CA3B8B0A_6937_4e26_99FB_D084CA7BE4B2" name="epo-inv:InvoiceNote">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_3815EBD2_CAF5_463d_AD5D_0BCDDA7CF78E" name="epo-inv:hasInvoiceNoteDescription">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000099_CAF5_463d_AD5D_0BCDDA7CF78E" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000100_CAF5_463d_AD5D_0BCDDA7CF78E" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_EF8F663B_E588_4ac1_A6E9_14A359A79866" supplier="EAID_3A12EBB2_25C7_4db8_87BC_F597669AADF3" client="EAID_CA3B8B0A_6937_4e26_99FB_D084CA7BE4B2"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_6161E37F_B166_4ecf_A645_92E7667F0CC8" name="epo-inv:Payee">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_D86AFBB4_83ED_4d20_960D_7A768CA3117C" general="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_D2275688_DA87_4409_B1D5_7AAEA8D7B844" name="epo-inv:PaymentCardInformation">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_3D19C11D_CDDF_4246_9D8D_87E2E05AACC4" name="epo-inv:hasPaymentCardPrimaryAccountNumber">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000101_CDDF_4246_9D8D_87E2E05AACC4" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000102_CDDF_4246_9D8D_87E2E05AACC4" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_222A7400_1325_4619_B0D7_BA9C406F10D7" name="epo-inv:hasPaymentCardHolderName">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000103_1325_4619_B0D7_BA9C406F10D7" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000104_1325_4619_B0D7_BA9C406F10D7" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_E1227B02_660A_4a25_9EF1_B1E472EB8A4A" general="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_FC595492_D281_46be_9A26_52D20C354765">
+						<memberEnd xmi:idref="EAID_dst595492_D281_46be_9A26_52D20C354765"/>
+						<memberEnd xmi:idref="EAID_src595492_D281_46be_9A26_52D20C354765"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src595492_D281_46be_9A26_52D20C354765" association="EAID_FC595492_D281_46be_9A26_52D20C354765">
+							<type xmi:idref="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" name="epo-inv:PaymentInstructionsInformation">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_F88D5CB4_8B8B_4896_8812_5AF018647E86" name="epo-inv:hasPaymentMeansDescription">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000105_8B8B_4896_8812_5AF018647E86" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000106_8B8B_4896_8812_5AF018647E86" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_9838C5B8_3C09_4de7_8684_3332CB6F10AF" name="epo-inv:hasRemittanceInformation">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000107_3C09_4de7_8684_3332CB6F10AF" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000108_3C09_4de7_8684_3332CB6F10AF" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstC15699_2F72_40f6_B574_D054957B5730" name="epo-inv:hasMandateIdentifier" association="EAID_4DC15699_2F72_40f6_B574_D054957B5730">
+							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000109__2F72_40f6_B574_D054957B5730" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000110__2F72_40f6_B574_D054957B5730" value="1"/>
+						</ownedAttribute>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_6906866E_320E_4e58_A7DD_49C8A3F9638B" general="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst4ABA29_6A29_40cd_92A7_01703B8F5CBC" name="epo-inv:hasCreditTransferInformation" association="EAID_784ABA29_6A29_40cd_92A7_01703B8F5CBC">
+							<type xmi:idref="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000111__6A29_40cd_92A7_01703B8F5CBC" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000112__6A29_40cd_92A7_01703B8F5CBC" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE8AC56_41A8_45f2_AE75_CB65D4939C94" name="epo-inv:hasBankingIdentifier" association="EAID_EBE8AC56_41A8_45f2_AE75_CB65D4939C94">
+							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000113__41A8_45f2_AE75_CB65D4939C94" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000114__41A8_45f2_AE75_CB65D4939C94" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE4B0C6_6B39_4211_B8F3_83FC71C1725E" name="epo-inv:hasDebitedAccountIdentifier" association="EAID_F9E4B0C6_6B39_4211_B8F3_83FC71C1725E">
+							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000115__6B39_4211_B8F3_83FC71C1725E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000116__6B39_4211_B8F3_83FC71C1725E" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst595492_D281_46be_9A26_52D20C354765" name="epo-inv:hasPaymentCardInformation" association="EAID_FC595492_D281_46be_9A26_52D20C354765">
+							<type xmi:idref="EAID_D2275688_DA87_4409_B1D5_7AAEA8D7B844"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000117__D281_46be_9A26_52D20C354765" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000118__D281_46be_9A26_52D20C354765" value="1"/>
+						</ownedAttribute>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_121E591C_5317_469b_8A3E_E1B1A7C39814" supplier="EAID_346C4D44_A35F_47f9_8527_38068914A67D" client="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_4DC15699_2F72_40f6_B574_D054957B5730">
+						<memberEnd xmi:idref="EAID_dstC15699_2F72_40f6_B574_D054957B5730"/>
+						<memberEnd xmi:idref="EAID_srcC15699_2F72_40f6_B574_D054957B5730"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC15699_2F72_40f6_B574_D054957B5730" association="EAID_4DC15699_2F72_40f6_B574_D054957B5730">
+							<type xmi:idref="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_EBE8AC56_41A8_45f2_AE75_CB65D4939C94">
+						<memberEnd xmi:idref="EAID_dstE8AC56_41A8_45f2_AE75_CB65D4939C94"/>
+						<memberEnd xmi:idref="EAID_srcE8AC56_41A8_45f2_AE75_CB65D4939C94"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE8AC56_41A8_45f2_AE75_CB65D4939C94" association="EAID_EBE8AC56_41A8_45f2_AE75_CB65D4939C94">
+							<type xmi:idref="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F9E4B0C6_6B39_4211_B8F3_83FC71C1725E">
+						<memberEnd xmi:idref="EAID_dstE4B0C6_6B39_4211_B8F3_83FC71C1725E"/>
+						<memberEnd xmi:idref="EAID_srcE4B0C6_6B39_4211_B8F3_83FC71C1725E"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE4B0C6_6B39_4211_B8F3_83FC71C1725E" association="EAID_F9E4B0C6_6B39_4211_B8F3_83FC71C1725E">
+							<type xmi:idref="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_8335C0F2_1EB0_4dcb_94E3_EFE2E0DF3118" name="epo-inv:SellerTaxRepresentative">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_2AAB3E29_13AA_402b_B91F_9E3189FB3EC9" general="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_BE27BBA5_3E46_4b8b_96B2_9B6152688E23" name="epo-inv:TaxBreakdownInformation">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_5E74DE0F_A01A_42b3_93E3_B078CD17E8E6" name="epo-inv:hasTaxExemptionReasonDescription">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000119_A01A_42b3_93E3_B078CD17E8E6" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000120_A01A_42b3_93E3_B078CD17E8E6" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst564753_2A12_4d02_8DB3_0F11F0819AB2" name="epo-ord:hasTaxInformation" association="EAID_AF564753_2A12_4d02_8DB3_0F11F0819AB2">
+							<type xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000121__2A12_4d02_8DB3_0F11F0819AB2" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000122__2A12_4d02_8DB3_0F11F0819AB2" value="1"/>
+						</ownedAttribute>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_2608C1AC_B598_421e_AA18_F90C2D833913" supplier="EAID_D35F0B1D_07E6_483b_A105_B62A84FC828A" client="EAID_BE27BBA5_3E46_4b8b_96B2_9B6152688E23"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_AF564753_2A12_4d02_8DB3_0F11F0819AB2">
+						<memberEnd xmi:idref="EAID_dst564753_2A12_4d02_8DB3_0F11F0819AB2"/>
+						<memberEnd xmi:idref="EAID_src564753_2A12_4d02_8DB3_0F11F0819AB2"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src564753_2A12_4d02_8DB3_0F11F0819AB2" association="EAID_AF564753_2A12_4d02_8DB3_0F11F0819AB2">
+							<type xmi:idref="EAID_BE27BBA5_3E46_4b8b_96B2_9B6152688E23"/>
+						</ownedEnd>
+					</packagedElement>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_DECC9513_1C77_480a_8233_A3818343FC1D" name="controlled vocabularies">
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_3A12EBB2_25C7_4db8_87BC_F597669AADF3" name="at-voc-new:invoice-note-subject-code"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_346C4D44_A35F_47f9_8527_38068914A67D" name="at-voc-new:payment-means-type"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_9B4DBA8E_59B3_4141_97A1_6AE83FE02D1C" name="at-voc-new:tax-date"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_D35F0B1D_07E6_483b_A105_B62A84FC828A" name="at-voc-new:tax-exemption-reason"/>
+				</packagedElement>
+			</packagedElement>
+			<packagedElement xmi:type="uml:Package" xmi:id="EAPK_BD141F2B_B3A1_4079_99FB_B1548747E3A9" name="datatype">
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_7E687EAB_543A_41d0_8F94_00EC9DF8B207" name="rdf:PlainLiteral"/>
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_5E50EE4A_45CD_49b0_88C5_E6D1A1B31A48" name="xsd:anyURI"/>
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_B011F488_70E3_4f4a_973C_8B35E69DA361" name="xsd:boolean"/>
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_1D7FE0CE_4B79_4c43_9264_D59F4A8A43EB" name="xsd:date"/>
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_7F47096D_17ED_4ef0_B702_8BBE941201A9" name="xsd:dateTime"/>
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_875F3C98_F2EB_4ca2_B02D_E00B66FC5EF3" name="xsd:decimal"/>
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_904AAE3B_BDAD_4438_85D8_650CBD717EFA" name="xsd:integer"/>
+			</packagedElement>
+		</packagedElement>
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_EEE10088_C223_461b_A805_B285A184A625" isFrame="false" modelElement="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D">
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEE10088_C223_461b_8DDF_82EB3F869963" modelElement="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C223_461b_8DDF_82EB3F869963" text="epo-inv:Invoice"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_8DDF_82EB3F869963" x="698" y="532" width="265" height="96"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEE10088_C223_461b_B217_37E957B3B448" modelElement="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C223_461b_B217_37E957B3B448" text="epo:Document"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_B217_37E957B3B448" x="843" y="79" width="195" height="140"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEE10088_C223_461b_83AB_E27B06BA632B" modelElement="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C223_461b_83AB_E27B06BA632B" text="epo-cat:PostAwardDocument"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_83AB_E27B06BA632B" x="871" y="265" width="137" height="46"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEE10088_C223_461b_B935_B52376928738" modelElement="EAID_C3684D7C_E07D_415a_B935_B52376928738">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_C223_461b_B935_B52376928738" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C223_461b_B935_B52376928738" text="at-voc-new:document-type"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_B935_B52376928738" x="639" y="259" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEE10088_C223_461b_97A1_6AE83FE02D1C" modelElement="EAID_9B4DBA8E_59B3_4141_97A1_6AE83FE02D1C">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_C223_461b_97A1_6AE83FE02D1C" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C223_461b_97A1_6AE83FE02D1C" text="at-voc-new:tax-date"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_97A1_6AE83FE02D1C" x="428" y="558" width="90" height="44"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEE10088_C223_461b_B901_B09C711333F4" modelElement="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C223_461b_B901_B09C711333F4" text="epo:Project"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_B901_B09C711333F4" x="542" y="456" width="90" height="42"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEE10088_C223_461b_8372_75A07B6AB066" modelElement="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C223_461b_8372_75A07B6AB066" text="epo:Contract"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_8372_75A07B6AB066" x="1527" y="256" width="219" height="63"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEE10088_C223_461b_B82D_D1167BEF6A0C" modelElement="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C223_461b_B82D_D1167BEF6A0C" text="epo-ord:Order"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_B82D_D1167BEF6A0C" x="1229" y="245" width="239" height="86"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEE10088_C223_461b_98CF_6753815E5C67" modelElement="EAID_05A42455_86E9_49a9_98CF_6753815E5C67">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C223_461b_98CF_6753815E5C67" text="epo-ful:DespatchAdvice"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_98CF_6753815E5C67" x="878" y="409" width="122" height="42"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_EEE10088_C223_461b_9FF0_E3132CF8BB02" modelElement="EAID_81226A46_D82E_45a6_9FF0_E3132CF8BB02">
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_9FF0_E3132CF8BB02" x="639" y="190" width="115" height="55"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEE10088_C223_461b_A889_D9AA2A5B456A" modelElement="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C223_461b_A889_D9AA2A5B456A" text="epo-ord:DeliveryInformation"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_A889_D9AA2A5B456A" x="1235" y="665" width="226" height="85"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEE10088_C223_461b_847A_7E8C5EEC0432" modelElement="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C223_461b_847A_7E8C5EEC0432" text="epo:Period"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_847A_7E8C5EEC0432" x="935" y="672" width="181" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEE10088_C223_461b_AFA8_D5DCED9D61C7" modelElement="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C223_461b_AFA8_D5DCED9D61C7" text="dct:Location"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_AFA8_D5DCED9D61C7" x="1248" y="812" width="200" height="50"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEE10088_C223_461b_BE84_76269B5BBD68" modelElement="EAID_29678A10_6473_461a_BE84_76269B5BBD68">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C223_461b_BE84_76269B5BBD68" text="locn:Address"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_BE84_76269B5BBD68" x="1574" y="761" width="202" height="153"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEE10088_C223_461b_ABBB_CBDD98065B7F" modelElement="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_C223_461b_ABBB_CBDD98065B7F" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C223_461b_ABBB_CBDD98065B7F" text="at-voc:country"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_ABBB_CBDD98065B7F" x="1630" y="957" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEE10088_C223_461b_A69C_3735046D0F48" modelElement="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C223_461b_A69C_3735046D0F48" text="epo-inv:PaymentInstructionsInformation"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_A69C_3735046D0F48" x="688" y="775" width="285" height="111"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEE10088_C223_461b_8527_38068914A67D" modelElement="EAID_346C4D44_A35F_47f9_8527_38068914A67D">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_C223_461b_8527_38068914A67D" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C223_461b_8527_38068914A67D" text="at-voc-new:payment-means-type"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_8527_38068914A67D" x="452" y="801" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEE10088_C223_461b_AD7B_7484B8FDA398" modelElement="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C223_461b_AD7B_7484B8FDA398" text="adms:Identifier"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_AD7B_7484B8FDA398" x="279" y="954" width="207" height="184"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEE10088_C223_461b_8F97_80EFAD74A54D" modelElement="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C223_461b_8F97_80EFAD74A54D" text="epo-inv:CreditTransferInformation"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_8F97_80EFAD74A54D" x="705" y="1038" width="252" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_EEE10088_C223_461b_8920_6C702CB1228E" modelElement="EAID_F6DE73A8_A504_40b6_8920_6C702CB1228E">
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_8920_6C702CB1228E" x="666" y="375" width="87" height="43"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEE10088_C223_461b_B386_8ACB39A17657" modelElement="EAID_CF553CC8_8DC9_4ea2_B386_8ACB39A17657">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C223_461b_B386_8ACB39A17657" text="epo-ful:ReceiptAdvice"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_B386_8ACB39A17657" x="1448" y="406" width="100" height="46"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEE10088_C223_461b_AC62_FA4769B4D88C" modelElement="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C223_461b_AC62_FA4769B4D88C" text="epo:Lot"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_AC62_FA4769B4D88C" x="1585" y="551" width="99" height="47"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_EEE10088_C223_461b_B8C0_041EEF1D803D" modelElement="EAID_2C4871BB_2DFB_424c_B8C0_041EEF1D803D">
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_B8C0_041EEF1D803D" x="176" y="1173" width="382" height="55"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEE10088_C223_461b_99FB_D084CA7BE4B2" modelElement="EAID_CA3B8B0A_6937_4e26_99FB_D084CA7BE4B2">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C223_461b_99FB_D084CA7BE4B2" text="epo-inv:InvoiceNote"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_99FB_D084CA7BE4B2" x="472" y="643" width="228" height="49"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEE10088_C223_461b_87BC_F597669AADF3" modelElement="EAID_3A12EBB2_25C7_4db8_87BC_F597669AADF3">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_C223_461b_87BC_F597669AADF3" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C223_461b_87BC_F597669AADF3" text="at-voc-new:invoice-note-subject-code"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_87BC_F597669AADF3" x="541" y="730" width="90" height="59"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEE10088_C223_461b_B1D5_7AAEA8D7B844" modelElement="EAID_D2275688_DA87_4409_B1D5_7AAEA8D7B844">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C223_461b_B1D5_7AAEA8D7B844" text="epo-inv:PaymentCardInformation"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C223_461b_B1D5_7AAEA8D7B844" x="973" y="925" width="285" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_9BD1_786F801B344D" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_45DE6A43_058C_45b5_9BD1_786F801B344D">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_9BD1_786F801B344D" text="+epo-inv:hasInvoicingPeriod" modelElement="EAID_dstDE6A43_058C_45b5_9BD1_786F801B344D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_9BD1_786F801B344D" x="947" y="642" width="114" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_9BD1_786F801B344D" text="0..1" modelElement="EAID_dstDE6A43_058C_45b5_9BD1_786F801B344D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_9BD1_786F801B344D" x="1007" y="654" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_9BD1_786F801B344D" x="963" y="620"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_9BD1_786F801B344D" x="999" y="620"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_9BD1_786F801B344D" x="999" y="672"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_BAB7_F3D1FB910F35" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" modelElement="EAID_387C6C7A_CC14_4b5e_BAB7_F3D1FB910F35">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_BAB7_F3D1FB910F35" x="803" y="532"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_BAB7_F3D1FB910F35" x="803" y="301"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_BAB7_F3D1FB910F35" x="871" y="301"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_87F4_44B260BCBB19" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" modelElement="EAID_E35A5085_B775_40dd_87F4_44B260BCBB19">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_87F4_44B260BCBB19" text="+epo-ord:specifiesDeliveryInformation" modelElement="EAID_dst5A5085_B775_40dd_87F4_44B260BCBB19">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_87F4_44B260BCBB19" x="1355" y="611" width="154" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_87F4_44B260BCBB19" text="1..*" modelElement="EAID_dst5A5085_B775_40dd_87F4_44B260BCBB19">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_87F4_44B260BCBB19" x="1419" y="647" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_87F4_44B260BCBB19" x="1411" y="331"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_87F4_44B260BCBB19" x="1411" y="665"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_B308_C0F08C743DCF" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_97C17D51_4DF6_4979_B308_C0F08C743DCF">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_B308_C0F08C743DCF" x="1550" y="256"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_B308_C0F08C743DCF" x="1038" y="154"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_8F66_FA023FA190E7" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_8F66_FA023FA190E7" text="+epo:hasLotReference" modelElement="EAID_dstCFA3D8_50E1_40f7_8F66_FA023FA190E7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_8F66_FA023FA190E7" x="1587" y="505" width="90" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_8F66_FA023FA190E7" text="1..*" modelElement="EAID_dstCFA3D8_50E1_40f7_8F66_FA023FA190E7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_8F66_FA023FA190E7" x="1642" y="533" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_8F66_FA023FA190E7" x="1635" y="319"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_8F66_FA023FA190E7" x="1634" y="551"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_8017_204CCE05A2CC" source="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_EC04B8A5_6281_4f14_8017_204CCE05A2CC">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_8017_204CCE05A2CC" text="+adms:identifier" modelElement="EAID_dst04B8A5_6281_4f14_8017_204CCE05A2CC">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_8017_204CCE05A2CC" x="354" y="917" width="66" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_8017_204CCE05A2CC" text="0..1" modelElement="EAID_dst04B8A5_6281_4f14_8017_204CCE05A2CC">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_8017_204CCE05A2CC" x="383" y="936" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_8017_204CCE05A2CC" x="542" y="481"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_8017_204CCE05A2CC" x="375" y="481"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_8017_204CCE05A2CC" x="375" y="954"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_B8A6_42826FC39635" source="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" target="EAID_C3684D7C_E07D_415a_B935_B52376928738" modelElement="EAID_233516AD_8114_473d_B8A6_42826FC39635">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_B8A6_42826FC39635" x="871" y="280"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_B8A6_42826FC39635" x="729" y="280"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_9723_9C69BB0EB7B4" source="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_618070AC_783D_48ae_9723_9C69BB0EB7B4">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_9723_9C69BB0EB7B4" x="938" y="265"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_9723_9C69BB0EB7B4" x="938" y="219"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_B72E_BC6C99FF3009" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_B72E_BC6C99FF3009" text="+epo:hasElectronicDigest 0..*" modelElement="EAID_dstE6AD20_DD67_4f31_B72E_BC6C99FF3009">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_B72E_BC6C99FF3009" x="1029" y="63" width="119" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_B72E_BC6C99FF3009" text="0..*" modelElement="EAID_dstE6AD20_DD67_4f31_B72E_BC6C99FF3009">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_B72E_BC6C99FF3009" x="1024" y="74" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_B72E_BC6C99FF3009" x="1038" y="93"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_B72E_BC6C99FF3009" x="1038" y="93"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_B72E_BC6C99FF3009" x="1052" y="93"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_C223_461b_B72E_BC6C99FF3009" x="1052" y="57"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_C223_461b_B72E_BC6C99FF3009" x="1016" y="57"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_C223_461b_B72E_BC6C99FF3009" x="1016" y="79"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_C223_461b_B72E_BC6C99FF3009" x="1016" y="79"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_8018_10297955785C" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_39F3583F_0D40_4e9f_8018_10297955785C">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_8018_10297955785C" text="+epo:associatedWith 0..*" modelElement="EAID_dstF3583F_0D40_4e9f_8018_10297955785C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_8018_10297955785C" x="739" y="66" width="103" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_8018_10297955785C" text="0..*" modelElement="EAID_dstF3583F_0D40_4e9f_8018_10297955785C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_8018_10297955785C" x="840" y="109" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_8018_10297955785C" x="858" y="79"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_8018_10297955785C" x="858" y="79"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_8018_10297955785C" x="858" y="58"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_C223_461b_8018_10297955785C" x="807" y="58"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_C223_461b_8018_10297955785C" x="807" y="104"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_C223_461b_8018_10297955785C" x="843" y="104"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_C223_461b_8018_10297955785C" x="843" y="104"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_B8FF_34E21440DAD9" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_B8FF_34E21440DAD9" text="+epo:refersToPrevious 0..*" modelElement="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_B8FF_34E21440DAD9" x="898" y="38" width="109" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_B8FF_34E21440DAD9" text="0..*" modelElement="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_B8FF_34E21440DAD9" x="941" y="74" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_B8FF_34E21440DAD9" x="974" y="79"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_B8FF_34E21440DAD9" x="974" y="79"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_B8FF_34E21440DAD9" x="974" y="53"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_C223_461b_B8FF_34E21440DAD9" x="933" y="53"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_C223_461b_B8FF_34E21440DAD9" x="933" y="79"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_C223_461b_B8FF_34E21440DAD9" x="933" y="79"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_9B28_69541B862505" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4" modelElement="EAID_9866393B_8067_4f18_9B28_69541B862505">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_9B28_69541B862505" text="+epo:refersToProject" modelElement="EAID_dst66393B_8067_4f18_9B28_69541B862505">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_9B28_69541B862505" x="559" y="407" width="84" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_9B28_69541B862505" text="0..1" modelElement="EAID_dst66393B_8067_4f18_9B28_69541B862505">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_9B28_69541B862505" x="607" y="438" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_9B28_69541B862505" x="1248" y="331"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_9B28_69541B862505" x="1248" y="365"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_9B28_69541B862505" x="599" y="365"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_C223_461b_9B28_69541B862505" x="599" y="456"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_99CE_63F041A42F06" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_3AA2C83C_532C_460c_99CE_63F041A42F06">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_99CE_63F041A42F06" text="+adms:identifier" modelElement="EAID_dstA2C83C_532C_460c_99CE_63F041A42F06">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_99CE_63F041A42F06" x="246" y="911" width="66" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_99CE_63F041A42F06" text="0..*" modelElement="EAID_dstA2C83C_532C_460c_99CE_63F041A42F06">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_99CE_63F041A42F06" x="299" y="936" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_99CE_63F041A42F06" x="843" y="117"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_99CE_63F041A42F06" x="291" y="117"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_99CE_63F041A42F06" x="291" y="954"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_943A_79D432082022" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" modelElement="EAID_9F9DDC4D_D1D7_4c74_943A_79D432082022">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_943A_79D432082022" x="1229" y="291"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_943A_79D432082022" x="1008" y="291"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_AFCA_D79514F19CB1" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_CA3B8B0A_6937_4e26_99FB_D084CA7BE4B2" modelElement="EAID_2F42AA39_2FDA_4a8e_AFCA_D79514F19CB1">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_AFCA_D79514F19CB1" text="+epo-inv:hasInvoiceNote" modelElement="EAID_dst42AA39_2FDA_4a8e_AFCA_D79514F19CB1">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_AFCA_D79514F19CB1" x="703" y="649" width="101" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_AFCA_D79514F19CB1" text="0..*" modelElement="EAID_dst42AA39_2FDA_4a8e_AFCA_D79514F19CB1">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_AFCA_D79514F19CB1" x="703" y="672" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_AFCA_D79514F19CB1" x="770" y="628"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_AFCA_D79514F19CB1" x="770" y="667"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_AFCA_D79514F19CB1" x="700" y="667"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_919F_992C4207B974" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_27A758A5_D658_4005_919F_992C4207B974">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_919F_992C4207B974" text="+epo-inv:hasInvoicedObjectIdentifier" modelElement="EAID_dstA758A5_D658_4005_919F_992C4207B974">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_919F_992C4207B974" x="382" y="903" width="149" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_919F_992C4207B974" text="0..1" modelElement="EAID_dstA758A5_D658_4005_919F_992C4207B974">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_919F_992C4207B974" x="441" y="936" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_919F_992C4207B974" x="698" y="614"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_919F_992C4207B974" x="433" y="614"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_919F_992C4207B974" x="433" y="954"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_BE64_567414A2ABCC" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_A959BE8D_107A_4aaf_BE64_567414A2ABCC">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_BE64_567414A2ABCC" text="+epo:hasLotReference" modelElement="EAID_dst59BE8D_107A_4aaf_BE64_567414A2ABCC">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_BE64_567414A2ABCC" x="1493" y="570" width="90" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_BE64_567414A2ABCC" text="1..*" modelElement="EAID_dst59BE8D_107A_4aaf_BE64_567414A2ABCC">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_BE64_567414A2ABCC" x="1566" y="593" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_BE64_567414A2ABCC" x="963" y="589"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_BE64_567414A2ABCC" x="1585" y="588"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_83FC_E7F2ADB8020E" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_CF553CC8_8DC9_4ea2_B386_8ACB39A17657" modelElement="EAID_FF0A4C18_97A9_450b_83FC_E7F2ADB8020E">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_83FC_E7F2ADB8020E" text="+epo-inv:refersToReceiptAdvice" modelElement="EAID_dst0A4C18_97A9_450b_83FC_E7F2ADB8020E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_83FC_E7F2ADB8020E" x="1431" y="479" width="128" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_83FC_E7F2ADB8020E" text="0..1" modelElement="EAID_dst0A4C18_97A9_450b_83FC_E7F2ADB8020E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_83FC_E7F2ADB8020E" x="1508" y="457" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_83FC_E7F2ADB8020E" x="963" y="555"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_83FC_E7F2ADB8020E" x="1496" y="555"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_83FC_E7F2ADB8020E" x="1496" y="452"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_82BB_04BA37F9657F" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" modelElement="EAID_1BF72C1B_7093_491e_82BB_04BA37F9657F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_82BB_04BA37F9657F" text="+epo-inv:hasPaymentInstructionsInformation" modelElement="EAID_dstF72C1B_7093_491e_82BB_04BA37F9657F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_82BB_04BA37F9657F" x="745" y="737" width="182" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_82BB_04BA37F9657F" text="0..1" modelElement="EAID_dstF72C1B_7093_491e_82BB_04BA37F9657F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_82BB_04BA37F9657F" x="838" y="757" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_82BB_04BA37F9657F" x="830" y="628"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_82BB_04BA37F9657F" x="830" y="775"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_BD0F_1B682068D4FB" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" modelElement="EAID_810B5419_84AA_4cbc_BD0F_1B682068D4FB">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_BD0F_1B682068D4FB" text="+epo-ord:specifiesDeliveryInformation" modelElement="EAID_dst0B5419_84AA_4cbc_BD0F_1B682068D4FB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_BD0F_1B682068D4FB" x="1207" y="630" width="154" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_BD0F_1B682068D4FB" text="0..1" modelElement="EAID_dst0B5419_84AA_4cbc_BD0F_1B682068D4FB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_BD0F_1B682068D4FB" x="1285" y="647" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_BD0F_1B682068D4FB" x="963" y="604"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_BD0F_1B682068D4FB" x="1277" y="604"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_BD0F_1B682068D4FB" x="1277" y="665"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_98AB_31083434E530" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" modelElement="EAID_FEAC08B7_4534_4c6e_98AB_31083434E530">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_98AB_31083434E530" text="+epo-inv:refersToDespatchAdvice" modelElement="EAID_dstAC08B7_4534_4c6e_98AB_31083434E530">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_98AB_31083434E530" x="868" y="474" width="136" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_98AB_31083434E530" text="0..1" modelElement="EAID_dstAC08B7_4534_4c6e_98AB_31083434E530">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_98AB_31083434E530" x="946" y="456" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_98AB_31083434E530" x="934" y="532"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_98AB_31083434E530" x="934" y="451"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_BA12_FFFFA0D54042" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" modelElement="EAID_78E3CABC_FE13_4dc0_BA12_FFFFA0D54042">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_BA12_FFFFA0D54042" text="+epo-ful:refersToOrder" modelElement="EAID_dstE3CABC_FE13_4dc0_BA12_FFFFA0D54042">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_BA12_FFFFA0D54042" x="1305" y="349" width="93" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_BA12_FFFFA0D54042" text="0..1" modelElement="EAID_dstE3CABC_FE13_4dc0_BA12_FFFFA0D54042">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_BA12_FFFFA0D54042" x="1366" y="336" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_BA12_FFFFA0D54042" x="963" y="541"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_BA12_FFFFA0D54042" x="1354" y="541"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_BA12_FFFFA0D54042" x="1354" y="331"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_BC58_974BA33F469A" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" modelElement="EAID_63923E1F_6373_4e4c_BC58_974BA33F469A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_BC58_974BA33F469A" text="+epo:refersToContract" modelElement="EAID_dst923E1F_6373_4e4c_BC58_974BA33F469A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_BC58_974BA33F469A" x="1514" y="345" width="90" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_BC58_974BA33F469A" text="0..1" modelElement="EAID_dst923E1F_6373_4e4c_BC58_974BA33F469A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_BC58_974BA33F469A" x="1576" y="324" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_BC58_974BA33F469A" x="963" y="567"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_BC58_974BA33F469A" x="1564" y="567"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_BC58_974BA33F469A" x="1564" y="319"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_819D_1729AC275BCF" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4" modelElement="EAID_D8A21C51_ABAE_473e_819D_1729AC275BCF">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_819D_1729AC275BCF" text="+epo:refersToProject" modelElement="EAID_dstA21C51_ABAE_473e_819D_1729AC275BCF">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_819D_1729AC275BCF" x="651" y="457" width="84" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_819D_1729AC275BCF" text="0..1" modelElement="EAID_dstA21C51_ABAE_473e_819D_1729AC275BCF">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_819D_1729AC275BCF" x="635" y="481" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_819D_1729AC275BCF" x="739" y="532"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_819D_1729AC275BCF" x="739" y="476"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_819D_1729AC275BCF" x="632" y="476"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_B0B5_168D05C9EA24" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_9B4DBA8E_59B3_4141_97A1_6AE83FE02D1C" modelElement="EAID_B6DB5C80_A65D_4323_B0B5_168D05C9EA24">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_B0B5_168D05C9EA24" x="698" y="580"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_B0B5_168D05C9EA24" x="518" y="580"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_B93C_EED975A6974F" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_1BEBAC59_19C6_4908_B93C_EED975A6974F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_B93C_EED975A6974F" text="+epo:hasUUID" modelElement="EAID_dstEBAC59_19C6_4908_B93C_EED975A6974F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_B93C_EED975A6974F" x="308" y="891" width="59" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_B93C_EED975A6974F" text="0..1" modelElement="EAID_dstEBAC59_19C6_4908_B93C_EED975A6974F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_B93C_EED975A6974F" x="343" y="936" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_B93C_EED975A6974F" x="843" y="135"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_B93C_EED975A6974F" x="335" y="135"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_B93C_EED975A6974F" x="335" y="954"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_8188_44D7D99D8155" source="EAID_CF553CC8_8DC9_4ea2_B386_8ACB39A17657" target="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" modelElement="EAID_891D4ADA_5989_4b36_8188_44D7D99D8155">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_8188_44D7D99D8155" x="1483" y="406"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_8188_44D7D99D8155" x="1483" y="230"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_8188_44D7D99D8155" x="986" y="230"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_C223_461b_8188_44D7D99D8155" x="986" y="265"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_BAC3_0D8EE5BAF10E" source="EAID_CF553CC8_8DC9_4ea2_B386_8ACB39A17657" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_6563C83C_6869_4a08_BAC3_0D8EE5BAF10E">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_BAC3_0D8EE5BAF10E" text="+epo-ful:hasAssociatedDocument" modelElement="EAID_dst63C83C_6869_4a08_BAC3_0D8EE5BAF10E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_BAC3_0D8EE5BAF10E" x="1041" y="173" width="135" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_BAC3_0D8EE5BAF10E" text="0..1" modelElement="EAID_dst63C83C_6869_4a08_BAC3_0D8EE5BAF10E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_BAC3_0D8EE5BAF10E" x="1041" y="196" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_BAC3_0D8EE5BAF10E" x="1508" y="406"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_BAC3_0D8EE5BAF10E" x="1508" y="191"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_BAC3_0D8EE5BAF10E" x="1038" y="191"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_856D_A5FD0F996EF5" source="EAID_CF553CC8_8DC9_4ea2_B386_8ACB39A17657" target="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" modelElement="EAID_B2AD75A2_6A44_447c_856D_A5FD0F996EF5">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_856D_A5FD0F996EF5" text="+epo-ful:isSubmittedForDespatchAdvice" modelElement="EAID_dstAD75A2_6A44_447c_856D_A5FD0F996EF5">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_856D_A5FD0F996EF5" x="1003" y="423" width="161" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_856D_A5FD0F996EF5" text="0..1" modelElement="EAID_dstAD75A2_6A44_447c_856D_A5FD0F996EF5">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_856D_A5FD0F996EF5" x="1003" y="446" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_856D_A5FD0F996EF5" x="1448" y="441"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_856D_A5FD0F996EF5" x="1000" y="441"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_9693_42DB89B5FE8A" source="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_E6E5075B_3605_44e1_9693_42DB89B5FE8A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_9693_42DB89B5FE8A" text="+epo-inv:hasPaymentServiceProviderIdentifier" modelElement="EAID_dstE5075B_3605_44e1_9693_42DB89B5FE8A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_9693_42DB89B5FE8A" x="506" y="1084" width="187" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_9693_42DB89B5FE8A" text="0..1" modelElement="EAID_dstE5075B_3605_44e1_9693_42DB89B5FE8A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_9693_42DB89B5FE8A" x="489" y="1107" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_9693_42DB89B5FE8A" x="705" y="1102"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_9693_42DB89B5FE8A" x="486" y="1102"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_A77B_474BD1F071E0" source="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_016185BE_FF6A_41c6_A77B_474BD1F071E0">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_A77B_474BD1F071E0" text="+epo-inv:hasPaymentAccountIdentifier" modelElement="EAID_dst6185BE_FF6A_41c6_A77B_474BD1F071E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_A77B_474BD1F071E0" x="504" y="1050" width="157" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_A77B_474BD1F071E0" text="1" modelElement="EAID_dst6185BE_FF6A_41c6_A77B_474BD1F071E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_A77B_474BD1F071E0" x="489" y="1072" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_A77B_474BD1F071E0" x="705" y="1067"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_A77B_474BD1F071E0" x="486" y="1067"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_B8F3_83FC71C1725E" source="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_F9E4B0C6_6B39_4211_B8F3_83FC71C1725E">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_B8F3_83FC71C1725E" text="+epo-inv:hasDebitedAccountIdentifier" modelElement="EAID_dstE4B0C6_6B39_4211_B8F3_83FC71C1725E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_B8F3_83FC71C1725E" x="506" y="1014" width="152" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_B8F3_83FC71C1725E" text="0..1" modelElement="EAID_dstE4B0C6_6B39_4211_B8F3_83FC71C1725E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_B8F3_83FC71C1725E" x="489" y="1036" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_B8F3_83FC71C1725E" x="753" y="886"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_B8F3_83FC71C1725E" x="753" y="1031"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_B8F3_83FC71C1725E" x="486" y="1031"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_AE75_CB65D4939C94" source="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_EBE8AC56_41A8_45f2_AE75_CB65D4939C94">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_AE75_CB65D4939C94" text="+epo-inv:hasBankingIdentifier" modelElement="EAID_dstE8AC56_41A8_45f2_AE75_CB65D4939C94">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_AE75_CB65D4939C94" x="509" y="984" width="121" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_AE75_CB65D4939C94" text="0..1" modelElement="EAID_dstE8AC56_41A8_45f2_AE75_CB65D4939C94">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_AE75_CB65D4939C94" x="489" y="1006" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_AE75_CB65D4939C94" x="723" y="886"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_AE75_CB65D4939C94" x="723" y="1001"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_AE75_CB65D4939C94" x="486" y="1001"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_B574_D054957B5730" source="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_4DC15699_2F72_40f6_B574_D054957B5730">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_B574_D054957B5730" text="+epo-inv:hasMandateIdentifier" modelElement="EAID_dstC15699_2F72_40f6_B574_D054957B5730">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_B574_D054957B5730" x="503" y="953" width="126" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_B574_D054957B5730" text="0..1" modelElement="EAID_dstC15699_2F72_40f6_B574_D054957B5730">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_B574_D054957B5730" x="489" y="976" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_B574_D054957B5730" x="695" y="886"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_B574_D054957B5730" x="695" y="971"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_B574_D054957B5730" x="486" y="971"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_9A26_52D20C354765" source="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" target="EAID_D2275688_DA87_4409_B1D5_7AAEA8D7B844" modelElement="EAID_FC595492_D281_46be_9A26_52D20C354765">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_9A26_52D20C354765" text="+epo-inv:hasPaymentCardInformation" modelElement="EAID_dst595492_D281_46be_9A26_52D20C354765">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_9A26_52D20C354765" x="1037" y="887" width="154" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_9A26_52D20C354765" text="0..1" modelElement="EAID_dst595492_D281_46be_9A26_52D20C354765">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_9A26_52D20C354765" x="1113" y="907" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_9A26_52D20C354765" x="973" y="822"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_9A26_52D20C354765" x="1105" y="822"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_9A26_52D20C354765" x="1105" y="925"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_92A7_01703B8F5CBC" source="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" target="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D" modelElement="EAID_784ABA29_6A29_40cd_92A7_01703B8F5CBC">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_92A7_01703B8F5CBC" text="+epo-inv:hasCreditTransferInformation" modelElement="EAID_dst4ABA29_6A29_40cd_92A7_01703B8F5CBC">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_92A7_01703B8F5CBC" x="757" y="1000" width="156" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_92A7_01703B8F5CBC" text="0..*" modelElement="EAID_dst4ABA29_6A29_40cd_92A7_01703B8F5CBC">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_92A7_01703B8F5CBC" x="838" y="1020" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_92A7_01703B8F5CBC" x="830" y="886"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_92A7_01703B8F5CBC" x="830" y="1038"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_B0FD_C3609EBD8AFD" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_D42B1380_78A6_4579_B0FD_C3609EBD8AFD">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_B0FD_C3609EBD8AFD" text="+epo-ord:hasSellerOrderID" modelElement="EAID_dst2B1380_78A6_4579_B0FD_C3609EBD8AFD">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_B0FD_C3609EBD8AFD" x="171" y="1030" width="108" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_B0FD_C3609EBD8AFD" text="0..1" modelElement="EAID_dst2B1380_78A6_4579_B0FD_C3609EBD8AFD">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_B0FD_C3609EBD8AFD" x="260" y="1051" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_B0FD_C3609EBD8AFD" x="1379" y="245"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_B0FD_C3609EBD8AFD" x="1379" y="22"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_B0FD_C3609EBD8AFD" x="169" y="22"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_C223_461b_B0FD_C3609EBD8AFD" x="169" y="1046"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_C223_461b_B0FD_C3609EBD8AFD" x="279" y="1046"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_8C52_BAE14F5149F6" source="EAID_29678A10_6473_461a_BE84_76269B5BBD68" target="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" modelElement="EAID_D0F25E0B_E148_41e7_8C52_BAE14F5149F6">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_8C52_BAE14F5149F6" x="1675" y="914"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_8C52_BAE14F5149F6" x="1675" y="957"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_A6E9_14A359A79866" source="EAID_CA3B8B0A_6937_4e26_99FB_D084CA7BE4B2" target="EAID_3A12EBB2_25C7_4db8_87BC_F597669AADF3" modelElement="EAID_EF8F663B_E588_4ac1_A6E9_14A359A79866">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_A6E9_14A359A79866" x="586" y="692"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_A6E9_14A359A79866" x="586" y="730"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_A719_E1852BEECBEE" source="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_4A4FE890_B03B_430a_A719_E1852BEECBEE">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_A719_E1852BEECBEE" text="+adms:identifier" modelElement="EAID_dst4FE890_B03B_430a_A719_E1852BEECBEE">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_A719_E1852BEECBEE" x="509" y="1112" width="66" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_A719_E1852BEECBEE" text="0..1" modelElement="EAID_dst4FE890_B03B_430a_A719_E1852BEECBEE">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_A719_E1852BEECBEE" x="489" y="1133" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_A719_E1852BEECBEE" x="1325" y="862"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_A719_E1852BEECBEE" x="1325" y="1128"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_A719_E1852BEECBEE" x="486" y="1128"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_BE01_736C22D89AEA" source="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" target="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" modelElement="EAID_06D187DF_9192_4549_BE01_736C22D89AEA">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_BE01_736C22D89AEA" x="1355" y="862"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_BE01_736C22D89AEA" x="1355" y="986"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_BE01_736C22D89AEA" x="1630" y="986"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_BEE6_89F708783872" source="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" target="EAID_29678A10_6473_461a_BE84_76269B5BBD68" modelElement="EAID_C70B3C1A_A0BD_494b_BEE6_89F708783872">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_BEE6_89F708783872" text="+locn:address" modelElement="EAID_dst0B3C1A_A0BD_494b_BEE6_89F708783872">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_BEE6_89F708783872" x="1516" y="818" width="56" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_BEE6_89F708783872" text="0..1" modelElement="EAID_dst0B3C1A_A0BD_494b_BEE6_89F708783872">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_BEE6_89F708783872" x="1555" y="841" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_BEE6_89F708783872" x="1448" y="836"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_BEE6_89F708783872" x="1574" y="836"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_B24B_49A69CC51624" source="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_DCA21CBC_3D4F_480a_B24B_49A69CC51624">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_B24B_49A69CC51624" text="+epo-ord:hasDeliveryPeriod" modelElement="EAID_dstA21CBC_3D4F_480a_B24B_49A69CC51624">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_B24B_49A69CC51624" x="1119" y="689" width="112" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_B24B_49A69CC51624" text="0..1" modelElement="EAID_dstA21CBC_3D4F_480a_B24B_49A69CC51624">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_B24B_49A69CC51624" x="1119" y="712" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_B24B_49A69CC51624" x="1235" y="707"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_B24B_49A69CC51624" x="1116" y="707"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_BCA8_CFEC07ED34AE" source="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" target="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" modelElement="EAID_D8FEF002_D274_4157_BCA8_CFEC07ED34AE">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_BCA8_CFEC07ED34AE" text="+epo-ord:specifiesPlaceOfDelivery" modelElement="EAID_dstFEF002_D274_4157_BCA8_CFEC07ED34AE">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_BCA8_CFEC07ED34AE" x="1279" y="771" width="138" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_BCA8_CFEC07ED34AE" text="0..1" modelElement="EAID_dstFEF002_D274_4157_BCA8_CFEC07ED34AE">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_BCA8_CFEC07ED34AE" x="1356" y="794" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_BCA8_CFEC07ED34AE" x="1348" y="750"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_BCA8_CFEC07ED34AE" x="1348" y="812"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_987B_AEF828189A10" source="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" target="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" modelElement="EAID_D8E29289_C54A_4d5e_987B_AEF828189A10">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_987B_AEF828189A10" x="938" y="409"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_987B_AEF828189A10" x="938" y="311"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_99BF_B659211FD91B" source="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_6A127BB3_2702_45c1_99BF_B659211FD91B">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_99BF_B659211FD91B" text="+epo-ful:hasAssociatedDocument" modelElement="EAID_dst127BB3_2702_45c1_99BF_B659211FD91B">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_99BF_B659211FD91B" x="706" y="152" width="135" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_99BF_B659211FD91B" text="0..1" modelElement="EAID_dst127BB3_2702_45c1_99BF_B659211FD91B">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_99BF_B659211FD91B" x="824" y="175" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_99BF_B659211FD91B" x="878" y="432"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_99BF_B659211FD91B" x="545" y="432"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_99BF_B659211FD91B" x="545" y="170"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_C223_461b_99BF_B659211FD91B" x="843" y="170"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_9F45_D060A347AAB9" source="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" target="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" modelElement="EAID_05ABFF05_AE37_4d14_9F45_D060A347AAB9">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_9F45_D060A347AAB9" text="+epo-ful:refersToOrder" modelElement="EAID_dstABFF05_AE37_4d14_9F45_D060A347AAB9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_9F45_D060A347AAB9" x="1239" y="373" width="93" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_9F45_D060A347AAB9" text="0..1" modelElement="EAID_dstABFF05_AE37_4d14_9F45_D060A347AAB9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_9F45_D060A347AAB9" x="1298" y="336" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_9F45_D060A347AAB9" x="1000" y="418"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_9F45_D060A347AAB9" x="1286" y="418"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_9F45_D060A347AAB9" x="1286" y="331"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_817A_1DF5BE5981D8" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_24C53A6F_084E_4dbf_817A_1DF5BE5981D8">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C223_461b_817A_1DF5BE5981D8" text="+epo:hasValidityPeriod" modelElement="EAID_dstC53A6F_084E_4dbf_817A_1DF5BE5981D8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C223_461b_817A_1DF5BE5981D8" x="1052" y="626" width="93" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C223_461b_817A_1DF5BE5981D8" text="0..1" modelElement="EAID_dstC53A6F_084E_4dbf_817A_1DF5BE5981D8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C223_461b_817A_1DF5BE5981D8" x="1104" y="654" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_817A_1DF5BE5981D8" x="1229" y="313"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_817A_1DF5BE5981D8" x="1096" y="313"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C223_461b_817A_1DF5BE5981D8" x="1096" y="672"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEE10088_C223_461b_8A3E_E1B1A7C39814" source="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" target="EAID_346C4D44_A35F_47f9_8527_38068914A67D" modelElement="EAID_121E591C_5317_469b_8A3E_E1B1A7C39814">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C223_461b_8A3E_E1B1A7C39814" x="688" y="829"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C223_461b_8A3E_E1B1A7C39814" x="542" y="829"/>
+			</ownedElement>
+		</umldi:Diagram>
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_3B4E619D_0450_4807_99D0_954BEE5E834E" isFrame="false" modelElement="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D">
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_3B4E619D_0450_4807_8DDF_82EB3F869963" modelElement="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0450_4807_8DDF_82EB3F869963" text="epo-inv:Invoice"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0450_4807_8DDF_82EB3F869963" x="440" y="128" width="265" height="111"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_3B4E619D_0450_4807_B8B3_4DB83EC94A01" modelElement="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0450_4807_B8B3_4DB83EC94A01" text="epo-ord:Seller"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0450_4807_B8B3_4DB83EC94A01" x="806" y="161" width="93" height="45"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_3B4E619D_0450_4807_9655_04521F703750" modelElement="EAID_96B284C4_E759_4bad_9655_04521F703750">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0450_4807_9655_04521F703750" text="epo:Buyer"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0450_4807_9655_04521F703750" x="124" y="128" width="219" height="85"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_3B4E619D_0450_4807_A645_92E7667F0CC8" modelElement="EAID_6161E37F_B166_4ecf_A645_92E7667F0CC8">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0450_4807_A645_92E7667F0CC8" text="epo-inv:Payee"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0450_4807_A645_92E7667F0CC8" x="615" y="288" width="90" height="40"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_3B4E619D_0450_4807_94E3_EFE2E0DF3118" modelElement="EAID_8335C0F2_1EB0_4dcb_94E3_EFE2E0DF3118">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0450_4807_94E3_EFE2E0DF3118" text="epo-inv:SellerTaxRepresentative"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0450_4807_94E3_EFE2E0DF3118" x="440" y="288" width="153" height="40"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_3B4E619D_0450_4807_9284_B6F7309F5985" modelElement="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0450_4807_9284_B6F7309F5985" text="epo:OfferingParty"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0450_4807_9284_B6F7309F5985" x="716" y="349" width="90" height="58"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_3B4E619D_0450_4807_B91F_9E3189FB3EC9" source="EAID_8335C0F2_1EB0_4dcb_94E3_EFE2E0DF3118" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_2AAB3E29_13AA_402b_B91F_9E3189FB3EC9">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0450_4807_B91F_9E3189FB3EC9" x="517" y="328"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0450_4807_B91F_9E3189FB3EC9" x="517" y="390"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0450_4807_B91F_9E3189FB3EC9" x="716" y="390"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_3B4E619D_0450_4807_960D_7A768CA3117C" source="EAID_6161E37F_B166_4ecf_A645_92E7667F0CC8" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_D86AFBB4_83ED_4d20_960D_7A768CA3117C">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0450_4807_960D_7A768CA3117C" x="663" y="328"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0450_4807_960D_7A768CA3117C" x="663" y="360"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0450_4807_960D_7A768CA3117C" x="716" y="360"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_3B4E619D_0450_4807_8105_4D93D49DFA8A" source="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_A88E2729_62D9_493c_8105_4D93D49DFA8A">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0450_4807_8105_4D93D49DFA8A" x="853" y="206"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0450_4807_8105_4D93D49DFA8A" x="853" y="380"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0450_4807_8105_4D93D49DFA8A" x="806" y="380"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_3B4E619D_0450_4807_AF6B_AD0A239766EE" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_8335C0F2_1EB0_4dcb_94E3_EFE2E0DF3118" modelElement="EAID_A48A07FF_5921_4cfe_AF6B_AD0A239766EE">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0450_4807_AF6B_AD0A239766EE" text="+epo-inv:specifiesSellerTaxRepresentative" modelElement="EAID_dst8A07FF_5921_4cfe_AF6B_AD0A239766EE">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0450_4807_AF6B_AD0A239766EE" x="435" y="254" width="169" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0450_4807_AF6B_AD0A239766EE" text="0..1" modelElement="EAID_dst8A07FF_5921_4cfe_AF6B_AD0A239766EE">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0450_4807_AF6B_AD0A239766EE" x="524" y="270" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0450_4807_AF6B_AD0A239766EE" x="516" y="239"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0450_4807_AF6B_AD0A239766EE" x="516" y="288"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_3B4E619D_0450_4807_BB96_E8521FBBE52E" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_6161E37F_B166_4ecf_A645_92E7667F0CC8" modelElement="EAID_D018E81E_AC8E_4fec_BB96_E8521FBBE52E">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0450_4807_BB96_E8521FBBE52E" text="+epo-inv:specifiesPayee" modelElement="EAID_dst18E81E_AC8E_4fec_BB96_E8521FBBE52E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0450_4807_BB96_E8521FBBE52E" x="615" y="248" width="98" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0450_4807_BB96_E8521FBBE52E" text="0..1" modelElement="EAID_dst18E81E_AC8E_4fec_BB96_E8521FBBE52E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0450_4807_BB96_E8521FBBE52E" x="669" y="270" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0450_4807_BB96_E8521FBBE52E" x="661" y="239"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0450_4807_BB96_E8521FBBE52E" x="661" y="288"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_3B4E619D_0450_4807_B38A_27314A2F62B2" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_ADB3D05D_CE75_486d_B38A_27314A2F62B2">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0450_4807_B38A_27314A2F62B2" text="+epo:specifiesBuyer" modelElement="EAID_dstB3D05D_CE75_486d_B38A_27314A2F62B2">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0450_4807_B38A_27314A2F62B2" x="352" y="159" width="81" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0450_4807_B38A_27314A2F62B2" text="1" modelElement="EAID_dstB3D05D_CE75_486d_B38A_27314A2F62B2">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0450_4807_B38A_27314A2F62B2" x="346" y="183" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0450_4807_B38A_27314A2F62B2" x="440" y="178"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0450_4807_B38A_27314A2F62B2" x="343" y="178"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_3B4E619D_0450_4807_825C_9D63A7DB9BFF" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" modelElement="EAID_E8BF523C_66C7_4412_825C_9D63A7DB9BFF">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0450_4807_825C_9D63A7DB9BFF" text="+epo:specifiesSeller" modelElement="EAID_dstBF523C_66C7_4412_825C_9D63A7DB9BFF">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0450_4807_825C_9D63A7DB9BFF" x="724" y="165" width="80" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0450_4807_825C_9D63A7DB9BFF" text="1" modelElement="EAID_dstBF523C_66C7_4412_825C_9D63A7DB9BFF">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0450_4807_825C_9D63A7DB9BFF" x="798" y="188" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0450_4807_825C_9D63A7DB9BFF" x="705" y="183"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0450_4807_825C_9D63A7DB9BFF" x="806" y="183"/>
+			</ownedElement>
+		</umldi:Diagram>
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_B528E476_666E_4b0b_AFF7_2AAF33C97767" isFrame="false" modelElement="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D">
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B528E476_666E_4b0b_8DDF_82EB3F869963" modelElement="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_666E_4b0b_8DDF_82EB3F869963" text="epo-inv:Invoice"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_666E_4b0b_8DDF_82EB3F869963" x="282" y="647" width="265" height="111"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B528E476_666E_4b0b_BBE0_0475CA9DB28A" modelElement="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_666E_4b0b_BBE0_0475CA9DB28A" text="epo-inv:InvoiceLine"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_666E_4b0b_BBE0_0475CA9DB28A" x="678" y="667" width="222" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B528E476_666E_4b0b_98C3_93AE6677F8CA" modelElement="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_666E_4b0b_98C3_93AE6677F8CA" text="epo-ord:AllowanceInformation"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_666E_4b0b_98C3_93AE6677F8CA" x="237" y="451" width="176" height="51"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B528E476_666E_4b0b_8568_C49C5DA11831" modelElement="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_666E_4b0b_8568_C49C5DA11831" text="epo-cat:ChargeInformation"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_666E_4b0b_8568_C49C5DA11831" x="371" y="546" width="176" height="51"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B528E476_666E_4b0b_9B44_2FCDD6AB5C9D" modelElement="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_666E_4b0b_9B44_2FCDD6AB5C9D" text="epo:MonetaryValue"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_666E_4b0b_9B44_2FCDD6AB5C9D" x="650" y="303" width="267" height="98"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B528E476_666E_4b0b_AAE5_65D2B64C35E1" modelElement="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_666E_4b0b_AAE5_65D2B64C35E1" text="epo-ord:AllowanceChargeInformation"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_666E_4b0b_AAE5_65D2B64C35E1" x="237" y="312" width="300" height="80"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B528E476_666E_4b0b_970E_3D4CAF26A2F5" modelElement="EAID_D72442ED_835D_455e_970E_3D4CAF26A2F5">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_666E_4b0b_970E_3D4CAF26A2F5" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_666E_4b0b_970E_3D4CAF26A2F5" text="at-voc-new:allowance-charge-reason"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_666E_4b0b_970E_3D4CAF26A2F5" x="342" y="199" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B528E476_666E_4b0b_93D9_9D4729194EA6" modelElement="EAID_33A89700_846B_47cb_93D9_9D4729194EA6">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_666E_4b0b_93D9_9D4729194EA6" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_666E_4b0b_93D9_9D4729194EA6" text="at-voc-new:tax-scheme"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_666E_4b0b_93D9_9D4729194EA6" x="995" y="158" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B528E476_666E_4b0b_AAE9_7F444FFEA26A" modelElement="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_666E_4b0b_AAE9_7F444FFEA26A" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_666E_4b0b_AAE9_7F444FFEA26A" text="at-voc-new:tax-category"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_666E_4b0b_AAE9_7F444FFEA26A" x="995" y="286" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B528E476_666E_4b0b_B1E8_3925D69F40D4" modelElement="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_666E_4b0b_B1E8_3925D69F40D4" text="epo-ord:TaxInformation"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_666E_4b0b_B1E8_3925D69F40D4" x="681" y="158" width="205" height="82"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B528E476_666E_4b0b_8B58_8804E01D8889" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" modelElement="EAID_6AA08C54_54FE_402e_8B58_8804E01D8889">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_666E_4b0b_8B58_8804E01D8889" text="+epo-cat:specifiesChargeInformation" modelElement="EAID_dstA08C54_54FE_402e_8B58_8804E01D8889">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_666E_4b0b_8B58_8804E01D8889" x="388" y="622" width="148" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_666E_4b0b_8B58_8804E01D8889" text="0..*" modelElement="EAID_dstA08C54_54FE_402e_8B58_8804E01D8889">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_666E_4b0b_8B58_8804E01D8889" x="473" y="602" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_666E_4b0b_8B58_8804E01D8889" x="461" y="647"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_666E_4b0b_8B58_8804E01D8889" x="461" y="597"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B528E476_666E_4b0b_A663_5B676B14A992" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" modelElement="EAID_38248DFF_252A_4130_A663_5B676B14A992">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_666E_4b0b_A663_5B676B14A992" text="+epo-ord:specifiesAllowanceInformation" modelElement="EAID_dst248DFF_252A_4130_A663_5B676B14A992">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_666E_4b0b_A663_5B676B14A992" x="241" y="526" width="162" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_666E_4b0b_A663_5B676B14A992" text="0..*" modelElement="EAID_dst248DFF_252A_4130_A663_5B676B14A992">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_666E_4b0b_A663_5B676B14A992" x="332" y="507" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_666E_4b0b_A663_5B676B14A992" x="320" y="647"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_666E_4b0b_A663_5B676B14A992" x="320" y="502"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B528E476_666E_4b0b_A4FB_1ADCCECB44D6" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" modelElement="EAID_46A59C5B_A5BD_4ae9_A4FB_1ADCCECB44D6">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_666E_4b0b_A4FB_1ADCCECB44D6" text="+epo-inv:comprisesInvoiceLine" modelElement="EAID_dstA59C5B_A5BD_4ae9_A4FB_1ADCCECB44D6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_666E_4b0b_A4FB_1ADCCECB44D6" x="552" y="684" width="124" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_666E_4b0b_A4FB_1ADCCECB44D6" text="1..*" modelElement="EAID_dstA59C5B_A5BD_4ae9_A4FB_1ADCCECB44D6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_666E_4b0b_A4FB_1ADCCECB44D6" x="659" y="707" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_666E_4b0b_A4FB_1ADCCECB44D6" x="547" y="702"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_666E_4b0b_A4FB_1ADCCECB44D6" x="678" y="702"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B528E476_666E_4b0b_B070_BFF4ECEF7300" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" modelElement="EAID_DB71486E_B9DA_432e_B070_BFF4ECEF7300">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_666E_4b0b_B070_BFF4ECEF7300" text="+epo-ord:hasTaxInformation" modelElement="EAID_dst71486E_B9DA_432e_B070_BFF4ECEF7300">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_666E_4b0b_B070_BFF4ECEF7300" x="564" y="152" width="115" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_666E_4b0b_B070_BFF4ECEF7300" text="1" modelElement="EAID_dst71486E_B9DA_432e_B070_BFF4ECEF7300">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_666E_4b0b_B070_BFF4ECEF7300" x="673" y="175" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_666E_4b0b_B070_BFF4ECEF7300" x="282" y="707"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_666E_4b0b_B070_BFF4ECEF7300" x="223" y="707"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_666E_4b0b_B070_BFF4ECEF7300" x="223" y="170"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_666E_4b0b_B070_BFF4ECEF7300" x="681" y="170"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B528E476_666E_4b0b_91B2_799578663395" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_470D1B16_C07B_4868_91B2_799578663395">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_666E_4b0b_91B2_799578663395" text="+epo:isCalculatedOn" modelElement="EAID_dst0D1B16_C07B_4868_91B2_799578663395">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_666E_4b0b_91B2_799578663395" x="691" y="267" width="83" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_666E_4b0b_91B2_799578663395" text="0..1" modelElement="EAID_dst0D1B16_C07B_4868_91B2_799578663395">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_666E_4b0b_91B2_799578663395" x="738" y="285" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_666E_4b0b_91B2_799578663395" x="730" y="240"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_666E_4b0b_91B2_799578663395" x="730" y="303"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B528E476_666E_4b0b_8F2A_1B37812ADCA1" source="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" target="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" modelElement="EAID_8FE282D8_21BB_4e43_8F2A_1B37812ADCA1">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_666E_4b0b_8F2A_1B37812ADCA1" text="+epo-ord:hasTaxInformation" modelElement="EAID_dstE282D8_21BB_4e43_8F2A_1B37812ADCA1">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_666E_4b0b_8F2A_1B37812ADCA1" x="816" y="125" width="115" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_666E_4b0b_8F2A_1B37812ADCA1" text="1" modelElement="EAID_dstE282D8_21BB_4e43_8F2A_1B37812ADCA1">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_666E_4b0b_8F2A_1B37812ADCA1" x="870" y="140" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_666E_4b0b_8F2A_1B37812ADCA1" x="900" y="708"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_666E_4b0b_8F2A_1B37812ADCA1" x="1106" y="708"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_666E_4b0b_8F2A_1B37812ADCA1" x="1106" y="113"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_666E_4b0b_8F2A_1B37812ADCA1" x="862" y="113"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_666E_4b0b_8F2A_1B37812ADCA1" x="862" y="158"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B528E476_666E_4b0b_B731_D93BB56777D3" source="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" target="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" modelElement="EAID_308D4104_53D2_4be0_B731_D93BB56777D3">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_666E_4b0b_B731_D93BB56777D3" x="322" y="451"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_666E_4b0b_B731_D93BB56777D3" x="322" y="392"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B528E476_666E_4b0b_89A8_7BF01AA3F7CB" source="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" target="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" modelElement="EAID_F3984A8F_8800_4bd8_89A8_7BF01AA3F7CB">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_666E_4b0b_89A8_7BF01AA3F7CB" text="+epo-inv:isSpecificToInvoiceLine" modelElement="EAID_dst984A8F_8800_4bd8_89A8_7BF01AA3F7CB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_666E_4b0b_89A8_7BF01AA3F7CB" x="745" y="591" width="130" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_666E_4b0b_89A8_7BF01AA3F7CB" text="0..*" modelElement="EAID_dst984A8F_8800_4bd8_89A8_7BF01AA3F7CB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_666E_4b0b_89A8_7BF01AA3F7CB" x="816" y="649" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_666E_4b0b_89A8_7BF01AA3F7CB" x="413" y="475"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_666E_4b0b_89A8_7BF01AA3F7CB" x="808" y="475"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_666E_4b0b_89A8_7BF01AA3F7CB" x="808" y="667"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B528E476_666E_4b0b_82FA_E8F122CD0638" source="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" target="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" modelElement="EAID_D8788651_B092_4dea_82FA_E8F122CD0638">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_666E_4b0b_82FA_E8F122CD0638" x="460" y="546"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_666E_4b0b_82FA_E8F122CD0638" x="460" y="392"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B528E476_666E_4b0b_94C0_F1ACF5EF8818" source="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" target="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" modelElement="EAID_363E463C_04A8_41ba_94C0_F1ACF5EF8818">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_666E_4b0b_94C0_F1ACF5EF8818" text="+epo-inv:isSpecificToInvoiceLine" modelElement="EAID_dst3E463C_04A8_41ba_94C0_F1ACF5EF8818">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_666E_4b0b_94C0_F1ACF5EF8818" x="645" y="616" width="130" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_666E_4b0b_94C0_F1ACF5EF8818" text="0..*" modelElement="EAID_dst3E463C_04A8_41ba_94C0_F1ACF5EF8818">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_666E_4b0b_94C0_F1ACF5EF8818" x="728" y="649" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_666E_4b0b_94C0_F1ACF5EF8818" x="547" y="588"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_666E_4b0b_94C0_F1ACF5EF8818" x="720" y="588"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_666E_4b0b_94C0_F1ACF5EF8818" x="720" y="667"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B528E476_666E_4b0b_AAF8_2E19960E553F" source="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_516CC611_B255_4c67_AAF8_2E19960E553F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_666E_4b0b_AAF8_2E19960E553F" text="+epo-cat:hasAmount" modelElement="EAID_dst6CC611_B255_4c67_AAF8_2E19960E553F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_666E_4b0b_AAF8_2E19960E553F" x="556" y="313" width="85" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_666E_4b0b_AAF8_2E19960E553F" text="1" modelElement="EAID_dst6CC611_B255_4c67_AAF8_2E19960E553F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_666E_4b0b_AAF8_2E19960E553F" x="642" y="338" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_666E_4b0b_AAF8_2E19960E553F" x="537" y="331"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_666E_4b0b_AAF8_2E19960E553F" x="650" y="331"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B528E476_666E_4b0b_918C_44D86E9AC3CF" source="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" target="EAID_D72442ED_835D_455e_970E_3D4CAF26A2F5" modelElement="EAID_AF8C5388_D443_4b59_918C_44D86E9AC3CF">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_666E_4b0b_918C_44D86E9AC3CF" x="387" y="312"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_666E_4b0b_918C_44D86E9AC3CF" x="387" y="259"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B528E476_666E_4b0b_91D4_F6387465413F" source="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_202AF5A1_B4FE_48a4_91D4_F6387465413F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_666E_4b0b_91D4_F6387465413F" text="+epo:isCalculatedOn" modelElement="EAID_dst2AF5A1_B4FE_48a4_91D4_F6387465413F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_666E_4b0b_91D4_F6387465413F" x="553" y="350" width="83" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_666E_4b0b_91D4_F6387465413F" text="0..1" modelElement="EAID_dst2AF5A1_B4FE_48a4_91D4_F6387465413F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_666E_4b0b_91D4_F6387465413F" x="631" y="373" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_666E_4b0b_91D4_F6387465413F" x="537" y="368"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_666E_4b0b_91D4_F6387465413F" x="650" y="368"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B528E476_666E_4b0b_A54F_BC6967C07ADF" source="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" target="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" modelElement="EAID_2EEE05CA_6A1E_4946_A54F_BC6967C07ADF">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_666E_4b0b_A54F_BC6967C07ADF" text="+epo-ord:hasTaxInformation" modelElement="EAID_dstEE05CA_6A1E_4946_A54F_BC6967C07ADF">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_666E_4b0b_A54F_BC6967C07ADF" x="564" y="193" width="115" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_666E_4b0b_A54F_BC6967C07ADF" text="0..1" modelElement="EAID_dstEE05CA_6A1E_4946_A54F_BC6967C07ADF">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_666E_4b0b_A54F_BC6967C07ADF" x="662" y="216" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_666E_4b0b_A54F_BC6967C07ADF" x="505" y="312"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_666E_4b0b_A54F_BC6967C07ADF" x="505" y="211"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_666E_4b0b_A54F_BC6967C07ADF" x="681" y="211"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B528E476_666E_4b0b_B62C_6F674CDB3888" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A" modelElement="EAID_0D4101FD_7720_417c_B62C_6F674CDB3888">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_666E_4b0b_B62C_6F674CDB3888" x="886" y="230"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_666E_4b0b_B62C_6F674CDB3888" x="1039" y="230"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_666E_4b0b_B62C_6F674CDB3888" x="1039" y="286"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B528E476_666E_4b0b_806C_38F93CA90719" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_33A89700_846B_47cb_93D9_9D4729194EA6" modelElement="EAID_4D92CD55_08CD_4d21_806C_38F93CA90719">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_666E_4b0b_806C_38F93CA90719" x="886" y="186"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_666E_4b0b_806C_38F93CA90719" x="995" y="186"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B528E476_666E_4b0b_925D_13E9A7667A18" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_87123434_C2AD_43de_925D_13E9A7667A18">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_666E_4b0b_925D_13E9A7667A18" text="+epo-cat:hasAmount" modelElement="EAID_dst123434_C2AD_43de_925D_13E9A7667A18">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_666E_4b0b_925D_13E9A7667A18" x="799" y="264" width="85" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_666E_4b0b_925D_13E9A7667A18" text="0..1" modelElement="EAID_dst123434_C2AD_43de_925D_13E9A7667A18">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_666E_4b0b_925D_13E9A7667A18" x="851" y="285" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_666E_4b0b_925D_13E9A7667A18" x="843" y="240"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_666E_4b0b_925D_13E9A7667A18" x="843" y="303"/>
+			</ownedElement>
+		</umldi:Diagram>
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_A82D85E1_D9F2_4d28_AB86_F4B343BCEB7D" isFrame="false" modelElement="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D">
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A82D85E1_D9F2_4d28_8DDF_82EB3F869963" modelElement="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D9F2_4d28_8DDF_82EB3F869963" text="epo-inv:Invoice"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D9F2_4d28_8DDF_82EB3F869963" x="167" y="78" width="372" height="111"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A82D85E1_D9F2_4d28_9B44_2FCDD6AB5C9D" modelElement="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D9F2_4d28_9B44_2FCDD6AB5C9D" text="epo:MonetaryValue"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D9F2_4d28_9B44_2FCDD6AB5C9D" x="167" y="427" width="372" height="98"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A82D85E1_D9F2_4d28_99E0_63CAC8A5D594" modelElement="EAID_FBD046CD_CD18_4d96_99E0_63CAC8A5D594">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D9F2_4d28_99E0_63CAC8A5D594" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D9F2_4d28_99E0_63CAC8A5D594" text="at-voc:currency"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D9F2_4d28_99E0_63CAC8A5D594" x="0" y="447" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A82D85E1_D9F2_4d28_B1E8_3925D69F40D4" modelElement="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D9F2_4d28_B1E8_3925D69F40D4" text="epo-ord:TaxInformation"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D9F2_4d28_B1E8_3925D69F40D4" x="664" y="92" width="205" height="82"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A82D85E1_D9F2_4d28_91B2_799578663395" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_470D1B16_C07B_4868_91B2_799578663395">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_D9F2_4d28_91B2_799578663395" text="+epo:isCalculatedOn" modelElement="EAID_dst0D1B16_C07B_4868_91B2_799578663395">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_D9F2_4d28_91B2_799578663395" x="558" y="429" width="83" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_D9F2_4d28_91B2_799578663395" text="0..1" modelElement="EAID_dst0D1B16_C07B_4868_91B2_799578663395">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_D9F2_4d28_91B2_799578663395" x="542" y="451" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D9F2_4d28_91B2_799578663395" x="733" y="174"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D9F2_4d28_91B2_799578663395" x="733" y="446"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_D9F2_4d28_91B2_799578663395" x="539" y="446"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A82D85E1_D9F2_4d28_925D_13E9A7667A18" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_87123434_C2AD_43de_925D_13E9A7667A18">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_D9F2_4d28_925D_13E9A7667A18" text="+epo-cat:hasAmount" modelElement="EAID_dst123434_C2AD_43de_925D_13E9A7667A18">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_D9F2_4d28_925D_13E9A7667A18" x="557" y="474" width="85" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_D9F2_4d28_925D_13E9A7667A18" text="0..1" modelElement="EAID_dst123434_C2AD_43de_925D_13E9A7667A18">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_D9F2_4d28_925D_13E9A7667A18" x="542" y="495" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D9F2_4d28_925D_13E9A7667A18" x="796" y="174"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D9F2_4d28_925D_13E9A7667A18" x="796" y="490"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_D9F2_4d28_925D_13E9A7667A18" x="539" y="490"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A82D85E1_D9F2_4d28_8FE6_3B40BD241A4B" source="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" target="EAID_FBD046CD_CD18_4d96_99E0_63CAC8A5D594" modelElement="EAID_E9E2A1B8_A705_4847_8FE6_3B40BD241A4B">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D9F2_4d28_8FE6_3B40BD241A4B" x="167" y="476"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D9F2_4d28_8FE6_3B40BD241A4B" x="90" y="476"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A82D85E1_D9F2_4d28_B070_BFF4ECEF7300" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" modelElement="EAID_DB71486E_B9DA_432e_B070_BFF4ECEF7300">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_D9F2_4d28_B070_BFF4ECEF7300" text="+epo-ord:hasTaxInformation" modelElement="EAID_dst71486E_B9DA_432e_B070_BFF4ECEF7300">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_D9F2_4d28_B070_BFF4ECEF7300" x="547" y="115" width="115" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_D9F2_4d28_B070_BFF4ECEF7300" text="1" modelElement="EAID_dst71486E_B9DA_432e_B070_BFF4ECEF7300">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_D9F2_4d28_B070_BFF4ECEF7300" x="656" y="138" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D9F2_4d28_B070_BFF4ECEF7300" x="539" y="133"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D9F2_4d28_B070_BFF4ECEF7300" x="664" y="133"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A82D85E1_D9F2_4d28_AFC8_322B44CBDADD" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_8A3AB883_9FE4_42fd_AFC8_322B44CBDADD">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_D9F2_4d28_AFC8_322B44CBDADD" text="+epo-ord:hasAmountDueForPayment" modelElement="EAID_dst3AB883_9FE4_42fd_AFC8_322B44CBDADD">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_D9F2_4d28_AFC8_322B44CBDADD" x="511" y="258" width="14" height="151"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_D9F2_4d28_AFC8_322B44CBDADD" text="1" modelElement="EAID_dst3AB883_9FE4_42fd_AFC8_322B44CBDADD">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_D9F2_4d28_AFC8_322B44CBDADD" x="536" y="409" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D9F2_4d28_AFC8_322B44CBDADD" x="528" y="189"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D9F2_4d28_AFC8_322B44CBDADD" x="528" y="427"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A82D85E1_D9F2_4d28_9C57_33B27067739D" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_B20953AE_CF64_46a1_9C57_33B27067739D">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_D9F2_4d28_9C57_33B27067739D" text="+epo-ord:hasRoundingAmount" modelElement="EAID_dst0953AE_CF64_46a1_9C57_33B27067739D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_D9F2_4d28_9C57_33B27067739D" x="473" y="280" width="14" height="123"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_D9F2_4d28_9C57_33B27067739D" text="0..1" modelElement="EAID_dst0953AE_CF64_46a1_9C57_33B27067739D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_D9F2_4d28_9C57_33B27067739D" x="498" y="409" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D9F2_4d28_9C57_33B27067739D" x="490" y="189"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D9F2_4d28_9C57_33B27067739D" x="490" y="427"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A82D85E1_D9F2_4d28_BB29_EB9C02AF1551" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_14B7672E_A531_45a7_BB29_EB9C02AF1551">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_D9F2_4d28_BB29_EB9C02AF1551" text="+epo-ord:hasPrepaidAmount" modelElement="EAID_dstB7672E_A531_45a7_BB29_EB9C02AF1551">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_D9F2_4d28_BB29_EB9C02AF1551" x="433" y="290" width="14" height="116"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_D9F2_4d28_BB29_EB9C02AF1551" text="0..*" modelElement="EAID_dstB7672E_A531_45a7_BB29_EB9C02AF1551">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_D9F2_4d28_BB29_EB9C02AF1551" x="459" y="409" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D9F2_4d28_BB29_EB9C02AF1551" x="451" y="189"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D9F2_4d28_BB29_EB9C02AF1551" x="451" y="427"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A82D85E1_D9F2_4d28_A49F_DC0D80093AA3" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_5A597CB9_3064_430b_A49F_DC0D80093AA3">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_D9F2_4d28_A49F_DC0D80093AA3" text="+epo-inv:hasTotalAccountingCurrencyTaxAmount" modelElement="EAID_dst597CB9_3064_430b_A49F_DC0D80093AA3">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_D9F2_4d28_A49F_DC0D80093AA3" x="358" y="207" width="14" height="199"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_D9F2_4d28_A49F_DC0D80093AA3" text="0..*" modelElement="EAID_dst597CB9_3064_430b_A49F_DC0D80093AA3">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_D9F2_4d28_A49F_DC0D80093AA3" x="379" y="409" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D9F2_4d28_A49F_DC0D80093AA3" x="371" y="189"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D9F2_4d28_A49F_DC0D80093AA3" x="371" y="427"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A82D85E1_D9F2_4d28_B7E9_7062F4927536" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_11ACAC30_71BA_444b_B7E9_7062F4927536">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_D9F2_4d28_B7E9_7062F4927536" text="+epo-inv:hasTotalTaxAmount" modelElement="EAID_dstACAC30_71BA_444b_B7E9_7062F4927536">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_D9F2_4d28_B7E9_7062F4927536" x="314" y="280" width="14" height="119"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_D9F2_4d28_B7E9_7062F4927536" text="0..*" modelElement="EAID_dstACAC30_71BA_444b_B7E9_7062F4927536">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_D9F2_4d28_B7E9_7062F4927536" x="336" y="409" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D9F2_4d28_B7E9_7062F4927536" x="328" y="189"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D9F2_4d28_B7E9_7062F4927536" x="328" y="427"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A82D85E1_D9F2_4d28_A179_C864AC960D8F" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_F8221739_F0D9_41f5_A179_C864AC960D8F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_D9F2_4d28_A179_C864AC960D8F" text="+epo-ord:hasTotalTaxInclusiveAmount" modelElement="EAID_dst221739_F0D9_41f5_A179_C864AC960D8F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_D9F2_4d28_A179_C864AC960D8F" x="396" y="256" width="14" height="155"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_D9F2_4d28_A179_C864AC960D8F" text="1..*" modelElement="EAID_dst221739_F0D9_41f5_A179_C864AC960D8F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_D9F2_4d28_A179_C864AC960D8F" x="423" y="409" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D9F2_4d28_A179_C864AC960D8F" x="415" y="189"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D9F2_4d28_A179_C864AC960D8F" x="415" y="427"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A82D85E1_D9F2_4d28_B4ED_129923676841" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_357DB7CB_140F_4167_B4ED_129923676841">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_D9F2_4d28_B4ED_129923676841" text="+epo-ord:hasTotalTaxExclusiveAmount" modelElement="EAID_dst7DB7CB_140F_4167_B4ED_129923676841">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_D9F2_4d28_B4ED_129923676841" x="275" y="250" width="14" height="156"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_D9F2_4d28_B4ED_129923676841" text="1..*" modelElement="EAID_dst7DB7CB_140F_4167_B4ED_129923676841">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_D9F2_4d28_B4ED_129923676841" x="301" y="409" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D9F2_4d28_B4ED_129923676841" x="293" y="189"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D9F2_4d28_B4ED_129923676841" x="293" y="427"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A82D85E1_D9F2_4d28_ABC1_3473F1CBCDE7" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_BB64ED52_1D30_4395_ABC1_3473F1CBCDE7">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_D9F2_4d28_ABC1_3473F1CBCDE7" text="+epo-ord:hasTotalLineAmount" modelElement="EAID_dst64ED52_1D30_4395_ABC1_3473F1CBCDE7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_D9F2_4d28_ABC1_3473F1CBCDE7" x="164" y="287" width="14" height="122"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_D9F2_4d28_ABC1_3473F1CBCDE7" text="1..*" modelElement="EAID_dst64ED52_1D30_4395_ABC1_3473F1CBCDE7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_D9F2_4d28_ABC1_3473F1CBCDE7" x="189" y="409" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D9F2_4d28_ABC1_3473F1CBCDE7" x="181" y="189"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D9F2_4d28_ABC1_3473F1CBCDE7" x="181" y="427"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A82D85E1_D9F2_4d28_B85E_6B8274FE3291" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_6B579730_463A_4857_B85E_6B8274FE3291">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_D9F2_4d28_B85E_6B8274FE3291" text="+epo-ord:hasTotalChargeAmount" modelElement="EAID_dst579730_463A_4857_B85E_6B8274FE3291">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_D9F2_4d28_B85E_6B8274FE3291" x="234" y="273" width="14" height="134"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_D9F2_4d28_B85E_6B8274FE3291" text="0..*" modelElement="EAID_dst579730_463A_4857_B85E_6B8274FE3291">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_D9F2_4d28_B85E_6B8274FE3291" x="258" y="409" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D9F2_4d28_B85E_6B8274FE3291" x="250" y="189"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D9F2_4d28_B85E_6B8274FE3291" x="250" y="427"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A82D85E1_D9F2_4d28_97DE_5E69567FADBC" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_9BEABBA1_FA04_4d98_97DE_5E69567FADBC">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_D9F2_4d28_97DE_5E69567FADBC" text="+epo-ord:hasTotalAllowanceAmount" modelElement="EAID_dstEABBA1_FA04_4d98_97DE_5E69567FADBC">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_D9F2_4d28_97DE_5E69567FADBC" x="196" y="257" width="14" height="147"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_D9F2_4d28_97DE_5E69567FADBC" text="0..*" modelElement="EAID_dstEABBA1_FA04_4d98_97DE_5E69567FADBC">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_D9F2_4d28_97DE_5E69567FADBC" x="223" y="409" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D9F2_4d28_97DE_5E69567FADBC" x="215" y="189"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D9F2_4d28_97DE_5E69567FADBC" x="215" y="427"/>
+			</ownedElement>
+		</umldi:Diagram>
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_C18F1E83_B9ED_474a_8118_10C3448D34F8" isFrame="false" modelElement="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D">
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C18F1E83_B9ED_474a_9B44_2FCDD6AB5C9D" modelElement="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B9ED_474a_9B44_2FCDD6AB5C9D" text="epo:MonetaryValue"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B9ED_474a_9B44_2FCDD6AB5C9D" x="374" y="488" width="372" height="98"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C18F1E83_B9ED_474a_99E0_63CAC8A5D594" modelElement="EAID_FBD046CD_CD18_4d96_99E0_63CAC8A5D594">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_B9ED_474a_99E0_63CAC8A5D594" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B9ED_474a_99E0_63CAC8A5D594" text="at-voc:currency"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B9ED_474a_99E0_63CAC8A5D594" x="827" y="507" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C18F1E83_B9ED_474a_8DDF_82EB3F869963" modelElement="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B9ED_474a_8DDF_82EB3F869963" text="epo-inv:Invoice"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B9ED_474a_8DDF_82EB3F869963" x="63" y="161" width="239" height="111"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C18F1E83_B9ED_474a_B1E8_3925D69F40D4" modelElement="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B9ED_474a_B1E8_3925D69F40D4" text="epo-ord:TaxInformation"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B9ED_474a_B1E8_3925D69F40D4" x="458" y="327" width="205" height="82"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C18F1E83_B9ED_474a_AAE9_7F444FFEA26A" modelElement="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_B9ED_474a_AAE9_7F444FFEA26A" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B9ED_474a_AAE9_7F444FFEA26A" text="at-voc-new:tax-category"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B9ED_474a_AAE9_7F444FFEA26A" x="516" y="212" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C18F1E83_B9ED_474a_96B2_9B6152688E23" modelElement="EAID_BE27BBA5_3E46_4b8b_96B2_9B6152688E23">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B9ED_474a_96B2_9B6152688E23" text="epo-inv:TaxBreakdownInformation"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B9ED_474a_96B2_9B6152688E23" x="36" y="341" width="292" height="56"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C18F1E83_B9ED_474a_93D9_9D4729194EA6" modelElement="EAID_33A89700_846B_47cb_93D9_9D4729194EA6">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_B9ED_474a_93D9_9D4729194EA6" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B9ED_474a_93D9_9D4729194EA6" text="at-voc-new:tax-scheme"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B9ED_474a_93D9_9D4729194EA6" x="768" y="338" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C18F1E83_B9ED_474a_A105_B62A84FC828A" modelElement="EAID_D35F0B1D_07E6_483b_A105_B62A84FC828A">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_B9ED_474a_A105_B62A84FC828A" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B9ED_474a_A105_B62A84FC828A" text="at-voc-new:tax-exemption-reason"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B9ED_474a_A105_B62A84FC828A" x="137" y="460" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C18F1E83_B9ED_474a_8FE6_3B40BD241A4B" source="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" target="EAID_FBD046CD_CD18_4d96_99E0_63CAC8A5D594" modelElement="EAID_E9E2A1B8_A705_4847_8FE6_3B40BD241A4B">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B9ED_474a_8FE6_3B40BD241A4B" x="746" y="537"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B9ED_474a_8FE6_3B40BD241A4B" x="827" y="537"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C18F1E83_B9ED_474a_AA18_F90C2D833913" source="EAID_BE27BBA5_3E46_4b8b_96B2_9B6152688E23" target="EAID_D35F0B1D_07E6_483b_A105_B62A84FC828A" modelElement="EAID_2608C1AC_B598_421e_AA18_F90C2D833913">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B9ED_474a_AA18_F90C2D833913" x="181" y="397"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B9ED_474a_AA18_F90C2D833913" x="181" y="460"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C18F1E83_B9ED_474a_86DE_6D678DB27890" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_BE27BBA5_3E46_4b8b_96B2_9B6152688E23" modelElement="EAID_D4BBBC22_877C_48dd_86DE_6D678DB27890">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_B9ED_474a_86DE_6D678DB27890" text="+epo-inv:hasTaxBreakdownInformation" modelElement="EAID_dstBBBC22_877C_48dd_86DE_6D678DB27890">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B9ED_474a_86DE_6D678DB27890" x="104" y="300" width="159" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_B9ED_474a_86DE_6D678DB27890" text="1..*" modelElement="EAID_dstBBBC22_877C_48dd_86DE_6D678DB27890">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B9ED_474a_86DE_6D678DB27890" x="190" y="323" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B9ED_474a_86DE_6D678DB27890" x="182" y="272"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B9ED_474a_86DE_6D678DB27890" x="182" y="341"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C18F1E83_B9ED_474a_B070_BFF4ECEF7300" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" modelElement="EAID_DB71486E_B9DA_432e_B070_BFF4ECEF7300">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_B9ED_474a_B070_BFF4ECEF7300" text="+epo-ord:hasTaxInformation" modelElement="EAID_dst71486E_B9DA_432e_B070_BFF4ECEF7300">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B9ED_474a_B070_BFF4ECEF7300" x="410" y="280" width="115" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_B9ED_474a_B070_BFF4ECEF7300" text="1" modelElement="EAID_dst71486E_B9DA_432e_B070_BFF4ECEF7300">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B9ED_474a_B070_BFF4ECEF7300" x="494" y="309" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B9ED_474a_B070_BFF4ECEF7300" x="302" y="210"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B9ED_474a_B070_BFF4ECEF7300" x="486" y="210"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_B9ED_474a_B070_BFF4ECEF7300" x="486" y="327"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C18F1E83_B9ED_474a_B62C_6F674CDB3888" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A" modelElement="EAID_0D4101FD_7720_417c_B62C_6F674CDB3888">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B9ED_474a_B62C_6F674CDB3888" x="560" y="327"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B9ED_474a_B62C_6F674CDB3888" x="560" y="272"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C18F1E83_B9ED_474a_806C_38F93CA90719" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_33A89700_846B_47cb_93D9_9D4729194EA6" modelElement="EAID_4D92CD55_08CD_4d21_806C_38F93CA90719">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B9ED_474a_806C_38F93CA90719" x="663" y="368"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B9ED_474a_806C_38F93CA90719" x="768" y="368"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C18F1E83_B9ED_474a_925D_13E9A7667A18" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_87123434_C2AD_43de_925D_13E9A7667A18">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_B9ED_474a_925D_13E9A7667A18" text="+epo-cat:hasAmount" modelElement="EAID_dst123434_C2AD_43de_925D_13E9A7667A18">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B9ED_474a_925D_13E9A7667A18" x="576" y="449" width="85" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_B9ED_474a_925D_13E9A7667A18" text="0..1" modelElement="EAID_dst123434_C2AD_43de_925D_13E9A7667A18">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B9ED_474a_925D_13E9A7667A18" x="628" y="470" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B9ED_474a_925D_13E9A7667A18" x="620" y="409"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B9ED_474a_925D_13E9A7667A18" x="620" y="488"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C18F1E83_B9ED_474a_91B2_799578663395" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_470D1B16_C07B_4868_91B2_799578663395">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_B9ED_474a_91B2_799578663395" text="+epo:isCalculatedOn" modelElement="EAID_dst0D1B16_C07B_4868_91B2_799578663395">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B9ED_474a_91B2_799578663395" x="468" y="452" width="83" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_B9ED_474a_91B2_799578663395" text="0..1" modelElement="EAID_dst0D1B16_C07B_4868_91B2_799578663395">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B9ED_474a_91B2_799578663395" x="515" y="470" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B9ED_474a_91B2_799578663395" x="507" y="409"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B9ED_474a_91B2_799578663395" x="507" y="488"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C18F1E83_B9ED_474a_8DB3_0F11F0819AB2" source="EAID_BE27BBA5_3E46_4b8b_96B2_9B6152688E23" target="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" modelElement="EAID_AF564753_2A12_4d02_8DB3_0F11F0819AB2">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_B9ED_474a_8DB3_0F11F0819AB2" text="+epo-ord:hasTaxInformation" modelElement="EAID_dst564753_2A12_4d02_8DB3_0F11F0819AB2">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B9ED_474a_8DB3_0F11F0819AB2" x="339" y="345" width="115" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_B9ED_474a_8DB3_0F11F0819AB2" text="1" modelElement="EAID_dst564753_2A12_4d02_8DB3_0F11F0819AB2">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B9ED_474a_8DB3_0F11F0819AB2" x="450" y="373" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B9ED_474a_8DB3_0F11F0819AB2" x="328" y="368"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B9ED_474a_8DB3_0F11F0819AB2" x="458" y="368"/>
+			</ownedElement>
+		</umldi:Diagram>
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_2B64BA6D_2881_4974_8AEE_2099B1EB359E" isFrame="false" modelElement="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D">
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B64BA6D_2881_4974_BBE0_0475CA9DB28A" modelElement="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2881_4974_BBE0_0475CA9DB28A" text="epo-inv:InvoiceLine"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2881_4974_BBE0_0475CA9DB28A" x="535" y="288" width="222" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B64BA6D_2881_4974_8DDF_82EB3F869963" modelElement="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2881_4974_8DDF_82EB3F869963" text="epo-inv:Invoice"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2881_4974_8DDF_82EB3F869963" x="159" y="268" width="239" height="111"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B64BA6D_2881_4974_9313_58C4BB4EB1A7" modelElement="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2881_4974_9313_58C4BB4EB1A7" text="epo-cat:Line"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2881_4974_9313_58C4BB4EB1A7" x="530" y="121" width="232" height="65"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B64BA6D_2881_4974_AD7B_7484B8FDA398" modelElement="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2881_4974_AD7B_7484B8FDA398" text="adms:Identifier"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2881_4974_AD7B_7484B8FDA398" x="175" y="121" width="207" height="102"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B64BA6D_2881_4974_8D25_BA714BA9C3EC" modelElement="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2881_4974_8D25_BA714BA9C3EC" text="epo:Quantity"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2881_4974_8D25_BA714BA9C3EC" x="821" y="413" width="205" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B64BA6D_2881_4974_A610_DCE4C9E2C0F3" modelElement="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_2881_4974_A610_DCE4C9E2C0F3" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2881_4974_A610_DCE4C9E2C0F3" text="at-voc:measurement-unit"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2881_4974_A610_DCE4C9E2C0F3" x="878" y="527" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B64BA6D_2881_4974_9B44_2FCDD6AB5C9D" modelElement="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2881_4974_9B44_2FCDD6AB5C9D" text="epo:MonetaryValue"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2881_4974_9B44_2FCDD6AB5C9D" x="512" y="489" width="267" height="98"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B64BA6D_2881_4974_960F_C4C98C40706A" modelElement="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2881_4974_960F_C4C98C40706A" text="epo-ord:OrderLine"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2881_4974_960F_C4C98C40706A" x="878" y="288" width="90" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B64BA6D_2881_4974_847A_7E8C5EEC0432" modelElement="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2881_4974_847A_7E8C5EEC0432" text="epo:Period"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2881_4974_847A_7E8C5EEC0432" x="190" y="431" width="176" height="58"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B64BA6D_2881_4974_B1E8_3925D69F40D4" modelElement="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2881_4974_B1E8_3925D69F40D4" text="epo-ord:TaxInformation"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2881_4974_B1E8_3925D69F40D4" x="521" y="674" width="205" height="82"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2B64BA6D_2881_4974_AAE9_7F444FFEA26A" modelElement="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_2881_4974_AAE9_7F444FFEA26A" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2881_4974_AAE9_7F444FFEA26A" text="at-voc-new:tax-category"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2881_4974_AAE9_7F444FFEA26A" x="354" y="598" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B64BA6D_2881_4974_A9E0_140763A1B061" source="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_ABF2C561_D263_44c6_A9E0_140763A1B061">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2881_4974_A9E0_140763A1B061" text="+epo-inv:hasInvoiceLineObjectIdentifier" modelElement="EAID_dstF2C561_D263_44c6_A9E0_140763A1B061">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2881_4974_A9E0_140763A1B061" x="385" y="193" width="160" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2881_4974_A9E0_140763A1B061" text="0..1" modelElement="EAID_dstF2C561_D263_44c6_A9E0_140763A1B061">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2881_4974_A9E0_140763A1B061" x="385" y="216" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2881_4974_A9E0_140763A1B061" x="552" y="288"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2881_4974_A9E0_140763A1B061" x="552" y="211"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2881_4974_A9E0_140763A1B061" x="382" y="211"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B64BA6D_2881_4974_9003_79369EBD749D" source="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_5EDC73B7_1ABC_4e6f_9003_79369EBD749D">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2881_4974_9003_79369EBD749D" text="+epo-inv:hasNetAmount" modelElement="EAID_dstDC73B7_1ABC_4e6f_9003_79369EBD749D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2881_4974_9003_79369EBD749D" x="600" y="445" width="99" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2881_4974_9003_79369EBD749D" text="1" modelElement="EAID_dstDC73B7_1ABC_4e6f_9003_79369EBD749D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2881_4974_9003_79369EBD749D" x="653" y="471" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2881_4974_9003_79369EBD749D" x="645" y="358"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2881_4974_9003_79369EBD749D" x="645" y="489"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B64BA6D_2881_4974_A478_9179AAD0DF81" source="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" target="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" modelElement="EAID_8254F8D7_D6F0_4c63_A478_9179AAD0DF81">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2881_4974_A478_9179AAD0DF81" text="+epo-inv:refersToOrderLine" modelElement="EAID_dst54F8D7_D6F0_4c63_A478_9179AAD0DF81">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2881_4974_A478_9179AAD0DF81" x="765" y="305" width="111" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2881_4974_A478_9179AAD0DF81" text="0..1" modelElement="EAID_dst54F8D7_D6F0_4c63_A478_9179AAD0DF81">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2881_4974_A478_9179AAD0DF81" x="859" y="328" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2881_4974_A478_9179AAD0DF81" x="757" y="323"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2881_4974_A478_9179AAD0DF81" x="878" y="323"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B64BA6D_2881_4974_95D1_48B460BCC4B8" source="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_30A83FCD_B7E1_4f9c_95D1_48B460BCC4B8">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2881_4974_95D1_48B460BCC4B8" text="+epo-cat:hasQuantity" modelElement="EAID_dstA83FCD_B7E1_4f9c_95D1_48B460BCC4B8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2881_4974_95D1_48B460BCC4B8" x="731" y="425" width="88" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2881_4974_95D1_48B460BCC4B8" text="1" modelElement="EAID_dstA83FCD_B7E1_4f9c_95D1_48B460BCC4B8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2881_4974_95D1_48B460BCC4B8" x="813" y="448" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2881_4974_95D1_48B460BCC4B8" x="710" y="358"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2881_4974_95D1_48B460BCC4B8" x="710" y="443"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2881_4974_95D1_48B460BCC4B8" x="821" y="443"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B64BA6D_2881_4974_92D7_DAC20DD7E2F8" source="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_6D166D58_F0F4_4650_92D7_DAC20DD7E2F8">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2881_4974_92D7_DAC20DD7E2F8" text="+epo-inv:hasInvoiceLinePeriod" modelElement="EAID_dst166D58_F0F4_4650_92D7_DAC20DD7E2F8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2881_4974_92D7_DAC20DD7E2F8" x="369" y="438" width="123" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2881_4974_92D7_DAC20DD7E2F8" text="0..1" modelElement="EAID_dst166D58_F0F4_4650_92D7_DAC20DD7E2F8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2881_4974_92D7_DAC20DD7E2F8" x="369" y="461" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2881_4974_92D7_DAC20DD7E2F8" x="558" y="358"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2881_4974_92D7_DAC20DD7E2F8" x="558" y="456"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2881_4974_92D7_DAC20DD7E2F8" x="366" y="456"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B64BA6D_2881_4974_8F2A_1B37812ADCA1" source="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" target="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" modelElement="EAID_8FE282D8_21BB_4e43_8F2A_1B37812ADCA1">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2881_4974_8F2A_1B37812ADCA1" text="+epo-ord:hasTaxInformation" modelElement="EAID_dstE282D8_21BB_4e43_8F2A_1B37812ADCA1">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2881_4974_8F2A_1B37812ADCA1" x="740" y="702" width="115" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2881_4974_8F2A_1B37812ADCA1" text="1" modelElement="EAID_dstE282D8_21BB_4e43_8F2A_1B37812ADCA1">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2881_4974_8F2A_1B37812ADCA1" x="729" y="724" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2881_4974_8F2A_1B37812ADCA1" x="709" y="288"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2881_4974_8F2A_1B37812ADCA1" x="709" y="257"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2881_4974_8F2A_1B37812ADCA1" x="1040" y="257"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_2881_4974_8F2A_1B37812ADCA1" x="1040" y="719"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_2881_4974_8F2A_1B37812ADCA1" x="726" y="719"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B64BA6D_2881_4974_A4FB_1ADCCECB44D6" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" modelElement="EAID_46A59C5B_A5BD_4ae9_A4FB_1ADCCECB44D6">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2881_4974_A4FB_1ADCCECB44D6" text="+epo-inv:comprisesInvoiceLine" modelElement="EAID_dstA59C5B_A5BD_4ae9_A4FB_1ADCCECB44D6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2881_4974_A4FB_1ADCCECB44D6" x="406" y="301" width="124" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2881_4974_A4FB_1ADCCECB44D6" text="1..*" modelElement="EAID_dstA59C5B_A5BD_4ae9_A4FB_1ADCCECB44D6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2881_4974_A4FB_1ADCCECB44D6" x="516" y="328" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2881_4974_A4FB_1ADCCECB44D6" x="398" y="323"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2881_4974_A4FB_1ADCCECB44D6" x="535" y="323"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B64BA6D_2881_4974_919F_992C4207B974" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_27A758A5_D658_4005_919F_992C4207B974">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2881_4974_919F_992C4207B974" text="+epo-inv:hasInvoicedObjectIdentifier" modelElement="EAID_dstA758A5_D658_4005_919F_992C4207B974">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2881_4974_919F_992C4207B974" x="208" y="244" width="149" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2881_4974_919F_992C4207B974" text="0..1" modelElement="EAID_dstA758A5_D658_4005_919F_992C4207B974">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2881_4974_919F_992C4207B974" x="290" y="228" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2881_4974_919F_992C4207B974" x="278" y="268"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2881_4974_919F_992C4207B974" x="278" y="223"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B64BA6D_2881_4974_854A_CE68DE5CB673" source="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" target="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" modelElement="EAID_CF00A26F_CB76_4971_854A_CE68DE5CB673">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2881_4974_854A_CE68DE5CB673" x="646" y="288"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2881_4974_854A_CE68DE5CB673" x="646" y="186"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B64BA6D_2881_4974_91B2_799578663395" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_470D1B16_C07B_4868_91B2_799578663395">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2881_4974_91B2_799578663395" text="+epo:isCalculatedOn" modelElement="EAID_dst0D1B16_C07B_4868_91B2_799578663395">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2881_4974_91B2_799578663395" x="553" y="609" width="83" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2881_4974_91B2_799578663395" text="0..1" modelElement="EAID_dst0D1B16_C07B_4868_91B2_799578663395">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2881_4974_91B2_799578663395" x="609" y="592" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2881_4974_91B2_799578663395" x="597" y="674"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2881_4974_91B2_799578663395" x="597" y="587"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B64BA6D_2881_4974_B070_BFF4ECEF7300" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" modelElement="EAID_DB71486E_B9DA_432e_B070_BFF4ECEF7300">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2881_4974_B070_BFF4ECEF7300" text="+epo-ord:hasTaxInformation" modelElement="EAID_dst71486E_B9DA_432e_B070_BFF4ECEF7300">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2881_4974_B070_BFF4ECEF7300" x="388" y="701" width="115" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2881_4974_B070_BFF4ECEF7300" text="1" modelElement="EAID_dst71486E_B9DA_432e_B070_BFF4ECEF7300">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2881_4974_B070_BFF4ECEF7300" x="513" y="725" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2881_4974_B070_BFF4ECEF7300" x="168" y="379"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2881_4974_B070_BFF4ECEF7300" x="168" y="720"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2881_4974_B070_BFF4ECEF7300" x="521" y="720"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B64BA6D_2881_4974_9551_9C0C13B80044" source="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2881_4974_9551_9C0C13B80044" text="+adms:identifier" modelElement="EAID_dst87FBF1_89C8_4ed0_9551_9C0C13B80044">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2881_4974_9551_9C0C13B80044" x="385" y="141" width="66" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2881_4974_9551_9C0C13B80044" text="0..1" modelElement="EAID_dst87FBF1_89C8_4ed0_9551_9C0C13B80044">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2881_4974_9551_9C0C13B80044" x="385" y="164" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2881_4974_9551_9C0C13B80044" x="530" y="159"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2881_4974_9551_9C0C13B80044" x="382" y="159"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B64BA6D_2881_4974_A8BC_8FBCF102380D" source="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" target="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3" modelElement="EAID_30CBA4D5_2CA0_4043_A8BC_8FBCF102380D">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2881_4974_A8BC_8FBCF102380D" x="923" y="483"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2881_4974_A8BC_8FBCF102380D" x="923" y="527"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B64BA6D_2881_4974_9D94_CE93A68B3CF9" source="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_0AC5D04E_7364_4118_9D94_CE93A68B3CF9">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2881_4974_9D94_CE93A68B3CF9" text="+epo-cat:hasQuantity" modelElement="EAID_dstC5D04E_7364_4118_9D94_CE93A68B3CF9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2881_4974_9D94_CE93A68B3CF9" x="878" y="376" width="88" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2881_4974_9D94_CE93A68B3CF9" text="1" modelElement="EAID_dstC5D04E_7364_4118_9D94_CE93A68B3CF9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2881_4974_9D94_CE93A68B3CF9" x="932" y="395" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2881_4974_9D94_CE93A68B3CF9" x="924" y="358"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2881_4974_9D94_CE93A68B3CF9" x="924" y="413"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B64BA6D_2881_4974_BCCC_37421BA960DE" source="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" target="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" modelElement="EAID_AA589EDA_B26B_44c3_BCCC_37421BA960DE">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2881_4974_BCCC_37421BA960DE" x="915" y="288"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2881_4974_BCCC_37421BA960DE" x="915" y="158"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2881_4974_BCCC_37421BA960DE" x="762" y="158"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B64BA6D_2881_4974_B62C_6F674CDB3888" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A" modelElement="EAID_0D4101FD_7720_417c_B62C_6F674CDB3888">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2881_4974_B62C_6F674CDB3888" x="539" y="674"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2881_4974_B62C_6F674CDB3888" x="539" y="631"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2881_4974_B62C_6F674CDB3888" x="444" y="631"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B64BA6D_2881_4974_925D_13E9A7667A18" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_87123434_C2AD_43de_925D_13E9A7667A18">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2881_4974_925D_13E9A7667A18" text="+epo-cat:hasAmount" modelElement="EAID_dst123434_C2AD_43de_925D_13E9A7667A18">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2881_4974_925D_13E9A7667A18" x="642" y="624" width="85" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2881_4974_925D_13E9A7667A18" text="0..1" modelElement="EAID_dst123434_C2AD_43de_925D_13E9A7667A18">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2881_4974_925D_13E9A7667A18" x="695" y="592" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2881_4974_925D_13E9A7667A18" x="683" y="674"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2881_4974_925D_13E9A7667A18" x="683" y="587"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2B64BA6D_2881_4974_9BD1_786F801B344D" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_45DE6A43_058C_45b5_9BD1_786F801B344D">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2881_4974_9BD1_786F801B344D" text="+epo-inv:hasInvoicingPeriod" modelElement="EAID_dstDE6A43_058C_45b5_9BD1_786F801B344D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2881_4974_9BD1_786F801B344D" x="219" y="396" width="114" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2881_4974_9BD1_786F801B344D" text="0..1" modelElement="EAID_dstDE6A43_058C_45b5_9BD1_786F801B344D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2881_4974_9BD1_786F801B344D" x="286" y="413" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2881_4974_9BD1_786F801B344D" x="278" y="379"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2881_4974_9BD1_786F801B344D" x="278" y="431"/>
+			</ownedElement>
+		</umldi:Diagram>
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_AA5E4159_940D_4cc4_B630_9E091E626852" isFrame="false" modelElement="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D">
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_AA5E4159_940D_4cc4_BBE0_0475CA9DB28A" modelElement="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_940D_4cc4_BBE0_0475CA9DB28A" text="epo-inv:InvoiceLine"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_940D_4cc4_BBE0_0475CA9DB28A" x="360" y="314" width="222" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_AA5E4159_940D_4cc4_9B44_2FCDD6AB5C9D" modelElement="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_940D_4cc4_9B44_2FCDD6AB5C9D" text="epo:MonetaryValue"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_940D_4cc4_9B44_2FCDD6AB5C9D" x="337" y="447" width="267" height="98"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_AA5E4159_940D_4cc4_A67D_5F0D11370DF4" modelElement="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_940D_4cc4_A67D_5F0D11370DF4" text="epo-cat:Price"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_940D_4cc4_A67D_5F0D11370DF4" x="84" y="461" width="112" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_AA5E4159_940D_4cc4_9313_58C4BB4EB1A7" modelElement="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_940D_4cc4_9313_58C4BB4EB1A7" text="epo-cat:Line"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_940D_4cc4_9313_58C4BB4EB1A7" x="386" y="198" width="232" height="62"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_AA5E4159_940D_4cc4_98C3_93AE6677F8CA" modelElement="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_940D_4cc4_98C3_93AE6677F8CA" text="epo-ord:AllowanceInformation"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_940D_4cc4_98C3_93AE6677F8CA" x="84" y="238" width="176" height="51"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_AA5E4159_940D_4cc4_8D25_BA714BA9C3EC" modelElement="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_940D_4cc4_8D25_BA714BA9C3EC" text="epo:Quantity"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_940D_4cc4_8D25_BA714BA9C3EC" x="38" y="604" width="205" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_AA5E4159_940D_4cc4_A610_DCE4C9E2C0F3" modelElement="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_940D_4cc4_A610_DCE4C9E2C0F3" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_940D_4cc4_A610_DCE4C9E2C0F3" text="at-voc:measurement-unit"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_940D_4cc4_A610_DCE4C9E2C0F3" x="208" y="503" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_AA5E4159_940D_4cc4_B200_94202420C754" modelElement="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_940D_4cc4_B200_94202420C754" text="epo-cat:Item"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_940D_4cc4_B200_94202420C754" x="715" y="166" width="246" height="114"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_AA5E4159_940D_4cc4_AD7B_7484B8FDA398" modelElement="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_940D_4cc4_AD7B_7484B8FDA398" text="adms:Identifier"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_940D_4cc4_AD7B_7484B8FDA398" x="715" y="1" width="246" height="88"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_AA5E4159_940D_4cc4_ABBB_CBDD98065B7F" modelElement="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_940D_4cc4_ABBB_CBDD98065B7F" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_940D_4cc4_ABBB_CBDD98065B7F" text="at-voc:country"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_940D_4cc4_ABBB_CBDD98065B7F" x="715" y="348" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_AA5E4159_940D_4cc4_AA65_095BEC507C12" modelElement="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_940D_4cc4_AA65_095BEC507C12" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_940D_4cc4_AA65_095BEC507C12" text="at-voc-new:item-classification"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_940D_4cc4_AA65_095BEC507C12" x="871" y="348" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_AA5E4159_940D_4cc4_B5B1_F96CAB80B7F4" modelElement="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_940D_4cc4_B5B1_F96CAB80B7F4" text="epo-cat:ItemProperty"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_940D_4cc4_B5B1_F96CAB80B7F4" x="1063" y="179" width="219" height="88"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AA5E4159_940D_4cc4_A9E0_140763A1B061" source="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_ABF2C561_D263_44c6_A9E0_140763A1B061">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_940D_4cc4_A9E0_140763A1B061" text="+epo-inv:hasInvoiceLineObjectIdentifier" modelElement="EAID_dstF2C561_D263_44c6_A9E0_140763A1B061">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_940D_4cc4_A9E0_140763A1B061" x="553" y="11" width="160" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_940D_4cc4_A9E0_140763A1B061" text="0..1" modelElement="EAID_dstF2C561_D263_44c6_A9E0_140763A1B061">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_940D_4cc4_A9E0_140763A1B061" x="694" y="34" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_940D_4cc4_A9E0_140763A1B061" x="377" y="314"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_940D_4cc4_A9E0_140763A1B061" x="377" y="29"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_940D_4cc4_A9E0_140763A1B061" x="715" y="29"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AA5E4159_940D_4cc4_9003_79369EBD749D" source="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_5EDC73B7_1ABC_4e6f_9003_79369EBD749D">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_940D_4cc4_9003_79369EBD749D" text="+epo-inv:hasNetAmount" modelElement="EAID_dstDC73B7_1ABC_4e6f_9003_79369EBD749D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_940D_4cc4_9003_79369EBD749D" x="448" y="403" width="99" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_940D_4cc4_9003_79369EBD749D" text="1" modelElement="EAID_dstDC73B7_1ABC_4e6f_9003_79369EBD749D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_940D_4cc4_9003_79369EBD749D" x="501" y="429" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_940D_4cc4_9003_79369EBD749D" x="493" y="384"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_940D_4cc4_9003_79369EBD749D" x="493" y="447"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AA5E4159_940D_4cc4_B786_4BBE7F52C5D5" source="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" target="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" modelElement="EAID_02BBBEAA_ED71_4eaf_B786_4BBE7F52C5D5">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_940D_4cc4_B786_4BBE7F52C5D5" text="+epo-cat:hasPrice" modelElement="EAID_dstBBBEAA_ED71_4eaf_B786_4BBE7F52C5D5">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_940D_4cc4_B786_4BBE7F52C5D5" x="102" y="405" width="72" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_940D_4cc4_B786_4BBE7F52C5D5" text="1..*" modelElement="EAID_dstBBBEAA_ED71_4eaf_B786_4BBE7F52C5D5">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_940D_4cc4_B786_4BBE7F52C5D5" x="142" y="443" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_940D_4cc4_B786_4BBE7F52C5D5" x="360" y="347"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_940D_4cc4_B786_4BBE7F52C5D5" x="134" y="347"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_940D_4cc4_B786_4BBE7F52C5D5" x="134" y="461"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AA5E4159_940D_4cc4_B3EA_A725F5A385F7" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_940D_4cc4_B3EA_A725F5A385F7" text="+epo-cat:hasNetMonetaryValue" modelElement="EAID_dst92648E_ABC4_4408_B3EA_A725F5A385F7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_940D_4cc4_B3EA_A725F5A385F7" x="203" y="450" width="130" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_940D_4cc4_B3EA_A725F5A385F7" text="1" modelElement="EAID_dst92648E_ABC4_4408_B3EA_A725F5A385F7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_940D_4cc4_B3EA_A725F5A385F7" x="328" y="474" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_940D_4cc4_B3EA_A725F5A385F7" x="196" y="469"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_940D_4cc4_B3EA_A725F5A385F7" x="337" y="469"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AA5E4159_940D_4cc4_8481_D40EEC904171" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_9EA3B8C3_695C_4b42_8481_D40EEC904171">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_940D_4cc4_8481_D40EEC904171" text="+epo-cat:hasBaseQuantity" modelElement="EAID_dstA3B8C3_695C_4b42_8481_D40EEC904171">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_940D_4cc4_8481_D40EEC904171" x="88" y="572" width="107" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_940D_4cc4_8481_D40EEC904171" text="0..1" modelElement="EAID_dstA3B8C3_695C_4b42_8481_D40EEC904171">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_940D_4cc4_8481_D40EEC904171" x="148" y="586" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_940D_4cc4_8481_D40EEC904171" x="140" y="531"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_940D_4cc4_8481_D40EEC904171" x="140" y="604"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AA5E4159_940D_4cc4_9AB4_37A6F31DF36A" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_47E28283_E9BB_4790_9AB4_37A6F31DF36A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_940D_4cc4_9AB4_37A6F31DF36A" text="+epo-ord:hasGrossMonetaryValue" modelElement="EAID_dstE28283_E9BB_4790_9AB4_37A6F31DF36A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_940D_4cc4_9AB4_37A6F31DF36A" x="196" y="483" width="139" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_940D_4cc4_9AB4_37A6F31DF36A" text="0..1" modelElement="EAID_dstE28283_E9BB_4790_9AB4_37A6F31DF36A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_940D_4cc4_9AB4_37A6F31DF36A" x="318" y="506" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_940D_4cc4_9AB4_37A6F31DF36A" x="196" y="501"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_940D_4cc4_9AB4_37A6F31DF36A" x="337" y="501"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AA5E4159_940D_4cc4_B742_4DC2F5EAF55E" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" modelElement="EAID_15B1CFC6_0B95_4c94_B742_4DC2F5EAF55E">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_940D_4cc4_B742_4DC2F5EAF55E" text="+epo-ord:hasPriceDiscountInformation" modelElement="EAID_dstB1CFC6_0B95_4c94_B742_4DC2F5EAF55E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_940D_4cc4_B742_4DC2F5EAF55E" x="35" y="311" width="154" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_940D_4cc4_B742_4DC2F5EAF55E" text="0..1" modelElement="EAID_dstB1CFC6_0B95_4c94_B742_4DC2F5EAF55E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_940D_4cc4_B742_4DC2F5EAF55E" x="112" y="294" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_940D_4cc4_B742_4DC2F5EAF55E" x="100" y="461"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_940D_4cc4_B742_4DC2F5EAF55E" x="100" y="289"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AA5E4159_940D_4cc4_BD03_7B202CFA4807" source="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" target="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" modelElement="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_940D_4cc4_BD03_7B202CFA4807" text="+epo-cat:specifiesItem" modelElement="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_940D_4cc4_BD03_7B202CFA4807" x="621" y="207" width="92" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_940D_4cc4_BD03_7B202CFA4807" text="1" modelElement="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_940D_4cc4_BD03_7B202CFA4807" x="707" y="230" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_940D_4cc4_BD03_7B202CFA4807" x="618" y="226"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_940D_4cc4_BD03_7B202CFA4807" x="715" y="225"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AA5E4159_940D_4cc4_9551_9C0C13B80044" source="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_940D_4cc4_9551_9C0C13B80044" text="+adms:identifier" modelElement="EAID_dst87FBF1_89C8_4ed0_9551_9C0C13B80044">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_940D_4cc4_9551_9C0C13B80044" x="647" y="50" width="66" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_940D_4cc4_9551_9C0C13B80044" text="0..1" modelElement="EAID_dst87FBF1_89C8_4ed0_9551_9C0C13B80044">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_940D_4cc4_9551_9C0C13B80044" x="696" y="73" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_940D_4cc4_9551_9C0C13B80044" x="489" y="198"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_940D_4cc4_9551_9C0C13B80044" x="489" y="68"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_940D_4cc4_9551_9C0C13B80044" x="715" y="68"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AA5E4159_940D_4cc4_89A8_7BF01AA3F7CB" source="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" target="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" modelElement="EAID_F3984A8F_8800_4bd8_89A8_7BF01AA3F7CB">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_940D_4cc4_89A8_7BF01AA3F7CB" text="+epo-inv:isSpecificToInvoiceLine" modelElement="EAID_dst984A8F_8800_4bd8_89A8_7BF01AA3F7CB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_940D_4cc4_89A8_7BF01AA3F7CB" x="227" y="302" width="130" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_940D_4cc4_89A8_7BF01AA3F7CB" text="0..*" modelElement="EAID_dst984A8F_8800_4bd8_89A8_7BF01AA3F7CB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_940D_4cc4_89A8_7BF01AA3F7CB" x="341" y="330" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_940D_4cc4_89A8_7BF01AA3F7CB" x="206" y="289"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_940D_4cc4_89A8_7BF01AA3F7CB" x="206" y="325"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_940D_4cc4_89A8_7BF01AA3F7CB" x="360" y="325"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AA5E4159_940D_4cc4_854A_CE68DE5CB673" source="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" target="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" modelElement="EAID_CF00A26F_CB76_4971_854A_CE68DE5CB673">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_940D_4cc4_854A_CE68DE5CB673" x="493" y="314"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_940D_4cc4_854A_CE68DE5CB673" x="493" y="260"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AA5E4159_940D_4cc4_B87E_F0795660EA2B" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" modelElement="EAID_056C94FE_E7B7_428e_B87E_F0795660EA2B">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_940D_4cc4_B87E_F0795660EA2B" x="761" y="280"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_940D_4cc4_B87E_F0795660EA2B" x="761" y="348"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AA5E4159_940D_4cc4_A80A_3CDDD84D3629" source="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" target="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" modelElement="EAID_0692BD51_5113_4e40_A80A_3CDDD84D3629">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_940D_4cc4_A80A_3CDDD84D3629" text="+epo-cat:describesItem" modelElement="EAID_dst92BD51_5113_4e40_A80A_3CDDD84D3629">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_940D_4cc4_A80A_3CDDD84D3629" x="964" y="205" width="95" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_940D_4cc4_A80A_3CDDD84D3629" text="1" modelElement="EAID_dst92BD51_5113_4e40_A80A_3CDDD84D3629">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_940D_4cc4_A80A_3CDDD84D3629" x="964" y="228" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_940D_4cc4_A80A_3CDDD84D3629" x="1063" y="223"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_940D_4cc4_A80A_3CDDD84D3629" x="961" y="223"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AA5E4159_940D_4cc4_A513_76150076F808" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_52CB7369_B0C2_4acc_A513_76150076F808">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_940D_4cc4_A513_76150076F808" text="+epo-inv:hasItemClassificationIdentifier" modelElement="EAID_dstCB7369_B0C2_4acc_A513_76150076F808">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_940D_4cc4_A513_76150076F808" x="788" y="125" width="159" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_940D_4cc4_A513_76150076F808" text="0..*" modelElement="EAID_dstCB7369_B0C2_4acc_A513_76150076F808">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_940D_4cc4_A513_76150076F808" x="872" y="94" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_940D_4cc4_A513_76150076F808" x="860" y="166"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_940D_4cc4_A513_76150076F808" x="860" y="89"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AA5E4159_940D_4cc4_A201_D8391B5C67DF" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_ECEFDC69_19B4_47d7_A201_D8391B5C67DF">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_940D_4cc4_A201_D8391B5C67DF" text="+epo:hasBuyerItemID" modelElement="EAID_dstEFDC69_19B4_47d7_A201_D8391B5C67DF">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_940D_4cc4_A201_D8391B5C67DF" x="906" y="106" width="89" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_940D_4cc4_A201_D8391B5C67DF" text="0..1" modelElement="EAID_dstEFDC69_19B4_47d7_A201_D8391B5C67DF">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_940D_4cc4_A201_D8391B5C67DF" x="963" y="94" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_940D_4cc4_A201_D8391B5C67DF" x="951" y="166"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_940D_4cc4_A201_D8391B5C67DF" x="951" y="89"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AA5E4159_940D_4cc4_A8BC_8FBCF102380D" source="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" target="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3" modelElement="EAID_30CBA4D5_2CA0_4043_A8BC_8FBCF102380D">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_940D_4cc4_A8BC_8FBCF102380D" x="233" y="604"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_940D_4cc4_A8BC_8FBCF102380D" x="233" y="563"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AA5E4159_940D_4cc4_A19A_C5D793FA14E3" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12" modelElement="EAID_7EF1D4F7_398F_4f04_A19A_C5D793FA14E3">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_940D_4cc4_A19A_C5D793FA14E3" x="923" y="280"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_940D_4cc4_A19A_C5D793FA14E3" x="923" y="348"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AA5E4159_940D_4cc4_A715_C0AF0EF80B65" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_940D_4cc4_A715_C0AF0EF80B65" text="+epo-cat:hasNetQuantity" modelElement="EAID_dst9E2AC7_4D59_4119_A715_C0AF0EF80B65">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_940D_4cc4_A715_C0AF0EF80B65" x="269" y="605" width="102" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_940D_4cc4_A715_C0AF0EF80B65" text="0..1" modelElement="EAID_dst9E2AC7_4D59_4119_A715_C0AF0EF80B65">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_940D_4cc4_A715_C0AF0EF80B65" x="246" y="625" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_940D_4cc4_A715_C0AF0EF80B65" x="838" y="280"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_940D_4cc4_A715_C0AF0EF80B65" x="838" y="620"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_940D_4cc4_A715_C0AF0EF80B65" x="243" y="620"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AA5E4159_940D_4cc4_84F1_8A3969FE662E" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_15464872_BFB6_40bb_84F1_8A3969FE662E">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_940D_4cc4_84F1_8A3969FE662E" text="+epo:hasItemStandardID" modelElement="EAID_dst464872_BFB6_40bb_84F1_8A3969FE662E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_940D_4cc4_84F1_8A3969FE662E" x="736" y="143" width="102" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_940D_4cc4_84F1_8A3969FE662E" text="0..*" modelElement="EAID_dst464872_BFB6_40bb_84F1_8A3969FE662E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_940D_4cc4_84F1_8A3969FE662E" x="796" y="94" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_940D_4cc4_84F1_8A3969FE662E" x="784" y="166"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_940D_4cc4_84F1_8A3969FE662E" x="784" y="89"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AA5E4159_940D_4cc4_A49B_8791C8D7CBEA" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_940D_4cc4_A49B_8791C8D7CBEA" text="+epo:hasSellerItemID" modelElement="EAID_dst6B650B_17CC_499e_A49B_8791C8D7CBEA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_940D_4cc4_A49B_8791C8D7CBEA" x="693" y="118" width="88" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_940D_4cc4_A49B_8791C8D7CBEA" text="0..1" modelElement="EAID_dst6B650B_17CC_499e_A49B_8791C8D7CBEA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_940D_4cc4_A49B_8791C8D7CBEA" x="747" y="94" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_940D_4cc4_A49B_8791C8D7CBEA" x="735" y="166"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_940D_4cc4_A49B_8791C8D7CBEA" x="735" y="89"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AA5E4159_940D_4cc4_AA00_34CA1CC60CA2" source="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_B9C9C412_36FA_46d5_AA00_34CA1CC60CA2">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_940D_4cc4_AA00_34CA1CC60CA2" text="+epo-cat:hasQualifiedValue" modelElement="EAID_dstC9C412_36FA_46d5_AA00_34CA1CC60CA2">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_940D_4cc4_AA00_34CA1CC60CA2" x="268" y="637" width="112" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_940D_4cc4_AA00_34CA1CC60CA2" text="0..1" modelElement="EAID_dstC9C412_36FA_46d5_AA00_34CA1CC60CA2">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_940D_4cc4_AA00_34CA1CC60CA2" x="246" y="658" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_940D_4cc4_AA00_34CA1CC60CA2" x="1170" y="267"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_940D_4cc4_AA00_34CA1CC60CA2" x="1170" y="653"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_940D_4cc4_AA00_34CA1CC60CA2" x="243" y="653"/>
+			</ownedElement>
+		</umldi:Diagram>
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_F47DCEA4_48E2_4aca_B41C_421D570CE41D" isFrame="false" modelElement="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D">
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F47DCEA4_48E2_4aca_9B44_2FCDD6AB5C9D" modelElement="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_48E2_4aca_9B44_2FCDD6AB5C9D" text="epo:MonetaryValue"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_48E2_4aca_9B44_2FCDD6AB5C9D" x="1052" y="151" width="267" height="98"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F47DCEA4_48E2_4aca_8793_87E238D6811B" modelElement="EAID_28F811B2_B8F5_4649_8793_87E238D6811B">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_48E2_4aca_8793_87E238D6811B" text="epo-cat:CatalogueLine"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_48E2_4aca_8793_87E238D6811B" x="377" y="406" width="263" height="124"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F47DCEA4_48E2_4aca_A67D_5F0D11370DF4" modelElement="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_48E2_4aca_A67D_5F0D11370DF4" text="epo-cat:Price"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_48E2_4aca_A67D_5F0D11370DF4" x="1074" y="414" width="190" height="108"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F47DCEA4_48E2_4aca_9313_58C4BB4EB1A7" modelElement="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_48E2_4aca_9313_58C4BB4EB1A7" text="epo-cat:Line"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_48E2_4aca_9313_58C4BB4EB1A7" x="392" y="165" width="232" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F47DCEA4_48E2_4aca_B200_94202420C754" modelElement="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_48E2_4aca_B200_94202420C754" text="epo-cat:Item"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_48E2_4aca_B200_94202420C754" x="52" y="143" width="246" height="114"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F47DCEA4_48E2_4aca_960F_C4C98C40706A" modelElement="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_48E2_4aca_960F_C4C98C40706A" text="epo-ord:OrderLine"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_48E2_4aca_960F_C4C98C40706A" x="788" y="308" width="90" height="47"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F47DCEA4_48E2_4aca_BBE0_0475CA9DB28A" modelElement="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_48E2_4aca_BBE0_0475CA9DB28A" text="epo-inv:InvoiceLine"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_48E2_4aca_BBE0_0475CA9DB28A" x="722" y="165" width="222" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F47DCEA4_48E2_4aca_8D25_BA714BA9C3EC" modelElement="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_48E2_4aca_8D25_BA714BA9C3EC" text="epo:Quantity"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_48E2_4aca_8D25_BA714BA9C3EC" x="1067" y="568" width="205" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F47DCEA4_48E2_4aca_A610_DCE4C9E2C0F3" modelElement="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_48E2_4aca_A610_DCE4C9E2C0F3" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_48E2_4aca_A610_DCE4C9E2C0F3" text="at-voc:measurement-unit"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_48E2_4aca_A610_DCE4C9E2C0F3" x="864" y="574" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F47DCEA4_48E2_4aca_98C3_93AE6677F8CA" modelElement="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_48E2_4aca_98C3_93AE6677F8CA" text="epo-ord:AllowanceInformation"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_48E2_4aca_98C3_93AE6677F8CA" x="1493" y="433" width="154" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F47DCEA4_48E2_4aca_AAE5_65D2B64C35E1" modelElement="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_48E2_4aca_AAE5_65D2B64C35E1" text="epo-ord:AllowanceChargeInformation"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_48E2_4aca_AAE5_65D2B64C35E1" x="1420" y="165" width="300" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F47DCEA4_48E2_4aca_BD03_7B202CFA4807" source="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" target="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" modelElement="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_48E2_4aca_BD03_7B202CFA4807" text="+epo-cat:specifiesItem" modelElement="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_48E2_4aca_BD03_7B202CFA4807" x="301" y="183" width="92" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_48E2_4aca_BD03_7B202CFA4807" text="1" modelElement="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_48E2_4aca_BD03_7B202CFA4807" x="301" y="206" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_48E2_4aca_BD03_7B202CFA4807" x="392" y="201"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_48E2_4aca_BD03_7B202CFA4807" x="298" y="201"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F47DCEA4_48E2_4aca_B742_4DC2F5EAF55E" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" modelElement="EAID_15B1CFC6_0B95_4c94_B742_4DC2F5EAF55E">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_48E2_4aca_B742_4DC2F5EAF55E" text="+epo-ord:hasPriceDiscountInformation" modelElement="EAID_dstB1CFC6_0B95_4c94_B742_4DC2F5EAF55E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_48E2_4aca_B742_4DC2F5EAF55E" x="1327" y="447" width="154" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_48E2_4aca_B742_4DC2F5EAF55E" text="0..1" modelElement="EAID_dstB1CFC6_0B95_4c94_B742_4DC2F5EAF55E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_48E2_4aca_B742_4DC2F5EAF55E" x="1474" y="473" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_48E2_4aca_B742_4DC2F5EAF55E" x="1264" y="468"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_48E2_4aca_B742_4DC2F5EAF55E" x="1493" y="468"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F47DCEA4_48E2_4aca_8481_D40EEC904171" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_9EA3B8C3_695C_4b42_8481_D40EEC904171">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_48E2_4aca_8481_D40EEC904171" text="+epo-cat:hasBaseQuantity" modelElement="EAID_dstA3B8C3_695C_4b42_8481_D40EEC904171">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_48E2_4aca_8481_D40EEC904171" x="1132" y="535" width="107" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_48E2_4aca_8481_D40EEC904171" text="0..1" modelElement="EAID_dstA3B8C3_695C_4b42_8481_D40EEC904171">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_48E2_4aca_8481_D40EEC904171" x="1192" y="550" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_48E2_4aca_8481_D40EEC904171" x="1184" y="522"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_48E2_4aca_8481_D40EEC904171" x="1184" y="568"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F47DCEA4_48E2_4aca_B3EA_A725F5A385F7" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_48E2_4aca_B3EA_A725F5A385F7" text="+epo-cat:hasNetMonetaryValue" modelElement="EAID_dst92648E_ABC4_4408_B3EA_A725F5A385F7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_48E2_4aca_B3EA_A725F5A385F7" x="1077" y="300" width="130" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_48E2_4aca_B3EA_A725F5A385F7" text="1" modelElement="EAID_dst92648E_ABC4_4408_B3EA_A725F5A385F7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_48E2_4aca_B3EA_A725F5A385F7" x="1156" y="254" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_48E2_4aca_B3EA_A725F5A385F7" x="1144" y="414"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_48E2_4aca_B3EA_A725F5A385F7" x="1144" y="249"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F47DCEA4_48E2_4aca_BD51_7717D3E67FCB" source="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" target="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" modelElement="EAID_C33C0B35_4ADE_463d_BD51_7717D3E67FCB">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_48E2_4aca_BD51_7717D3E67FCB" x="508" y="406"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_48E2_4aca_BD51_7717D3E67FCB" x="508" y="235"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F47DCEA4_48E2_4aca_B50C_8F40D73778CB" source="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" target="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" modelElement="EAID_5E6E2C47_4590_4730_B50C_8F40D73778CB">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_48E2_4aca_B50C_8F40D73778CB" text="+epo-cat:hasStandardisedUnitPrice" modelElement="EAID_dst6E2C47_4590_4730_B50C_8F40D73778CB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_48E2_4aca_B50C_8F40D73778CB" x="928" y="480" width="140" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_48E2_4aca_B50C_8F40D73778CB" text="0..*" modelElement="EAID_dst6E2C47_4590_4730_B50C_8F40D73778CB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_48E2_4aca_B50C_8F40D73778CB" x="1055" y="503" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_48E2_4aca_B50C_8F40D73778CB" x="640" y="498"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_48E2_4aca_B50C_8F40D73778CB" x="1074" y="498"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F47DCEA4_48E2_4aca_A013_1A7BA2859AFA" source="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" target="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" modelElement="EAID_3C28A6D1_3F44_48a1_A013_1A7BA2859AFA">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_48E2_4aca_A013_1A7BA2859AFA" text="+epo-cat:hasPrice" modelElement="EAID_dst28A6D1_3F44_48a1_A013_1A7BA2859AFA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_48E2_4aca_A013_1A7BA2859AFA" x="968" y="447" width="72" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_48E2_4aca_A013_1A7BA2859AFA" text="1..*" modelElement="EAID_dst28A6D1_3F44_48a1_A013_1A7BA2859AFA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_48E2_4aca_A013_1A7BA2859AFA" x="1041" y="466" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_48E2_4aca_A013_1A7BA2859AFA" x="640" y="462"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_48E2_4aca_A013_1A7BA2859AFA" x="1074" y="462"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F47DCEA4_48E2_4aca_9AB4_37A6F31DF36A" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_47E28283_E9BB_4790_9AB4_37A6F31DF36A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_48E2_4aca_9AB4_37A6F31DF36A" text="+epo-ord:hasGrossMonetaryValue" modelElement="EAID_dstE28283_E9BB_4790_9AB4_37A6F31DF36A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_48E2_4aca_9AB4_37A6F31DF36A" x="1180" y="280" width="139" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_48E2_4aca_9AB4_37A6F31DF36A" text="0..1" modelElement="EAID_dstE28283_E9BB_4790_9AB4_37A6F31DF36A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_48E2_4aca_9AB4_37A6F31DF36A" x="1240" y="254" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_48E2_4aca_9AB4_37A6F31DF36A" x="1228" y="414"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_48E2_4aca_9AB4_37A6F31DF36A" x="1228" y="249"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F47DCEA4_48E2_4aca_9003_79369EBD749D" source="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_5EDC73B7_1ABC_4e6f_9003_79369EBD749D">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_48E2_4aca_9003_79369EBD749D" text="+epo-inv:hasNetAmount" modelElement="EAID_dstDC73B7_1ABC_4e6f_9003_79369EBD749D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_48E2_4aca_9003_79369EBD749D" x="951" y="182" width="99" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_48E2_4aca_9003_79369EBD749D" text="1" modelElement="EAID_dstDC73B7_1ABC_4e6f_9003_79369EBD749D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_48E2_4aca_9003_79369EBD749D" x="1044" y="205" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_48E2_4aca_9003_79369EBD749D" x="944" y="200"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_48E2_4aca_9003_79369EBD749D" x="1052" y="200"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F47DCEA4_48E2_4aca_AAF8_2E19960E553F" source="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_516CC611_B255_4c67_AAF8_2E19960E553F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_48E2_4aca_AAF8_2E19960E553F" text="+epo-cat:hasAmount" modelElement="EAID_dst6CC611_B255_4c67_AAF8_2E19960E553F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_48E2_4aca_AAF8_2E19960E553F" x="1322" y="163" width="85" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_48E2_4aca_AAF8_2E19960E553F" text="1" modelElement="EAID_dst6CC611_B255_4c67_AAF8_2E19960E553F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_48E2_4aca_AAF8_2E19960E553F" x="1322" y="186" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_48E2_4aca_AAF8_2E19960E553F" x="1420" y="181"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_48E2_4aca_AAF8_2E19960E553F" x="1319" y="181"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F47DCEA4_48E2_4aca_B731_D93BB56777D3" source="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" target="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" modelElement="EAID_308D4104_53D2_4be0_B731_D93BB56777D3">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_48E2_4aca_B731_D93BB56777D3" x="1570" y="433"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_48E2_4aca_B731_D93BB56777D3" x="1570" y="235"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F47DCEA4_48E2_4aca_A8BC_8FBCF102380D" source="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" target="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3" modelElement="EAID_30CBA4D5_2CA0_4043_A8BC_8FBCF102380D">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_48E2_4aca_A8BC_8FBCF102380D" x="1067" y="604"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_48E2_4aca_A8BC_8FBCF102380D" x="954" y="604"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F47DCEA4_48E2_4aca_B786_4BBE7F52C5D5" source="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" target="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" modelElement="EAID_02BBBEAA_ED71_4eaf_B786_4BBE7F52C5D5">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_48E2_4aca_B786_4BBE7F52C5D5" text="+epo-cat:hasPrice" modelElement="EAID_dstBBBEAA_ED71_4eaf_B786_4BBE7F52C5D5">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_48E2_4aca_B786_4BBE7F52C5D5" x="1065" y="363" width="72" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_48E2_4aca_B786_4BBE7F52C5D5" text="1..*" modelElement="EAID_dstBBBEAA_ED71_4eaf_B786_4BBE7F52C5D5">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_48E2_4aca_B786_4BBE7F52C5D5" x="1107" y="396" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_48E2_4aca_B786_4BBE7F52C5D5" x="933" y="235"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_48E2_4aca_B786_4BBE7F52C5D5" x="933" y="327"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_48E2_4aca_B786_4BBE7F52C5D5" x="1099" y="327"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_48E2_4aca_B786_4BBE7F52C5D5" x="1099" y="414"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F47DCEA4_48E2_4aca_A478_9179AAD0DF81" source="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" target="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" modelElement="EAID_8254F8D7_D6F0_4c63_A478_9179AAD0DF81">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_48E2_4aca_A478_9179AAD0DF81" text="+epo-inv:refersToOrderLine" modelElement="EAID_dst54F8D7_D6F0_4c63_A478_9179AAD0DF81">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_48E2_4aca_A478_9179AAD0DF81" x="788" y="261" width="111" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_48E2_4aca_A478_9179AAD0DF81" text="0..1" modelElement="EAID_dst54F8D7_D6F0_4c63_A478_9179AAD0DF81">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_48E2_4aca_A478_9179AAD0DF81" x="841" y="290" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_48E2_4aca_A478_9179AAD0DF81" x="833" y="235"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_48E2_4aca_A478_9179AAD0DF81" x="833" y="308"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F47DCEA4_48E2_4aca_854A_CE68DE5CB673" source="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" target="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" modelElement="EAID_CF00A26F_CB76_4971_854A_CE68DE5CB673">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_48E2_4aca_854A_CE68DE5CB673" x="722" y="200"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_48E2_4aca_854A_CE68DE5CB673" x="624" y="200"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F47DCEA4_48E2_4aca_BCCC_37421BA960DE" source="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" target="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" modelElement="EAID_AA589EDA_B26B_44c3_BCCC_37421BA960DE">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_48E2_4aca_BCCC_37421BA960DE" x="788" y="332"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_48E2_4aca_BCCC_37421BA960DE" x="575" y="332"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_48E2_4aca_BCCC_37421BA960DE" x="575" y="235"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F47DCEA4_48E2_4aca_A0D6_59757CEC226D" source="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" target="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" modelElement="EAID_1F2E5010_8DA9_46f5_A0D6_59757CEC226D">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_48E2_4aca_A0D6_59757CEC226D" text="+epo-cat:hasPrice" modelElement="EAID_dst2E5010_8DA9_46f5_A0D6_59757CEC226D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_48E2_4aca_A0D6_59757CEC226D" x="1000" y="415" width="72" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_48E2_4aca_A0D6_59757CEC226D" text="0..*" modelElement="EAID_dst2E5010_8DA9_46f5_A0D6_59757CEC226D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_48E2_4aca_A0D6_59757CEC226D" x="1037" y="435" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_48E2_4aca_A0D6_59757CEC226D" x="849" y="355"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_48E2_4aca_A0D6_59757CEC226D" x="849" y="433"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_48E2_4aca_A0D6_59757CEC226D" x="1074" y="433"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F47DCEA4_48E2_4aca_8A07_9FF99AC0CF07" source="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" target="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" modelElement="EAID_082B76C7_EF6B_4c76_8A07_9FF99AC0CF07">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_48E2_4aca_8A07_9FF99AC0CF07" text="+epo-ord:refersToCatalogueLine" modelElement="EAID_dst2B76C7_EF6B_4c76_8A07_9FF99AC0CF07">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_48E2_4aca_8A07_9FF99AC0CF07" x="643" y="414" width="129" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_48E2_4aca_8A07_9FF99AC0CF07" text="0..1" modelElement="EAID_dst2B76C7_EF6B_4c76_8A07_9FF99AC0CF07">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_48E2_4aca_8A07_9FF99AC0CF07" x="643" y="437" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_48E2_4aca_8A07_9FF99AC0CF07" x="814" y="355"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_48E2_4aca_8A07_9FF99AC0CF07" x="814" y="432"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_48E2_4aca_8A07_9FF99AC0CF07" x="640" y="432"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F47DCEA4_48E2_4aca_91D4_F6387465413F" source="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_202AF5A1_B4FE_48a4_91D4_F6387465413F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_48E2_4aca_91D4_F6387465413F" text="+epo:isCalculatedOn" modelElement="EAID_dst2AF5A1_B4FE_48a4_91D4_F6387465413F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_48E2_4aca_91D4_F6387465413F" x="1322" y="199" width="83" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_48E2_4aca_91D4_F6387465413F" text="0..1" modelElement="EAID_dst2AF5A1_B4FE_48a4_91D4_F6387465413F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_48E2_4aca_91D4_F6387465413F" x="1322" y="222" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_48E2_4aca_91D4_F6387465413F" x="1420" y="217"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_48E2_4aca_91D4_F6387465413F" x="1319" y="217"/>
+			</ownedElement>
+		</umldi:Diagram>
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_88552016_78CC_428a_9DCF_518285F01AEB" isFrame="false" modelElement="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D">
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_88552016_78CC_428a_8DDF_82EB3F869963" modelElement="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_78CC_428a_8DDF_82EB3F869963" text="epo-inv:Invoice"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_78CC_428a_8DDF_82EB3F869963" x="374" y="410" width="265" height="96"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_88552016_78CC_428a_B217_37E957B3B448" modelElement="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_78CC_428a_B217_37E957B3B448" text="epo:Document"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_78CC_428a_B217_37E957B3B448" x="410" y="137" width="195" height="140"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_88552016_78CC_428a_83AB_E27B06BA632B" modelElement="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_78CC_428a_83AB_E27B06BA632B" text="epo-cat:PostAwardDocument"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_78CC_428a_83AB_E27B06BA632B" x="438" y="315" width="137" height="46"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_88552016_78CC_428a_932A_FE0341103DDA" modelElement="EAID_08C029B6_D4CA_4b3f_932A_FE0341103DDA">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_78CC_428a_932A_FE0341103DDA" text="epo-inv:CreditNote"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_78CC_428a_932A_FE0341103DDA" x="451" y="560" width="110" height="35"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_88552016_78CC_428a_B935_B52376928738" modelElement="EAID_C3684D7C_E07D_415a_B935_B52376928738">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_78CC_428a_B935_B52376928738" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_78CC_428a_B935_B52376928738" text="at-voc-new:document-type"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_78CC_428a_B935_B52376928738" x="693" y="308" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_88552016_78CC_428a_BBE0_0475CA9DB28A" modelElement="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_78CC_428a_BBE0_0475CA9DB28A" text="epo-inv:InvoiceLine"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_78CC_428a_BBE0_0475CA9DB28A" x="771" y="423" width="222" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_88552016_78CC_428a_BDEA_7E543A745220" modelElement="EAID_666DA030_1385_4c0a_BDEA_7E543A745220">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_78CC_428a_BDEA_7E543A745220" text="epo-inv:CreditNoteLine"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_78CC_428a_BDEA_7E543A745220" x="817" y="560" width="129" height="35"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_88552016_78CC_428a_B90D_F964CC48D88F" modelElement="EAID_90ECE48B_7614_4efa_B90D_F964CC48D88F">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_78CC_428a_B90D_F964CC48D88F" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_78CC_428a_B90D_F964CC48D88F" x="682" y="570" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_88552016_78CC_428a_B1AC_9656FAB69479" modelElement="EAID_119CC125_3338_4d92_B1AC_9656FAB69479">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_78CC_428a_B1AC_9656FAB69479" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_78CC_428a_B1AC_9656FAB69479" x="682" y="451" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_88552016_78CC_428a_A69C_3735046D0F48" modelElement="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_78CC_428a_A69C_3735046D0F48" text="epo-inv:PaymentInstructionsInformation"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_78CC_428a_A69C_3735046D0F48" x="68" y="493" width="285" height="72"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_88552016_78CC_428a_A04C_8DBE25A452AC" source="EAID_90ECE48B_7614_4efa_B90D_F964CC48D88F" target="EAID_119CC125_3338_4d92_B1AC_9656FAB69479" modelElement="EAID_9E6525F3_95EC_40a8_A04C_8DBE25A452AC">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_78CC_428a_A04C_8DBE25A452AC" x="689" y="577"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_78CC_428a_A04C_8DBE25A452AC" x="689" y="458"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_88552016_78CC_428a_BD58_E0A4DB42E28A" source="EAID_666DA030_1385_4c0a_BDEA_7E543A745220" target="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" modelElement="EAID_D733E621_C963_47fe_BD58_E0A4DB42E28A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_78CC_428a_BD58_E0A4DB42E28A" text="+epo-inv:isSubmittedForInvoiceLine" modelElement="EAID_dst33E621_C963_47fe_BD58_E0A4DB42E28A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_78CC_428a_BD58_E0A4DB42E28A" x="862" y="522" width="144" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_78CC_428a_BD58_E0A4DB42E28A" text="0..1" modelElement="EAID_dst33E621_C963_47fe_BD58_E0A4DB42E28A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_78CC_428a_BD58_E0A4DB42E28A" x="930" y="498" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_78CC_428a_BD58_E0A4DB42E28A" x="918" y="560"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_78CC_428a_BD58_E0A4DB42E28A" x="918" y="493"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_88552016_78CC_428a_8C18_F21C663487A4" source="EAID_666DA030_1385_4c0a_BDEA_7E543A745220" target="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" modelElement="EAID_B721C9F4_7411_44f0_8C18_F21C663487A4">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_78CC_428a_8C18_F21C663487A4" x="850" y="560"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_78CC_428a_8C18_F21C663487A4" x="850" y="493"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_88552016_78CC_428a_8899_771627409CB7" source="EAID_08C029B6_D4CA_4b3f_932A_FE0341103DDA" target="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" modelElement="EAID_18B4EBAA_337C_4029_8899_771627409CB7">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_78CC_428a_8899_771627409CB7" text="+epo-inv:refersToInvoice" modelElement="EAID_dstB4EBAA_337C_4029_8899_771627409CB7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_78CC_428a_8899_771627409CB7" x="418" y="527" width="101" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_78CC_428a_8899_771627409CB7" text="0..1" modelElement="EAID_dstB4EBAA_337C_4029_8899_771627409CB7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_78CC_428a_8899_771627409CB7" x="488" y="511" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_78CC_428a_8899_771627409CB7" x="476" y="560"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_78CC_428a_8899_771627409CB7" x="476" y="506"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_88552016_78CC_428a_B11B_8D183EDF5B42" source="EAID_08C029B6_D4CA_4b3f_932A_FE0341103DDA" target="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" modelElement="EAID_206A035D_9984_470b_B11B_8D183EDF5B42">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_78CC_428a_B11B_8D183EDF5B42" x="529" y="560"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_78CC_428a_B11B_8D183EDF5B42" x="529" y="506"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_88552016_78CC_428a_A2FC_C86EE11EAC7C" source="EAID_08C029B6_D4CA_4b3f_932A_FE0341103DDA" target="EAID_666DA030_1385_4c0a_BDEA_7E543A745220" modelElement="EAID_313091EC_C442_43be_A2FC_C86EE11EAC7C">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_78CC_428a_A2FC_C86EE11EAC7C" text="+epo-inv:comprisesCreditNoteLine" modelElement="EAID_dst3091EC_C442_43be_A2FC_C86EE11EAC7C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_78CC_428a_A2FC_C86EE11EAC7C" x="678" y="559" width="137" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_78CC_428a_A2FC_C86EE11EAC7C" text="1..*" modelElement="EAID_dst3091EC_C442_43be_A2FC_C86EE11EAC7C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_78CC_428a_A2FC_C86EE11EAC7C" x="798" y="582" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_78CC_428a_A2FC_C86EE11EAC7C" x="561" y="577"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_78CC_428a_A2FC_C86EE11EAC7C" x="817" y="577"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_88552016_78CC_428a_B8A6_42826FC39635" source="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" target="EAID_C3684D7C_E07D_415a_B935_B52376928738" modelElement="EAID_233516AD_8114_473d_B8A6_42826FC39635">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_78CC_428a_B8A6_42826FC39635" x="575" y="338"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_78CC_428a_B8A6_42826FC39635" x="693" y="338"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_88552016_78CC_428a_9723_9C69BB0EB7B4" source="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_618070AC_783D_48ae_9723_9C69BB0EB7B4">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_78CC_428a_9723_9C69BB0EB7B4" x="505" y="315"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_78CC_428a_9723_9C69BB0EB7B4" x="505" y="277"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_88552016_78CC_428a_B72E_BC6C99FF3009" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_78CC_428a_B72E_BC6C99FF3009" text="+epo:hasElectronicDigest 0..*" modelElement="EAID_dstE6AD20_DD67_4f31_B72E_BC6C99FF3009">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_78CC_428a_B72E_BC6C99FF3009" x="596" y="121" width="119" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_78CC_428a_B72E_BC6C99FF3009" text="0..*" modelElement="EAID_dstE6AD20_DD67_4f31_B72E_BC6C99FF3009">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_78CC_428a_B72E_BC6C99FF3009" x="591" y="132" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_78CC_428a_B72E_BC6C99FF3009" x="605" y="151"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_78CC_428a_B72E_BC6C99FF3009" x="605" y="151"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_78CC_428a_B72E_BC6C99FF3009" x="619" y="151"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_78CC_428a_B72E_BC6C99FF3009" x="619" y="115"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_78CC_428a_B72E_BC6C99FF3009" x="583" y="115"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_78CC_428a_B72E_BC6C99FF3009" x="583" y="137"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_78CC_428a_B72E_BC6C99FF3009" x="583" y="137"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_88552016_78CC_428a_8018_10297955785C" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_39F3583F_0D40_4e9f_8018_10297955785C">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_78CC_428a_8018_10297955785C" text="+epo:associatedWith 0..*" modelElement="EAID_dstF3583F_0D40_4e9f_8018_10297955785C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_78CC_428a_8018_10297955785C" x="306" y="124" width="103" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_78CC_428a_8018_10297955785C" text="0..*" modelElement="EAID_dstF3583F_0D40_4e9f_8018_10297955785C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_78CC_428a_8018_10297955785C" x="407" y="167" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_78CC_428a_8018_10297955785C" x="425" y="137"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_78CC_428a_8018_10297955785C" x="425" y="137"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_78CC_428a_8018_10297955785C" x="425" y="116"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_78CC_428a_8018_10297955785C" x="374" y="116"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_78CC_428a_8018_10297955785C" x="374" y="162"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_78CC_428a_8018_10297955785C" x="410" y="162"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_78CC_428a_8018_10297955785C" x="410" y="162"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_88552016_78CC_428a_B8FF_34E21440DAD9" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_78CC_428a_B8FF_34E21440DAD9" text="+epo:refersToPrevious 0..*" modelElement="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_78CC_428a_B8FF_34E21440DAD9" x="465" y="97" width="109" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_78CC_428a_B8FF_34E21440DAD9" text="0..*" modelElement="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_78CC_428a_B8FF_34E21440DAD9" x="508" y="132" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_78CC_428a_B8FF_34E21440DAD9" x="541" y="137"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_78CC_428a_B8FF_34E21440DAD9" x="541" y="137"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_78CC_428a_B8FF_34E21440DAD9" x="541" y="111"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_78CC_428a_B8FF_34E21440DAD9" x="500" y="111"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_78CC_428a_B8FF_34E21440DAD9" x="500" y="137"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_78CC_428a_B8FF_34E21440DAD9" x="500" y="137"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_88552016_78CC_428a_82BB_04BA37F9657F" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" modelElement="EAID_1BF72C1B_7093_491e_82BB_04BA37F9657F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_78CC_428a_82BB_04BA37F9657F" text="+epo-inv:hasPaymentInstructionsInformation" modelElement="EAID_dstF72C1B_7093_491e_82BB_04BA37F9657F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_78CC_428a_82BB_04BA37F9657F" x="119" y="456" width="182" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_78CC_428a_82BB_04BA37F9657F" text="0..1" modelElement="EAID_dstF72C1B_7093_491e_82BB_04BA37F9657F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_78CC_428a_82BB_04BA37F9657F" x="227" y="475" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_78CC_428a_82BB_04BA37F9657F" x="374" y="439"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_78CC_428a_82BB_04BA37F9657F" x="219" y="439"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_78CC_428a_82BB_04BA37F9657F" x="219" y="493"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_88552016_78CC_428a_BAB7_F3D1FB910F35" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" modelElement="EAID_387C6C7A_CC14_4b5e_BAB7_F3D1FB910F35">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_78CC_428a_BAB7_F3D1FB910F35" x="505" y="410"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_78CC_428a_BAB7_F3D1FB910F35" x="505" y="361"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_88552016_78CC_428a_A4FB_1ADCCECB44D6" source="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" target="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" modelElement="EAID_46A59C5B_A5BD_4ae9_A4FB_1ADCCECB44D6">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_78CC_428a_A4FB_1ADCCECB44D6" text="+epo-inv:comprisesInvoiceLine" modelElement="EAID_dstA59C5B_A5BD_4ae9_A4FB_1ADCCECB44D6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_78CC_428a_A4FB_1ADCCECB44D6" x="645" y="440" width="124" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_78CC_428a_A4FB_1ADCCECB44D6" text="1..*" modelElement="EAID_dstA59C5B_A5BD_4ae9_A4FB_1ADCCECB44D6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_78CC_428a_A4FB_1ADCCECB44D6" x="752" y="463" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_78CC_428a_A4FB_1ADCCECB44D6" x="639" y="458"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_78CC_428a_A4FB_1ADCCECB44D6" x="771" y="458"/>
+			</ownedElement>
+		</umldi:Diagram>
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_08EC91F8_DB57_4285_9B0C_79300E9E4E11" isFrame="false" modelElement="EAPK_BD141F2B_B3A1_4079_99FB_B1548747E3A9">
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_08EC91F8_DB57_4285_973C_8B35E69DA361" modelElement="EAID_B011F488_70E3_4f4a_973C_8B35E69DA361">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DB57_4285_973C_8B35E69DA361" text="xsd:boolean"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DB57_4285_973C_8B35E69DA361" x="54" y="334" width="90" height="38"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_08EC91F8_DB57_4285_88C5_E6D1A1B31A48" modelElement="EAID_5E50EE4A_45CD_49b0_88C5_E6D1A1B31A48">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DB57_4285_88C5_E6D1A1B31A48" text="xsd:anyURI"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DB57_4285_88C5_E6D1A1B31A48" x="162" y="42" width="90" height="38"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_08EC91F8_DB57_4285_9264_D59F4A8A43EB" modelElement="EAID_1D7FE0CE_4B79_4c43_9264_D59F4A8A43EB">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DB57_4285_9264_D59F4A8A43EB" text="xsd:date"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DB57_4285_9264_D59F4A8A43EB" x="54" y="246" width="90" height="38"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_08EC91F8_DB57_4285_B702_8BBE941201A9" modelElement="EAID_7F47096D_17ED_4ef0_B702_8BBE941201A9">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DB57_4285_B702_8BBE941201A9" text="xsd:dateTime"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DB57_4285_B702_8BBE941201A9" x="162" y="246" width="90" height="38"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_08EC91F8_DB57_4285_85D8_650CBD717EFA" modelElement="EAID_904AAE3B_BDAD_4438_85D8_650CBD717EFA">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DB57_4285_85D8_650CBD717EFA" text="xsd:integer"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DB57_4285_85D8_650CBD717EFA" x="162" y="134" width="90" height="38"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_08EC91F8_DB57_4285_B02D_E00B66FC5EF3" modelElement="EAID_875F3C98_F2EB_4ca2_B02D_E00B66FC5EF3">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DB57_4285_B02D_E00B66FC5EF3" text="xsd:decimal"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DB57_4285_B02D_E00B66FC5EF3" x="54" y="134" width="90" height="38"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_08EC91F8_DB57_4285_8F94_00EC9DF8B207" modelElement="EAID_7E687EAB_543A_41d0_8F94_00EC9DF8B207">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DB57_4285_8F94_00EC9DF8B207" text="rdf:PlainLiteral"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DB57_4285_8F94_00EC9DF8B207" x="54" y="41" width="90" height="38"/>
+			</ownedElement>
+		</umldi:Diagram>
+	</uml:Model>
+	<xmi:Extension extender="Enterprise Architect" extenderID="6.5">
+		<elements>
+			<element xmi:idref="EAPK_9497FD7C_A2D0_4068_8D18_341098748957">
+				<packageproperties version="1.0" tpos="9"/>
+				<paths/>
+				<times created="2024-07-23 00:00:00" modified="2024-07-23 00:00:00"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;"/>
+			</element>
+			<element xmi:idref="EAPK_4262A8F2_C836_431e_93B1_11A72B7D363B" xmi:type="uml:Package" name="invoicing" scope="public">
+				<model package2="EAID_4262A8F2_C836_431e_93B1_11A72B7D363B" package="EAPK_9497FD7C_A2D0_4068_8D18_341098748957" tpos="0" ea_localid="194" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-03-20 16:22:33" modified="2024-07-23 10:14:26" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="Invoicing"/>
+				<packageproperties version="1.0"/>
+				<paths/>
+				<times created="2023-03-20 16:22:33" modified="2024-05-23 12:30:14"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
+			</element>
+			<element xmi:idref="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" xmi:type="uml:Package" name="diagrams" scope="public">
+				<model package2="EAID_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" package="EAPK_4262A8F2_C836_431e_93B1_11A72B7D363B" tpos="1" ea_localid="239" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:40:49" modified="2024-07-23 11:40:49" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="invoicing"/>
+				<packageproperties version="1.0" tpos="1"/>
+				<paths/>
+				<times created="2024-07-23 11:40:49" modified="2024-07-23 11:40:49"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+			</element>
+			<element xmi:idref="EAID_119CC125_3338_4d92_B1AC_9656FAB69479" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_46A59C5B_A5BD_4ae9_A4FB_1ADCCECB44D6">
+				<model package="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" tpos="0" ea_localid="3634" ea_eleType="element"/>
+				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-04 16:13:26" modified="2024-07-04 16:13:26" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<Generalization xmi:id="EAID_9E6525F3_95EC_40a8_A04C_8DBE25A452AC" start="EAID_90ECE48B_7614_4efa_B90D_F964CC48D88F" end="EAID_119CC125_3338_4d92_B1AC_9656FAB69479"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_2C4871BB_2DFB_424c_B8C0_041EEF1D803D" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" tpos="0" ea_localid="3603" ea_eleType="element"/>
+				<properties documentation="check https://skr.se/download/18.42336a32177c8ab158d77219/1616148012158/Referencing_and_Matching_3.pdf" isSpecification="false" sType="Note" nType="1" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-05-23 16:11:03" modified="2024-05-30 16:50:56" complexity="1" status="Proposed"/>
+				<code gentype="&lt;none&gt;"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams" relatedlinks="idref1=EAID_27A758A5_D658_4005_919F_992C4207B974;"/>
+			</element>
+			<element xmi:idref="EAID_81226A46_D82E_45a6_9FF0_E3132CF8BB02" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" tpos="0" ea_localid="3594" ea_eleType="element"/>
+				<properties documentation="this is a sub-property of epo:associatedWith? can be deprecated." isSpecification="false" sType="Note" nType="1" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-05-23 14:38:18" modified="2024-05-23 15:54:57" complexity="1" status="Proposed"/>
+				<code gentype="&lt;none&gt;"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams" relatedlinks="idref1=EAID_6A127BB3_2702_45c1_99BF_B659211FD91B;idref2=EAID_39F3583F_0D40_4e9f_8018_10297955785C;idref3=EAID_6563C83C_6869_4a08_BAC3_0D8EE5BAF10E;"/>
+			</element>
+			<element xmi:idref="EAID_90ECE48B_7614_4efa_B90D_F964CC48D88F" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_313091EC_C442_43be_A2FC_C86EE11EAC7C">
+				<model package="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" tpos="0" ea_localid="3633" ea_eleType="element"/>
+				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-04 16:13:26" modified="2024-07-04 16:13:26" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<Generalization xmi:id="EAID_9E6525F3_95EC_40a8_A04C_8DBE25A452AC" start="EAID_90ECE48B_7614_4efa_B90D_F964CC48D88F" end="EAID_119CC125_3338_4d92_B1AC_9656FAB69479"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_F6DE73A8_A504_40b6_8920_6C702CB1228E" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" tpos="0" ea_localid="3602" ea_eleType="element"/>
+				<properties documentation="are these the same?" isSpecification="false" sType="Note" nType="1" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-05-23 15:51:51" modified="2024-05-23 15:52:09" complexity="1" status="Proposed"/>
+				<code gentype="&lt;none&gt;"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams" relatedlinks="idref1=EAID_D8A21C51_ABAE_473e_819D_1729AC275BCF;idref2=EAID_9866393B_8067_4f18_9B28_69541B862505;"/>
+			</element>
+			<element xmi:idref="EAPK_FD0A4C81_A614_4022_8835_906C9079EF26" xmi:type="uml:Package" name="classes" scope="public">
+				<model package2="EAID_FD0A4C81_A614_4022_8835_906C9079EF26" package="EAPK_4262A8F2_C836_431e_93B1_11A72B7D363B" tpos="2" ea_localid="240" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:41:03" modified="2024-07-23 11:41:03" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="invoicing"/>
+				<packageproperties version="1.0" tpos="2"/>
+				<paths/>
+				<times created="2024-07-23 11:41:03" modified="2024-07-23 11:41:03"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+			</element>
+			<element xmi:idref="EAID_08C029B6_D4CA_4b3f_932A_FE0341103DDA" xmi:type="uml:Class" name="epo-inv:CreditNote" scope="public">
+				<model package="EAPK_FD0A4C81_A614_4022_8835_906C9079EF26" tpos="0" ea_localid="3631" ea_eleType="element"/>
+				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-04 13:18:13" modified="2024-07-23 11:41:14" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<links>
+					<Association xmi:id="EAID_18B4EBAA_337C_4029_8899_771627409CB7" start="EAID_08C029B6_D4CA_4b3f_932A_FE0341103DDA" end="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+					<Generalization xmi:id="EAID_206A035D_9984_470b_B11B_8D183EDF5B42" start="EAID_08C029B6_D4CA_4b3f_932A_FE0341103DDA" end="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+					<Association xmi:id="EAID_313091EC_C442_43be_A2FC_C86EE11EAC7C" start="EAID_08C029B6_D4CA_4b3f_932A_FE0341103DDA" end="EAID_666DA030_1385_4c0a_BDEA_7E543A745220"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_666DA030_1385_4c0a_BDEA_7E543A745220" xmi:type="uml:Class" name="epo-inv:CreditNoteLine" scope="public">
+				<model package="EAPK_FD0A4C81_A614_4022_8835_906C9079EF26" tpos="0" ea_localid="3632" ea_eleType="element"/>
+				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-04 16:09:48" modified="2024-07-23 11:41:14" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<links>
+					<Generalization xmi:id="EAID_B721C9F4_7411_44f0_8C18_F21C663487A4" start="EAID_666DA030_1385_4c0a_BDEA_7E543A745220" end="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+					<Association xmi:id="EAID_D733E621_C963_47fe_BD58_E0A4DB42E28A" start="EAID_666DA030_1385_4c0a_BDEA_7E543A745220" end="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+					<Association xmi:id="EAID_313091EC_C442_43be_A2FC_C86EE11EAC7C" start="EAID_08C029B6_D4CA_4b3f_932A_FE0341103DDA" end="EAID_666DA030_1385_4c0a_BDEA_7E543A745220"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D" xmi:type="uml:Class" name="epo-inv:CreditTransferInformation" scope="public">
+				<model package="EAPK_FD0A4C81_A614_4022_8835_906C9079EF26" tpos="0" ea_localid="3601" ea_eleType="element"/>
+				<properties documentation="Information about a direct payment of money from one bank account into another.&#xA;&#xA;WG approval 11/07/2024&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-05-23 15:24:50" modified="2024-07-23 11:41:14" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<attributes>
+					<attribute xmi:idref="EAID_DD1D1185_60ED_47e3_B2C2_84C182FDEDF0" name="epo-inv:hasPaymentAccountName" scope="Public">
+						<initial/>
+						<documentation value="The name of the account that can send and receive payments to and from a payment service provider.&#xA;&#xA;WG approval 07/11/2024"/>
+						<model ea_localid="2625" ea_guid="{DD1D1185-60ED-47e3-B2C2-84C182FDEDF0}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="2"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
+				<links>
+					<Association xmi:id="EAID_016185BE_FF6A_41c6_A77B_474BD1F071E0" start="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Generalization xmi:id="EAID_DCA67557_A587_48db_87FC_5179F7A10647" start="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D" end="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
+					<Association xmi:id="EAID_E6E5075B_3605_44e1_9693_42DB89B5FE8A" start="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_784ABA29_6A29_40cd_92A7_01703B8F5CBC" start="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" end="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" xmi:type="uml:Class" name="epo-inv:Invoice" scope="public">
+				<model package="EAPK_FD0A4C81_A614_4022_8835_906C9079EF26" tpos="0" ea_localid="3580" ea_eleType="element"/>
+				<properties documentation="A commercial Document issued by the Seller to the Buyer to collect payments for the goods or services provided and to state the VAT amount due by the Buyer.&#xA;&#xA;WG approval 04/07/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-05-23 13:49:23" modified="2024-07-23 11:41:14" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<attributes>
+					<attribute xmi:idref="EAID_1711B30E_37F2_41ca_8564_4BBC4C13BF02" name="epo-inv:hasTaxPointDate" scope="Public">
+						<initial/>
+						<documentation value="The date when the tax becomes accountable for the Seller and for the Buyer.&#xA;&#xA;Additional Information:&#xA;That date can be determined and differs from the date of issue of the invoice, according to the national implementation of the directive.&#xA;&#xA;WG approval 11/07/2024"/>
+						<model ea_localid="2620" ea_guid="{1711B30E-37F2-41ca-8564-4BBC4C13BF02}"/>
+						<properties type="xsd:date" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="0"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_D7FCAEBB_5199_4842_8007_2A8A8337D6A5" name="epo-inv:hasPaymentDueDate" scope="Public">
+						<initial/>
+						<documentation/>
+						<model ea_localid="2621" ea_guid="{D7FCAEBB-5199-4842-8007-2A8A8337D6A5}"/>
+						<properties type="xsd:date" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="1"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_1EB4CFFE_BB99_4a0e_9268_1A2AA729F463" name="epo-ord:hasPaymentTerm" scope="Public">
+						<initial/>
+						<documentation/>
+						<model ea_localid="2622" ea_guid="{1EB4CFFE-BB99-4a0e-9268-1A2AA729F463}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="2"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_1748B258_25BE_41e0_8396_EEAFC8CAC094" name="epo-ord:hasAccountingCost" scope="Public">
+						<initial/>
+						<documentation/>
+						<model ea_localid="2628" ea_guid="{1748B258-25BE-41e0-8396-EEAFC8CAC094}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="3"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_3598581C_D748_410e_9057_32199151B5F1" name="epo-ord:hasCustomerReference" scope="Public">
+						<initial/>
+						<documentation/>
+						<model ea_localid="2630" ea_guid="{3598581C-D748-410e-9057-32199151B5F1}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="4"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
+				<links>
+					<Association xmi:id="EAID_11ACAC30_71BA_444b_B7E9_7062F4927536" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_14B7672E_A531_45a7_BB29_EB9C02AF1551" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_1BF72C1B_7093_491e_82BB_04BA37F9657F" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48"/>
+					<Association xmi:id="EAID_27A758A5_D658_4005_919F_992C4207B974" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_2F42AA39_2FDA_4a8e_AFCA_D79514F19CB1" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_CA3B8B0A_6937_4e26_99FB_D084CA7BE4B2"/>
+					<Association xmi:id="EAID_357DB7CB_140F_4167_B4ED_129923676841" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_38248DFF_252A_4130_A663_5B676B14A992" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA"/>
+					<Generalization xmi:id="EAID_387C6C7A_CC14_4b5e_BAB7_F3D1FB910F35" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
+					<Association xmi:id="EAID_45DE6A43_058C_45b5_9BD1_786F801B344D" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+					<Association xmi:id="EAID_46A59C5B_A5BD_4ae9_A4FB_1ADCCECB44D6" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+					<Association xmi:id="EAID_5A597CB9_3064_430b_A49F_DC0D80093AA3" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_63923E1F_6373_4e4c_BC58_974BA33F469A" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+					<Association xmi:id="EAID_6AA08C54_54FE_402e_8B58_8804E01D8889" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831"/>
+					<Association xmi:id="EAID_6B579730_463A_4857_B85E_6B8274FE3291" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_78E3CABC_FE13_4dc0_BA12_FFFFA0D54042" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+					<Association xmi:id="EAID_810B5419_84AA_4cbc_BD0F_1B682068D4FB" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A"/>
+					<Association xmi:id="EAID_8A3AB883_9FE4_42fd_AFC8_322B44CBDADD" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_9BEABBA1_FA04_4d98_97DE_5E69567FADBC" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_A48A07FF_5921_4cfe_AF6B_AD0A239766EE" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_8335C0F2_1EB0_4dcb_94E3_EFE2E0DF3118"/>
+					<Association xmi:id="EAID_A959BE8D_107A_4aaf_BE64_567414A2ABCC" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
+					<Association xmi:id="EAID_ADB3D05D_CE75_486d_B38A_27314A2F62B2" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
+					<Association xmi:id="EAID_B20953AE_CF64_46a1_9C57_33B27067739D" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Dependency xmi:id="EAID_B6DB5C80_A65D_4323_B0B5_168D05C9EA24" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_9B4DBA8E_59B3_4141_97A1_6AE83FE02D1C"/>
+					<Association xmi:id="EAID_BB64ED52_1D30_4395_ABC1_3473F1CBCDE7" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_D018E81E_AC8E_4fec_BB96_E8521FBBE52E" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_6161E37F_B166_4ecf_A645_92E7667F0CC8"/>
+					<Association xmi:id="EAID_D4BBBC22_877C_48dd_86DE_6D678DB27890" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_BE27BBA5_3E46_4b8b_96B2_9B6152688E23"/>
+					<Association xmi:id="EAID_D8A21C51_ABAE_473e_819D_1729AC275BCF" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4"/>
+					<Association xmi:id="EAID_DB71486E_B9DA_432e_B070_BFF4ECEF7300" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
+					<Association xmi:id="EAID_E8BF523C_66C7_4412_825C_9D63A7DB9BFF" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01"/>
+					<Association xmi:id="EAID_F8221739_F0D9_41f5_A179_C864AC960D8F" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_FEAC08B7_4534_4c6e_98AB_31083434E530" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
+					<Association xmi:id="EAID_FF0A4C18_97A9_450b_83FC_E7F2ADB8020E" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_CF553CC8_8DC9_4ea2_B386_8ACB39A17657"/>
+					<Association xmi:id="EAID_18B4EBAA_337C_4029_8899_771627409CB7" start="EAID_08C029B6_D4CA_4b3f_932A_FE0341103DDA" end="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+					<Generalization xmi:id="EAID_206A035D_9984_470b_B11B_8D183EDF5B42" start="EAID_08C029B6_D4CA_4b3f_932A_FE0341103DDA" end="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" xmi:type="uml:Class" name="epo-inv:InvoiceLine" scope="public">
+				<model package="EAPK_FD0A4C81_A614_4022_8835_906C9079EF26" tpos="0" ea_localid="3581" ea_eleType="element"/>
+				<properties documentation="Details concerning a given unit of goods, services or works mentioned in the Invoice.&#xA;&#xA;WG approval 11/07/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-05-23 13:49:32" modified="2024-07-23 11:41:14" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<attributes>
+					<attribute xmi:idref="EAID_CAC89994_CA34_40c2_8DF8_F7EC152D6B72" name="epo-ord:hasAccountingCost" scope="Public">
+						<initial/>
+						<documentation/>
+						<model ea_localid="2631" ea_guid="{CAC89994-CA34-40c2-8DF8-F7EC152D6B72}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="0"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
+				<links>
+					<Association xmi:id="EAID_02BBBEAA_ED71_4eaf_B786_4BBE7F52C5D5" start="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" end="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
+					<Association xmi:id="EAID_30A83FCD_B7E1_4f9c_95D1_48B460BCC4B8" start="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_5EDC73B7_1ABC_4e6f_9003_79369EBD749D" start="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_6D166D58_F0F4_4650_92D7_DAC20DD7E2F8" start="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+					<Association xmi:id="EAID_8254F8D7_D6F0_4c63_A478_9179AAD0DF81" start="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" end="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
+					<Association xmi:id="EAID_8FE282D8_21BB_4e43_8F2A_1B37812ADCA1" start="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" end="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
+					<Association xmi:id="EAID_ABF2C561_D263_44c6_A9E0_140763A1B061" start="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Generalization xmi:id="EAID_CF00A26F_CB76_4971_854A_CE68DE5CB673" start="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" end="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7"/>
+					<Association xmi:id="EAID_363E463C_04A8_41ba_94C0_F1ACF5EF8818" start="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" end="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+					<Association xmi:id="EAID_46A59C5B_A5BD_4ae9_A4FB_1ADCCECB44D6" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+					<Generalization xmi:id="EAID_B721C9F4_7411_44f0_8C18_F21C663487A4" start="EAID_666DA030_1385_4c0a_BDEA_7E543A745220" end="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+					<Association xmi:id="EAID_D733E621_C963_47fe_BD58_E0A4DB42E28A" start="EAID_666DA030_1385_4c0a_BDEA_7E543A745220" end="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+					<Association xmi:id="EAID_F3984A8F_8800_4bd8_89A8_7BF01AA3F7CB" start="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" end="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_CA3B8B0A_6937_4e26_99FB_D084CA7BE4B2" xmi:type="uml:Class" name="epo-inv:InvoiceNote" scope="public">
+				<model package="EAPK_FD0A4C81_A614_4022_8835_906C9079EF26" tpos="0" ea_localid="3604" ea_eleType="element"/>
+				<properties documentation="Textual note that is relevant to the Invoice as a whole.&#xA;&#xA;WG approval 11/07/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-05-23 16:12:59" modified="2024-07-23 11:41:14" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<attributes>
+					<attribute xmi:idref="EAID_3815EBD2_CAF5_463d_AD5D_0BCDDA7CF78E" name="epo-inv:hasInvoiceNoteDescription" scope="Public">
+						<initial/>
+						<documentation value="A textual note that gives unstructured information that is relevant to the Invoice as a whole.&#xA;&#xA;WG approval 11/07/2024"/>
+						<model ea_localid="2629" ea_guid="{3815EBD2-CAF5-463d-AD5D-0BCDDA7CF78E}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="0"/>
+						<stereotype/>
+						<bounds lower="1" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
+				<links>
+					<Dependency xmi:id="EAID_EF8F663B_E588_4ac1_A6E9_14A359A79866" start="EAID_CA3B8B0A_6937_4e26_99FB_D084CA7BE4B2" end="EAID_3A12EBB2_25C7_4db8_87BC_F597669AADF3"/>
+					<Association xmi:id="EAID_2F42AA39_2FDA_4a8e_AFCA_D79514F19CB1" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_CA3B8B0A_6937_4e26_99FB_D084CA7BE4B2"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_6161E37F_B166_4ecf_A645_92E7667F0CC8" xmi:type="uml:Class" name="epo-inv:Payee" scope="public">
+				<model package="EAPK_FD0A4C81_A614_4022_8835_906C9079EF26" tpos="0" ea_localid="3595" ea_eleType="element"/>
+				<properties documentation="A Role of an Agent that receives the payment.&#xA;&#xA;Additional Information:&#xA;The role of Payee may be fulfilled by another party than the Seller, e.g. a factoring service.&#xA;&#xA;WG approval 11/07/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-05-23 14:57:02" modified="2024-07-23 11:41:15" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<links>
+					<Generalization xmi:id="EAID_D86AFBB4_83ED_4d20_960D_7A768CA3117C" start="EAID_6161E37F_B166_4ecf_A645_92E7667F0CC8" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+					<Association xmi:id="EAID_D018E81E_AC8E_4fec_BB96_E8521FBBE52E" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_6161E37F_B166_4ecf_A645_92E7667F0CC8"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_D2275688_DA87_4409_B1D5_7AAEA8D7B844" xmi:type="uml:Class" name="epo-inv:PaymentCardInformation" scope="public">
+				<model package="EAPK_FD0A4C81_A614_4022_8835_906C9079EF26" tpos="0" ea_localid="3608" ea_eleType="element"/>
+				<properties documentation="Information about card used for payment contemporaneous with invoice issuance.&#xA;&#xA;WG approval 11/07/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-05-23 16:41:58" modified="2024-07-23 11:41:15" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<attributes>
+					<attribute xmi:idref="EAID_3D19C11D_CDDF_4246_9D8D_87E2E05AACC4" name="epo-inv:hasPaymentCardPrimaryAccountNumber" scope="Public">
+						<initial/>
+						<documentation value="The series of digits embossed on the front of a card used for payment.&#xA;&#xA;WG approval 11/07/2024"/>
+						<model ea_localid="2626" ea_guid="{3D19C11D-CDDF-4246-9D8D-87E2E05AACC4}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="2"/>
+						<stereotype/>
+						<bounds lower="1" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_222A7400_1325_4619_B0D7_BA9C406F10D7" name="epo-inv:hasPaymentCardHolderName" scope="Public">
+						<initial/>
+						<documentation value="The name of the account holder of the card used for payment.&#xA;&#xA;Additional Information:&#xA;An account holder is the entity listed or identified as the holder of a Financial Account by the Financial Institution.&#xA;&#xA;WG approval 11/07/2024"/>
+						<model ea_localid="2627" ea_guid="{222A7400-1325-4619-B0D7-BA9C406F10D7}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="3"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
+				<links>
+					<Generalization xmi:id="EAID_E1227B02_660A_4a25_9EF1_B1E472EB8A4A" start="EAID_D2275688_DA87_4409_B1D5_7AAEA8D7B844" end="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
+					<Association xmi:id="EAID_FC595492_D281_46be_9A26_52D20C354765" start="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" end="EAID_D2275688_DA87_4409_B1D5_7AAEA8D7B844"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" xmi:type="uml:Class" name="epo-inv:PaymentInstructionsInformation" scope="public">
+				<model package="EAPK_FD0A4C81_A614_4022_8835_906C9079EF26" tpos="0" ea_localid="3599" ea_eleType="element"/>
+				<properties documentation="Information about the payment.&#xA;&#xA;WG approval 11/07/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-05-23 15:10:15" modified="2024-07-23 11:41:15" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<attributes>
+					<attribute xmi:idref="EAID_F88D5CB4_8B8B_4896_8812_5AF018647E86" name="epo-inv:hasPaymentMeansDescription" scope="Public">
+						<initial/>
+						<documentation value="The means for how a payment is expected to be or has been settled, expressed as text.&#xA;&#xA;WG approval 11/07/2024"/>
+						<model ea_localid="2623" ea_guid="{F88D5CB4-8B8B-4896-8812-5AF018647E86}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="0"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_9838C5B8_3C09_4de7_8684_3332CB6F10AF" name="epo-inv:hasRemittanceInformation" scope="Public">
+						<initial/>
+						<documentation value="A textual value used to establish a link between the payment and the Invoice, issued by the Seller.&#xA;&#xA;WG approval 11/07/2024"/>
+						<model ea_localid="2624" ea_guid="{9838C5B8-3C09-4de7-8684-3332CB6F10AF}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="1"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
+				<links>
+					<Dependency xmi:id="EAID_121E591C_5317_469b_8A3E_E1B1A7C39814" start="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" end="EAID_346C4D44_A35F_47f9_8527_38068914A67D"/>
+					<Association xmi:id="EAID_4DC15699_2F72_40f6_B574_D054957B5730" start="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Generalization xmi:id="EAID_6906866E_320E_4e58_A7DD_49C8A3F9638B" start="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" end="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
+					<Association xmi:id="EAID_784ABA29_6A29_40cd_92A7_01703B8F5CBC" start="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" end="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D"/>
+					<Association xmi:id="EAID_EBE8AC56_41A8_45f2_AE75_CB65D4939C94" start="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_F9E4B0C6_6B39_4211_B8F3_83FC71C1725E" start="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_FC595492_D281_46be_9A26_52D20C354765" start="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" end="EAID_D2275688_DA87_4409_B1D5_7AAEA8D7B844"/>
+					<Association xmi:id="EAID_1BF72C1B_7093_491e_82BB_04BA37F9657F" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_8335C0F2_1EB0_4dcb_94E3_EFE2E0DF3118" xmi:type="uml:Class" name="epo-inv:SellerTaxRepresentative" scope="public">
+				<model package="EAPK_FD0A4C81_A614_4022_8835_906C9079EF26" tpos="0" ea_localid="3596" ea_eleType="element"/>
+				<properties documentation="A Role of an Agent that can represent an Organization for taxation purposes.&#xA;&#xA;Additional Information:&#xA;The Seller Tax Representative Role is not a Legal Representative.&#xA;&#xA;WG approval 11/07/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-05-23 14:57:11" modified="2024-07-23 11:41:15" complexity="1" status="Proposed"/>
+				<code product_name="Java" gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<links>
+					<Generalization xmi:id="EAID_2AAB3E29_13AA_402b_B91F_9E3189FB3EC9" start="EAID_8335C0F2_1EB0_4dcb_94E3_EFE2E0DF3118" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+					<Association xmi:id="EAID_A48A07FF_5921_4cfe_AF6B_AD0A239766EE" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_8335C0F2_1EB0_4dcb_94E3_EFE2E0DF3118"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_BE27BBA5_3E46_4b8b_96B2_9B6152688E23" xmi:type="uml:Class" name="epo-inv:TaxBreakdownInformation" scope="public">
+				<model package="EAPK_FD0A4C81_A614_4022_8835_906C9079EF26" tpos="0" ea_localid="3614" ea_eleType="element"/>
+				<properties documentation="Information about tax breakdown by different categories, rates and exemption reasons.&#xA;&#xA;WG approval 11/07/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-06-06 15:25:50" modified="2024-07-23 11:41:15" complexity="1" status="Proposed"/>
+				<code product_name="Java" gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<attributes>
+					<attribute xmi:idref="EAID_5E74DE0F_A01A_42b3_93E3_B078CD17E8E6" name="epo-inv:hasTaxExemptionReasonDescription" scope="Public">
+						<initial/>
+						<documentation value="An explanation on why the amount is exempted from tax or why no tax is being charged according to the legislation, expressed as a text.&#xA;&#xA;WG approval 11/07/2024"/>
+						<model ea_localid="2632" ea_guid="{5E74DE0F-A01A-42b3-93E3-B078CD17E8E6}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="0"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
+				<links>
+					<Dependency xmi:id="EAID_2608C1AC_B598_421e_AA18_F90C2D833913" start="EAID_BE27BBA5_3E46_4b8b_96B2_9B6152688E23" end="EAID_D35F0B1D_07E6_483b_A105_B62A84FC828A"/>
+					<Association xmi:id="EAID_AF564753_2A12_4d02_8DB3_0F11F0819AB2" start="EAID_BE27BBA5_3E46_4b8b_96B2_9B6152688E23" end="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
+					<Association xmi:id="EAID_D4BBBC22_877C_48dd_86DE_6D678DB27890" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_BE27BBA5_3E46_4b8b_96B2_9B6152688E23"/>
+				</links>
+			</element>
+			<element xmi:idref="EAPK_DECC9513_1C77_480a_8233_A3818343FC1D" xmi:type="uml:Package" name="controlled vocabularies" scope="public">
+				<model package2="EAID_DECC9513_1C77_480a_8233_A3818343FC1D" package="EAPK_4262A8F2_C836_431e_93B1_11A72B7D363B" tpos="3" ea_localid="241" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:41:25" modified="2024-07-23 11:41:25" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="invoicing"/>
+				<packageproperties version="1.0" tpos="3"/>
+				<paths/>
+				<times created="2024-07-23 11:41:25" modified="2024-07-23 11:41:25"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+			</element>
+			<element xmi:idref="EAID_3A12EBB2_25C7_4db8_87BC_F597669AADF3" xmi:type="uml:Enumeration" name="at-voc-new:invoice-note-subject-code" scope="public">
+				<model package="EAPK_DECC9513_1C77_480a_8233_A3818343FC1D" tpos="0" ea_localid="3605" ea_eleType="element"/>
+				<properties documentation="this codelist might have already been used for a different post-award module (or a subset of it). we need to investigate where it is used.&#xA;&#xA;&#xA;To be chosen from the entries in UNTDID 4451 [6]." isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-05-23 16:18:42" modified="2024-07-23 11:41:35" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="controlled vocabularies"/>
+				<links>
+					<Dependency xmi:id="EAID_EF8F663B_E588_4ac1_A6E9_14A359A79866" start="EAID_CA3B8B0A_6937_4e26_99FB_D084CA7BE4B2" end="EAID_3A12EBB2_25C7_4db8_87BC_F597669AADF3"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_346C4D44_A35F_47f9_8527_38068914A67D" xmi:type="uml:Enumeration" name="at-voc-new:payment-means-type" scope="public">
+				<model package="EAPK_DECC9513_1C77_480a_8233_A3818343FC1D" tpos="0" ea_localid="3600" ea_eleType="element"/>
+				<properties documentation="The following entries from the UNTDID 4461 code list [6] may be used:&#xA;- Standing instructions&#xA;- SEPA Credit transfer&#xA;- SEPA Direct Debit&#xA;- Local Credit transfer&#xA;- Non-SEPA international credit transfer&#xA;- Local Direct Debit&#xA;- Check&#xA;- Cash&#xA;- Account transfer over the books of the same payment service provider&#xA;- No payment (add to balance)&#xA;- Payment card" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-05-23 15:12:43" modified="2024-07-23 11:41:35" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="controlled vocabularies"/>
+				<links>
+					<Dependency xmi:id="EAID_121E591C_5317_469b_8A3E_E1B1A7C39814" start="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" end="EAID_346C4D44_A35F_47f9_8527_38068914A67D"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_9B4DBA8E_59B3_4141_97A1_6AE83FE02D1C" xmi:type="uml:Enumeration" name="at-voc-new:tax-date" scope="public">
+				<model package="EAPK_DECC9513_1C77_480a_8233_A3818343FC1D" tpos="0" ea_localid="3592" ea_eleType="element"/>
+				<properties documentation="https://docs.peppol.eu/poacc/billing/3.0/codelist/UNCL2005/&#xA;&#xA;The code shall distinguish between the following entries of UNTDID 2005 [6]:&#xA;- Invoice date&#xA;- Delivery date&#xA;- Payment date" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-05-23 14:03:08" modified="2024-07-23 11:41:35" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="controlled vocabularies"/>
+				<links>
+					<Dependency xmi:id="EAID_B6DB5C80_A65D_4323_B0B5_168D05C9EA24" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_9B4DBA8E_59B3_4141_97A1_6AE83FE02D1C"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_D35F0B1D_07E6_483b_A105_B62A84FC828A" xmi:type="uml:Enumeration" name="at-voc-new:tax-exemption-reason" scope="public">
+				<model package="EAPK_DECC9513_1C77_480a_8233_A3818343FC1D" tpos="0" ea_localid="3615" ea_eleType="element"/>
+				<properties documentation="https://ec.europa.eu/digital-building-blocks/sites/display/DIGITAL/Code+lists" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-06-06 15:54:54" modified="2024-07-23 11:41:35" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="controlled vocabularies"/>
+				<links>
+					<Dependency xmi:id="EAID_2608C1AC_B598_421e_AA18_F90C2D833913" start="EAID_BE27BBA5_3E46_4b8b_96B2_9B6152688E23" end="EAID_D35F0B1D_07E6_483b_A105_B62A84FC828A"/>
+				</links>
+			</element>
+			<element xmi:idref="EAPK_BD141F2B_B3A1_4079_99FB_B1548747E3A9" xmi:type="uml:Package" name="datatype" scope="public">
+				<model package2="EAID_BD141F2B_B3A1_4079_99FB_B1548747E3A9" package="EAPK_9497FD7C_A2D0_4068_8D18_341098748957" tpos="2" ea_localid="237" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:18:28" modified="2024-07-23 10:14:26" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="Invoicing"/>
+				<packageproperties version="1.0" tpos="2"/>
+				<paths/>
+				<times created="2022-04-29 20:18:28" modified="2022-04-29 20:24:39" lastloaddate="2022-07-22 16:22:39" lastsavedate="2022-07-22 16:22:39"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" batchsave="0" batchload="0" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
+			</element>
+			<element xmi:idref="EAID_7E687EAB_543A_41d0_8F94_00EC9DF8B207" xmi:type="uml:DataType" name="rdf:PlainLiteral" scope="public">
+				<model package="EAPK_BD141F2B_B3A1_4079_99FB_B1548747E3A9" tpos="0" ea_localid="3589" ea_eleType="element"/>
+				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:26:11" modified="2023-03-12 13:37:03" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+			<element xmi:idref="EAID_5E50EE4A_45CD_49b0_88C5_E6D1A1B31A48" xmi:type="uml:DataType" name="xsd:anyURI" scope="public">
+				<model package="EAPK_BD141F2B_B3A1_4079_99FB_B1548747E3A9" tpos="0" ea_localid="3584" ea_eleType="element"/>
+				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:24:54" modified="2022-04-29 20:24:55" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+			<element xmi:idref="EAID_B011F488_70E3_4f4a_973C_8B35E69DA361" xmi:type="uml:DataType" name="xsd:boolean" scope="public">
+				<model package="EAPK_BD141F2B_B3A1_4079_99FB_B1548747E3A9" tpos="0" ea_localid="3583" ea_eleType="element"/>
+				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:18:43" modified="2022-04-29 20:18:49" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+			<element xmi:idref="EAID_1D7FE0CE_4B79_4c43_9264_D59F4A8A43EB" xmi:type="uml:DataType" name="xsd:date" scope="public">
+				<model package="EAPK_BD141F2B_B3A1_4079_99FB_B1548747E3A9" tpos="0" ea_localid="3585" ea_eleType="element"/>
+				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:25:19" modified="2022-04-29 20:25:22" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+			<element xmi:idref="EAID_7F47096D_17ED_4ef0_B702_8BBE941201A9" xmi:type="uml:DataType" name="xsd:dateTime" scope="public">
+				<model package="EAPK_BD141F2B_B3A1_4079_99FB_B1548747E3A9" tpos="0" ea_localid="3586" ea_eleType="element"/>
+				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:25:26" modified="2022-04-29 20:25:30" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+			<element xmi:idref="EAID_875F3C98_F2EB_4ca2_B02D_E00B66FC5EF3" xmi:type="uml:DataType" name="xsd:decimal" scope="public">
+				<model package="EAPK_BD141F2B_B3A1_4079_99FB_B1548747E3A9" tpos="0" ea_localid="3588" ea_eleType="element"/>
+				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:25:42" modified="2022-04-29 20:25:57" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+			<element xmi:idref="EAID_904AAE3B_BDAD_4438_85D8_650CBD717EFA" xmi:type="uml:DataType" name="xsd:integer" scope="public">
+				<model package="EAPK_BD141F2B_B3A1_4079_99FB_B1548747E3A9" tpos="0" ea_localid="3587" ea_eleType="element"/>
+				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:25:33" modified="2022-04-29 20:25:38" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+		</elements>
+		<connectors>
+			<connector xmi:idref="EAID_9E6525F3_95EC_40a8_A04C_8DBE25A452AC">
+				<source xmi:idref="EAID_90ECE48B_7614_4efa_B90D_F964CC48D88F">
+					<model ea_localid="3633" type="ProxyConnector" name="ProxyConnector"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_119CC125_3338_4d92_B1AC_9656FAB69479">
+					<model ea_localid="3634" type="ProxyConnector" name="ProxyConnector"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5428"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_18B4EBAA_337C_4029_8899_771627409CB7">
+				<source xmi:idref="EAID_08C029B6_D4CA_4b3f_932A_FE0341103DDA">
+					<model ea_localid="3631" type="Class" name="epo-inv:CreditNote"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role name="epo-inv:refersToInvoice" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5429"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:refersToInvoice"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_206A035D_9984_470b_B11B_8D183EDF5B42">
+				<source xmi:idref="EAID_08C029B6_D4CA_4b3f_932A_FE0341103DDA">
+					<model ea_localid="3631" type="Class" name="epo-inv:CreditNote"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5425"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_313091EC_C442_43be_A2FC_C86EE11EAC7C">
+				<source xmi:idref="EAID_08C029B6_D4CA_4b3f_932A_FE0341103DDA">
+					<model ea_localid="3631" type="Class" name="epo-inv:CreditNote"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_666DA030_1385_4c0a_BDEA_7E543A745220">
+					<model ea_localid="3632" type="Class" name="epo-inv:CreditNoteLine"/>
+					<role name="epo-inv:comprisesCreditNoteLine" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5426"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1..*" rt="+epo-inv:comprisesCreditNoteLine"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_B721C9F4_7411_44f0_8C18_F21C663487A4">
+				<source xmi:idref="EAID_666DA030_1385_4c0a_BDEA_7E543A745220">
+					<model ea_localid="3632" type="Class" name="epo-inv:CreditNoteLine"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+					<model ea_localid="3581" type="Class" name="epo-inv:InvoiceLine"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5427"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_D733E621_C963_47fe_BD58_E0A4DB42E28A">
+				<source xmi:idref="EAID_666DA030_1385_4c0a_BDEA_7E543A745220">
+					<model ea_localid="3632" type="Class" name="epo-inv:CreditNoteLine"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+					<model ea_localid="3581" type="Class" name="epo-inv:InvoiceLine"/>
+					<role name="epo-inv:isSubmittedForInvoiceLine" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5430"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:isSubmittedForInvoiceLine"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_016185BE_FF6A_41c6_A77B_474BD1F071E0">
+				<source xmi:idref="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D">
+					<model ea_localid="3601" type="Class" name="epo-inv:CreditTransferInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-inv:hasPaymentAccountIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5344"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="A unique identifier of the financial payment account, at a payment service provider, to which payment should be made.&#xA;&#xA;WG approval 11/07/2024&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo-inv:hasPaymentAccountIdentifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_DCA67557_A587_48db_87FC_5179F7A10647">
+				<source xmi:idref="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D">
+					<model ea_localid="3601" type="Class" name="epo-inv:CreditTransferInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A">
+					<model ea_localid="2585" type="Class" name="epo-cat:InformationHub"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5439"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_E6E5075B_3605_44e1_9693_42DB89B5FE8A">
+				<source xmi:idref="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D">
+					<model ea_localid="3601" type="Class" name="epo-inv:CreditTransferInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-inv:hasPaymentServiceProviderIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5345"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="An identifier for the payment service provider where a payment account is located.&#xA;&#xA;WG approval 11/07/2024&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:hasPaymentServiceProviderIdentifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_784ABA29_6A29_40cd_92A7_01703B8F5CBC">
+				<source xmi:idref="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48">
+					<model ea_localid="3599" type="Class" name="epo-inv:PaymentInstructionsInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D">
+					<model ea_localid="3601" type="Class" name="epo-inv:CreditTransferInformation"/>
+					<role name="epo-inv:hasCreditTransferInformation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5346"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-inv:hasCreditTransferInformation"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_11ACAC30_71BA_444b_B7E9_7062F4927536">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-inv:hasTotalTaxAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5367"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-inv:hasTotalTaxAmount"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_14B7672E_A531_45a7_BB29_EB9C02AF1551">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasPrepaidAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5370"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-ord:hasPrepaidAmount"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_1BF72C1B_7093_491e_82BB_04BA37F9657F">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48">
+					<model ea_localid="3599" type="Class" name="epo-inv:PaymentInstructionsInformation"/>
+					<role name="epo-inv:hasPaymentInstructionsInformation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5341"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:hasPaymentInstructionsInformation"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_27A758A5_D658_4005_919F_992C4207B974">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-inv:hasInvoicedObjectIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5349"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="An identifier for an object on which the invoice is based, given by the Seller."/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:hasInvoicedObjectIdentifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_2F42AA39_2FDA_4a8e_AFCA_D79514F19CB1">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_CA3B8B0A_6937_4e26_99FB_D084CA7BE4B2">
+					<model ea_localid="3604" type="Class" name="epo-inv:InvoiceNote"/>
+					<role name="epo-inv:hasInvoiceNote" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5350"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Contains Invoice Note.&#xA;&#xA;WG approval 11/07/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-inv:hasInvoiceNote"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_357DB7CB_140F_4167_B4ED_129923676841">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasTotalTaxExclusiveAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5365"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1..*" rt="+epo-ord:hasTotalTaxExclusiveAmount"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_38248DFF_252A_4130_A663_5B676B14A992">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA">
+					<model ea_localid="2040" type="Class" name="epo-ord:AllowanceInformation"/>
+					<role name="epo-ord:specifiesAllowanceInformation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5359"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-ord:specifiesAllowanceInformation"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_387C6C7A_CC14_4b5e_BAB7_F3D1FB910F35">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B">
+					<model ea_localid="3099" type="Class" name="epo-cat:PostAwardDocument"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5328"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_45DE6A43_058C_45b5_9BD1_786F801B344D">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
+					<model ea_localid="915" type="Class" name="epo:Period"/>
+					<role name="epo-inv:hasInvoicingPeriod" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5373"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:hasInvoicingPeriod"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_46A59C5B_A5BD_4ae9_A4FB_1ADCCECB44D6">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+					<model ea_localid="3581" type="Class" name="epo-inv:InvoiceLine"/>
+					<role name="epo-inv:comprisesInvoiceLine" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5327"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1..*" rt="+epo-inv:comprisesInvoiceLine"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_5A597CB9_3064_430b_A49F_DC0D80093AA3">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-inv:hasTotalAccountingCurrencyTaxAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5368"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-inv:hasTotalAccountingCurrencyTaxAmount"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_63923E1F_6373_4e4c_BC58_974BA33F469A">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
+					<role name="epo:refersToContract" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5332"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:refersToContract"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_6AA08C54_54FE_402e_8B58_8804E01D8889">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831">
+					<model ea_localid="1960" type="Class" name="epo-cat:ChargeInformation"/>
+					<role name="epo-cat:specifiesChargeInformation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5357"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-cat:specifiesChargeInformation"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_6B579730_463A_4857_B85E_6B8274FE3291">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasTotalChargeAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5363"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-ord:hasTotalChargeAmount"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_78E3CABC_FE13_4dc0_BA12_FFFFA0D54042">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
+					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
+					<role name="epo-ful:refersToOrder" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5333"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-ful:refersToOrder"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_810B5419_84AA_4cbc_BD0F_1B682068D4FB">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A">
+					<model ea_localid="2087" type="Class" name="epo-ord:DeliveryInformation"/>
+					<role name="epo-ord:specifiesDeliveryInformation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5340"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-ord:specifiesDeliveryInformation"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_8A3AB883_9FE4_42fd_AFC8_322B44CBDADD">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasAmountDueForPayment" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5372"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo-ord:hasAmountDueForPayment"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_9BEABBA1_FA04_4d98_97DE_5E69567FADBC">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasTotalAllowanceAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5362"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-ord:hasTotalAllowanceAmount"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_A48A07FF_5921_4cfe_AF6B_AD0A239766EE">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_8335C0F2_1EB0_4dcb_94E3_EFE2E0DF3118">
+					<model ea_localid="3596" type="Class" name="epo-inv:SellerTaxRepresentative"/>
+					<role name="epo-inv:specifiesSellerTaxRepresentative" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5339"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:specifiesSellerTaxRepresentative"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_A959BE8D_107A_4aaf_BE64_567414A2ABCC">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
+					<model ea_localid="906" type="Class" name="epo:Lot"/>
+					<role name="epo:hasLotReference" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5348"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1..*" rt="+epo:hasLotReference"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_ADB3D05D_CE75_486d_B38A_27314A2F62B2">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750">
+					<model ea_localid="857" type="Class" name="epo:Buyer"/>
+					<role name="epo:specifiesBuyer" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5337"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo:specifiesBuyer"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_B20953AE_CF64_46a1_9C57_33B27067739D">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasRoundingAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5371"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-ord:hasRoundingAmount"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_B6DB5C80_A65D_4323_B0B5_168D05C9EA24">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_9B4DBA8E_59B3_4141_97A1_6AE83FE02D1C">
+					<model ea_localid="3592" type="Enumeration" name="at-voc-new:tax-date"/>
+					<role name="epo-inv:hasTaxPointDateCode" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5330"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:hasTaxPointDateCode"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_BB64ED52_1D30_4395_ABC1_3473F1CBCDE7">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasTotalLineAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5364"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1..*" rt="+epo-ord:hasTotalLineAmount"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_D018E81E_AC8E_4fec_BB96_E8521FBBE52E">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_6161E37F_B166_4ecf_A645_92E7667F0CC8">
+					<model ea_localid="3595" type="Class" name="epo-inv:Payee"/>
+					<role name="epo-inv:specifiesPayee" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5338"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:specifiesPayee"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_D4BBBC22_877C_48dd_86DE_6D678DB27890">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_BE27BBA5_3E46_4b8b_96B2_9B6152688E23">
+					<model ea_localid="3614" type="Class" name="epo-inv:TaxBreakdownInformation"/>
+					<role name="epo-inv:hasTaxBreakdownInformation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5387"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1..*" rt="+epo-inv:hasTaxBreakdownInformation"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_D8A21C51_ABAE_473e_819D_1729AC275BCF">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4">
+					<model ea_localid="2635" type="Class" name="epo:Project"/>
+					<role name="epo:refersToProject" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5331"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:refersToProject"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_DB71486E_B9DA_432e_B070_BFF4ECEF7300">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4">
+					<model ea_localid="2818" type="Class" name="epo-ord:TaxInformation"/>
+					<role name="epo-ord:hasTaxInformation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5404"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo-ord:hasTaxInformation"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_E8BF523C_66C7_4412_825C_9D63A7DB9BFF">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01">
+					<model ea_localid="2018" type="Class" name="epo-ord:Seller"/>
+					<role name="epo:specifiesSeller" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5336"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo:specifiesSeller"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_F8221739_F0D9_41f5_A179_C864AC960D8F">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasTotalTaxInclusiveAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5366"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1..*" rt="+epo-ord:hasTotalTaxInclusiveAmount"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_FEAC08B7_4534_4c6e_98AB_31083434E530">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67">
+					<model ea_localid="2116" type="Class" name="epo-ful:DespatchAdvice"/>
+					<role name="epo-inv:refersToDespatchAdvice" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5334"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:refersToDespatchAdvice"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_FF0A4C18_97A9_450b_83FC_E7F2ADB8020E">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_CF553CC8_8DC9_4ea2_B386_8ACB39A17657">
+					<model ea_localid="3235" type="Class" name="epo-ful:ReceiptAdvice"/>
+					<role name="epo-inv:refersToReceiptAdvice" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5347"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:refersToReceiptAdvice"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_02BBBEAA_ED71_4eaf_B786_4BBE7F52C5D5">
+				<source xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+					<model ea_localid="3581" type="Class" name="epo-inv:InvoiceLine"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
+					<model ea_localid="1831" type="Class" name="epo-cat:Price"/>
+					<role name="epo-cat:hasPrice" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5385"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1..*" rt="+epo-cat:hasPrice"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_30A83FCD_B7E1_4f9c_95D1_48B460BCC4B8">
+				<source xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+					<model ea_localid="3581" type="Class" name="epo-inv:InvoiceLine"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-cat:hasQuantity" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5383"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo-cat:hasQuantity"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_5EDC73B7_1ABC_4e6f_9003_79369EBD749D">
+				<source xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+					<model ea_localid="3581" type="Class" name="epo-inv:InvoiceLine"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-inv:hasNetAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5381"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo-inv:hasNetAmount"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_6D166D58_F0F4_4650_92D7_DAC20DD7E2F8">
+				<source xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+					<model ea_localid="3581" type="Class" name="epo-inv:InvoiceLine"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
+					<model ea_localid="915" type="Class" name="epo:Period"/>
+					<role name="epo-inv:hasInvoiceLinePeriod" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5384"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:hasInvoiceLinePeriod"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_8254F8D7_D6F0_4c63_A478_9179AAD0DF81">
+				<source xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+					<model ea_localid="3581" type="Class" name="epo-inv:InvoiceLine"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A">
+					<model ea_localid="2037" type="Class" name="epo-ord:OrderLine"/>
+					<role name="epo-inv:refersToOrderLine" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5382"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:refersToOrderLine"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_8FE282D8_21BB_4e43_8F2A_1B37812ADCA1">
+				<source xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+					<model ea_localid="3581" type="Class" name="epo-inv:InvoiceLine"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4">
+					<model ea_localid="2818" type="Class" name="epo-ord:TaxInformation"/>
+					<role name="epo-ord:hasTaxInformation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5405"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo-ord:hasTaxInformation"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_ABF2C561_D263_44c6_A9E0_140763A1B061">
+				<source xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+					<model ea_localid="3581" type="Class" name="epo-inv:InvoiceLine"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-inv:hasInvoiceLineObjectIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5380"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="An identifier for an object on which the invoice line is based, given by the Seller.&#xA;&#xA;Additional Information:&#xA;It may be a subscription number, telephone number, meter point etc., as applicable. &#xA;&#xA;WG approval 26/06/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:hasInvoiceLineObjectIdentifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_CF00A26F_CB76_4971_854A_CE68DE5CB673">
+				<source xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+					<model ea_localid="3581" type="Class" name="epo-inv:InvoiceLine"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7">
+					<model ea_localid="2584" type="Class" name="epo-cat:Line"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5329"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_363E463C_04A8_41ba_94C0_F1ACF5EF8818">
+				<source xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831">
+					<model ea_localid="1960" type="Class" name="epo-cat:ChargeInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+					<model ea_localid="3581" type="Class" name="epo-inv:InvoiceLine"/>
+					<role name="epo-inv:isSpecificToInvoiceLine" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5358"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-inv:isSpecificToInvoiceLine"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_F3984A8F_8800_4bd8_89A8_7BF01AA3F7CB">
+				<source xmi:idref="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA">
+					<model ea_localid="2040" type="Class" name="epo-ord:AllowanceInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+					<model ea_localid="3581" type="Class" name="epo-inv:InvoiceLine"/>
+					<role name="epo-inv:isSpecificToInvoiceLine" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5360"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-inv:isSpecificToInvoiceLine"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_EF8F663B_E588_4ac1_A6E9_14A359A79866">
+				<source xmi:idref="EAID_CA3B8B0A_6937_4e26_99FB_D084CA7BE4B2">
+					<model ea_localid="3604" type="Class" name="epo-inv:InvoiceNote"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_3A12EBB2_25C7_4db8_87BC_F597669AADF3">
+					<model ea_localid="3605" type="Enumeration" name="at-voc-new:invoice-note-subject-code"/>
+					<role name="epo-inv:hasInvoiceNoteSubject" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5352"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:hasInvoiceNoteSubject"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_D86AFBB4_83ED_4d20_960D_7A768CA3117C">
+				<source xmi:idref="EAID_6161E37F_B166_4ecf_A645_92E7667F0CC8">
+					<model ea_localid="3595" type="Class" name="epo-inv:Payee"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
+					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5376"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_E1227B02_660A_4a25_9EF1_B1E472EB8A4A">
+				<source xmi:idref="EAID_D2275688_DA87_4409_B1D5_7AAEA8D7B844">
+					<model ea_localid="3608" type="Class" name="epo-inv:PaymentCardInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A">
+					<model ea_localid="2585" type="Class" name="epo-cat:InformationHub"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5440"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_FC595492_D281_46be_9A26_52D20C354765">
+				<source xmi:idref="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48">
+					<model ea_localid="3599" type="Class" name="epo-inv:PaymentInstructionsInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_D2275688_DA87_4409_B1D5_7AAEA8D7B844">
+					<model ea_localid="3608" type="Class" name="epo-inv:PaymentCardInformation"/>
+					<role name="epo-inv:hasPaymentCardInformation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5353"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:hasPaymentCardInformation"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_121E591C_5317_469b_8A3E_E1B1A7C39814">
+				<source xmi:idref="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48">
+					<model ea_localid="3599" type="Class" name="epo-inv:PaymentInstructionsInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_346C4D44_A35F_47f9_8527_38068914A67D">
+					<model ea_localid="3600" type="Enumeration" name="at-voc-new:payment-means-type"/>
+					<role name="epo-inv:hasPaymentMeansType" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5343"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The means for how a payment is expected to be or has been settled, expressed as code.&#xA;&#xA;WG approval 11/07/2024&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo-inv:hasPaymentMeansType"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_4DC15699_2F72_40f6_B574_D054957B5730">
+				<source xmi:idref="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48">
+					<model ea_localid="3599" type="Class" name="epo-inv:PaymentInstructionsInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-inv:hasMandateIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5354"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="An unique identifier for referencing the direct debit mandate, assigned by the Payee.&#xA;&#xA;WG approval 11/07/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:hasMandateIdentifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_6906866E_320E_4e58_A7DD_49C8A3F9638B">
+				<source xmi:idref="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48">
+					<model ea_localid="3599" type="Class" name="epo-inv:PaymentInstructionsInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A">
+					<model ea_localid="2585" type="Class" name="epo-cat:InformationHub"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5342"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_EBE8AC56_41A8_45f2_AE75_CB65D4939C94">
+				<source xmi:idref="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48">
+					<model ea_localid="3599" type="Class" name="epo-inv:PaymentInstructionsInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-inv:hasBankingIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5355"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="An unique banking reference identifier of the Payee or Seller, assigned by the Payee or Seller bank.&#xA;&#xA;WG approval 11/07/2024&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:hasBankingIdentifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_F9E4B0C6_6B39_4211_B8F3_83FC71C1725E">
+				<source xmi:idref="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48">
+					<model ea_localid="3599" type="Class" name="epo-inv:PaymentInstructionsInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-inv:hasDebitedAccountIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5356"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="An identifier for the account to be debited by the direct debit.&#xA;&#xA;WG approval 11/07/2024&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:hasDebitedAccountIdentifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_2AAB3E29_13AA_402b_B91F_9E3189FB3EC9">
+				<source xmi:idref="EAID_8335C0F2_1EB0_4dcb_94E3_EFE2E0DF3118">
+					<model ea_localid="3596" type="Class" name="epo-inv:SellerTaxRepresentative"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
+					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5375"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_2608C1AC_B598_421e_AA18_F90C2D833913">
+				<source xmi:idref="EAID_BE27BBA5_3E46_4b8b_96B2_9B6152688E23">
+					<model ea_localid="3614" type="Class" name="epo-inv:TaxBreakdownInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_D35F0B1D_07E6_483b_A105_B62A84FC828A">
+					<model ea_localid="3615" type="Enumeration" name="at-voc-new:tax-exemption-reason"/>
+					<role name="epo-inv:hasTaxExemptionReason" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5390"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="An explanation on why the amount is exempted from tax or why no tax is being charged according to the legislation, expressed as a code.&#xA;&#xA;WG approval 11/07/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:hasTaxExemptionReason"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_AF564753_2A12_4d02_8DB3_0F11F0819AB2">
+				<source xmi:idref="EAID_BE27BBA5_3E46_4b8b_96B2_9B6152688E23">
+					<model ea_localid="3614" type="Class" name="epo-inv:TaxBreakdownInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4">
+					<model ea_localid="2818" type="Class" name="epo-ord:TaxInformation"/>
+					<role name="epo-ord:hasTaxInformation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5388"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo-ord:hasTaxInformation"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+		</connectors>
+		<primitivetypes>
+			<packagedElement xmi:type="uml:Package" xmi:id="EAPrimitiveTypesPackage" name="EA_PrimitiveTypes_Package">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAJavaTypesPackage" name="EA_Java_Types_Package">
+					<packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_rdf_PlainLiteral" name="rdf:PlainLiteral"/>
+					<packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_xsd_date" name="xsd:date"/>
+				</packagedElement>
+			</packagedElement>
+		</primitivetypes>
+		<profiles/>
+		<diagrams>
+			<diagram xmi:id="EAID_EEE10088_C223_461b_A805_B285A184A625">
+				<model package="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" localID="544" owner="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" tpos="1"/>
+				<properties name="invoicing" type="Logical"/>
+				<project author="andreea" version="1.0" created="2024-05-23 13:49:12" modified="2024-07-23 10:16:44"/>
+				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=E46D020B;"/>
+				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
+				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
+				<extendedProperties/>
+				<elements>
+					<element geometry="Left=973;Top=925;Right=1258;Bottom=995;" subject="EAID_D2275688_DA87_4409_B1D5_7AAEA8D7B844" seqno="1" style="DUID=B43510F2;"/>
+					<element geometry="Left=541;Top=730;Right=631;Bottom=789;" subject="EAID_3A12EBB2_25C7_4db8_87BC_F597669AADF3" seqno="2" style="DUID=2C90A106;"/>
+					<element geometry="Left=472;Top=643;Right=700;Bottom=692;" subject="EAID_CA3B8B0A_6937_4e26_99FB_D084CA7BE4B2" seqno="3" style="DUID=6604F923;"/>
+					<element geometry="Left=176;Top=1173;Right=558;Bottom=1228;" subject="EAID_2C4871BB_2DFB_424c_B8C0_041EEF1D803D" seqno="4" style="DUID=4BAA6CD0;"/>
+					<element geometry="Left=1585;Top=551;Right=1684;Bottom=598;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="5" style="DUID=150FEC6F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1448;Top=406;Right=1548;Bottom=452;" subject="EAID_CF553CC8_8DC9_4ea2_B386_8ACB39A17657" seqno="6" style="DUID=2B87ABF1;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=666;Top=375;Right=753;Bottom=418;" subject="EAID_F6DE73A8_A504_40b6_8920_6C702CB1228E" seqno="7" style="DUID=78225ABA;"/>
+					<element geometry="Left=705;Top=1038;Right=957;Bottom=1108;" subject="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D" seqno="8" style="DUID=A3D25474;"/>
+					<element geometry="Left=279;Top=954;Right=486;Bottom=1138;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="9" style="DUID=D15033B6;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=452;Top=801;Right=542;Bottom=861;" subject="EAID_346C4D44_A35F_47f9_8527_38068914A67D" seqno="10" style="DUID=2A897310;"/>
+					<element geometry="Left=688;Top=775;Right=973;Bottom=886;" subject="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" seqno="11" style="DUID=3F76AE2B;"/>
+					<element geometry="Left=1630;Top=957;Right=1720;Bottom=1017;" subject="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" seqno="12" style="DUID=C34C6A2E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1574;Top=761;Right=1776;Bottom=914;" subject="EAID_29678A10_6473_461a_BE84_76269B5BBD68" seqno="13" style="DUID=A48ABCC9;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1248;Top=812;Right=1448;Bottom=862;" subject="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" seqno="14" style="DUID=DCB3C54F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=935;Top=672;Right=1116;Bottom=742;" subject="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" seqno="15" style="DUID=CF66E3D4;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1235;Top=665;Right=1461;Bottom=750;" subject="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" seqno="16" style="DUID=415072C6;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=639;Top=190;Right=754;Bottom=245;" subject="EAID_81226A46_D82E_45a6_9FF0_E3132CF8BB02" seqno="17" style="DUID=74B855EB;"/>
+					<element geometry="Left=878;Top=409;Right=1000;Bottom=451;" subject="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" seqno="18" style="DUID=A6E8F70D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1229;Top=245;Right=1468;Bottom=331;" subject="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" seqno="19" style="NSL=0;DUID=2E8AE75D;"/>
+					<element geometry="Left=1527;Top=256;Right=1746;Bottom=319;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="20" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=1E381780;"/>
+					<element geometry="Left=542;Top=456;Right=632;Bottom=498;" subject="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4" seqno="21" style="DUID=100D4948;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=428;Top=558;Right=518;Bottom=602;" subject="EAID_9B4DBA8E_59B3_4141_97A1_6AE83FE02D1C" seqno="22" style="DUID=E04A014A;"/>
+					<element geometry="Left=639;Top=259;Right=729;Bottom=319;" subject="EAID_C3684D7C_E07D_415a_B935_B52376928738" seqno="23" style="DUID=3129504B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=871;Top=265;Right=1008;Bottom=311;" subject="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" seqno="24" style="DUID=30702800;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=843;Top=79;Right=1038;Bottom=219;" subject="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" seqno="25" style="DUID=DD6E9CD2;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=698;Top=532;Right=963;Bottom=628;" subject="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" seqno="26" style="DUID=A7C903FB;"/>
+					<element geometry="SX=0;SY=-40;EX=-26;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=114:CY=14:OX=69:OY=-12:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=999:-620$;" subject="EAID_45DE6A43_058C_45b5_9BD1_786F801B344D" style="Mode=3;EOID=CF66E3D4;SOID=A7C903FB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-27;SY=0;EX=0;EY=-13;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=803:-301$;" subject="EAID_387C6C7A_CC14_4b5e_BAB7_F3D1FB910F35" style="Mode=3;EOID=30702800;SOID=A7C903FB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=63;SY=-3;EX=63;EY=-3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=154:CY=14:OX=105:OY=-36:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_E35A5085_B775_40dd_87F4_44B260BCBB19" style="Mode=3;EOID=415072C6;SOID=2E8AE75D;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=20;SY=10;EX=20;EY=10;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_97C17D51_4DF6_4979_B308_C0F08C743DCF" style="Mode=2;EOID=DD6E9CD2;SOID=1E381780;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=50:OY=-28:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7" style="Mode=3;EOID=150FEC6F;SOID=1E381780;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=-4;EX=-7;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=52:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=375:-481$;" subject="EAID_EC04B8A5_6281_4f14_8017_204CCE05A2CC" style="Mode=3;EOID=D15033B6;SOID=100D4948;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=4;SX=-3;SY=8;EX=-3;EY=9;$LLB=;LLT=;LMT=;LMB=;LRT=CX=114:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_233516AD_8114_473d_B8A6_42826FC39635" style="Mode=3;EOID=3129504B;SOID=30702800;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-1;SY=-2;EX=-1;EY=-2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_618070AC_783D_48ae_9723_9C69BB0EB7B4" style="Mode=3;EOID=DD6E9CD2;SOID=30702800;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=1016;SCTR.TOP=-93;SCTR.RIGHT=1052;SCTR.BOTTOM=-57;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=139:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=1038:-93$1052:-93$1052:-57$1016:-57$1016:-79$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=DD6E9CD2;SOID=DD6E9CD2;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=807;SCTR.TOP=-104;SCTR.RIGHT=858;SCTR.BOTTOM=-58;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=1:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=858:-79$858:-58$807:-58$807:-104$843:-104$;" subject="EAID_39F3583F_0D40_4e9f_8018_10297955785C" style="Mode=3;EOID=DD6E9CD2;SOID=DD6E9CD2;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=933;SCTR.TOP=-80;SCTR.RIGHT=974;SCTR.BOTTOM=-53;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=81:OY=-23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=974:-79$974:-53$933:-53$933:-79$;" subject="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9" style="Mode=3;EOID=DD6E9CD2;SOID=DD6E9CD2;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-100;SY=0;EX=12;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=84:CY=14:OX=51:OY=-31:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1248:-365$599:-365$;" subject="EAID_9866393B_8067_4f18_9B28_69541B862505" style="Mode=3;EOID=100D4948;SOID=2E8AE75D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=32;EX=-91;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=28:OY=-25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=291:-117$;" subject="EAID_3AA2C83C_532C_460c_99CE_63F041A42F06" style="Mode=3;EOID=D15033B6;SOID=DD6E9CD2;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-4;SY=-3;EX=-4;EY=-3;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9F9DDC4D_D1D7_4c74_943A_79D432082022" style="Mode=2;EOID=30702800;SOID=2E8AE75D;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-60;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=101:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=770:-667$;" subject="EAID_2F42AA39_2FDA_4a8e_AFCA_D79514F19CB1" style="Mode=3;EOID=6604F923;SOID=A7C903FB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-34;EX=51;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=149:CY=14:OX=105:OY=-33:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=433:-614$;" subject="EAID_27A758A5_D658_4005_919F_992C4207B974" style="Mode=3;EOID=D15033B6;SOID=A7C903FB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=1;SY=-10;EX=1;EY=-14;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_A959BE8D_107A_4aaf_BE64_567414A2ABCC" style="Mode=3;EOID=150FEC6F;SOID=A7C903FB;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=25;EX=-2;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=128:CY=14:OX=70:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1496:-555$;" subject="EAID_FF0A4C18_97A9_450b_83FC_E7F2ADB8020E" style="Mode=3;EOID=2B87ABF1;SOID=A7C903FB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=182:CY=14:OX=104:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1BF72C1B_7093_491e_82BB_04BA37F9657F" style="Mode=3;EOID=3F76AE2B;SOID=A7C903FB;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=-24;EX=-71;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=154:CY=14:OX=91:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1277:-604$;" subject="EAID_810B5419_84AA_4cbc_BD0F_1B682068D4FB" style="Mode=3;EOID=415072C6;SOID=A7C903FB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=11;SY=0;EX=11;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=136:CY=14:OX=77:OY=18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_FEAC08B7_4534_4c6e_98AB_31083434E530" style="Mode=3;EOID=A6E8F70D;SOID=A7C903FB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=39;EX=6;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=93:CY=14:OX=51:OY=13:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1354:-541$;" subject="EAID_78E3CABC_FE13_4dc0_BA12_FFFFA0D54042" style="Mode=3;EOID=2E8AE75D;SOID=A7C903FB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=13;EX=-72;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=47:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1564:-567$;" subject="EAID_63923E1F_6373_4e4c_BC58_974BA33F469A" style="Mode=3;EOID=1E381780;SOID=A7C903FB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-91;SY=0;EX=0;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=84:CY=14:OX=16:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=739:-476$;" subject="EAID_D8A21C51_ABAE_473e_819D_1729AC275BCF" style="Mode=3;EOID=100D4948;SOID=A7C903FB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=126:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B6DB5C80_A65D_4323_B0B5_168D05C9EA24" style="Mode=3;EOID=E04A014A;SOID=A7C903FB;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EX=-47;EY=0;SX=0;SY=14;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=59:CY=14:OX=39:OY=-45:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=335:-135$;" subject="EAID_1BEBAC59_19C6_4908_B93C_EED975A6974F" style="Mode=3;EOID=D15033B6;SOID=DD6E9CD2;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=4;SY=-32;EX=4;EY=-32;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C6F7D14A_11BF_430e_ABED_4C9AC22FFF2A" style="Mode=3;EOID=D15033B6;SOID=A48ABCC9;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=1;SX=-15;SY=0;EX=47;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1483:-230$986:-230$;" subject="EAID_891D4ADA_5989_4b36_8188_44D7D99D8155" style="Mode=3;EOID=30702800;SOID=2B87ABF1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=10;SY=0;EX=0;EY=-42;$LLB=;LLT=;LMT=;LMB=;LRT=CX=135:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1508:-191$;" subject="EAID_6563C83C_6869_4a08_BAC3_0D8EE5BAF10E" style="Mode=3;EOID=DD6E9CD2;SOID=2B87ABF1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=4;SX=0;SY=-12;EX=0;EY=-11;$LLB=;LLT=;LMT=;LMB=;LRT=CX=161:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B2AD75A2_6A44_447c_856D_A5FD0F996EF5" style="Mode=3;EOID=A6E8F70D;SOID=2B87ABF1;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=-35;EX=0;EY=-55;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=187:CY=14:OX=17:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_E6E5075B_3605_44e1_9693_42DB89B5FE8A" style="Mode=3;EOID=D15033B6;SOID=A3D25474;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-2;SY=22;EX=-2;EY=-26;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=157:CY=14:OX=15:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_016185BE_FF6A_41c6_A77B_474BD1F071E0" style="Mode=3;EOID=D15033B6;SOID=A3D25474;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-77;SY=0;EX=0;EY=15;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=152:CY=14:OX=17:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=753:-1031$;" subject="EAID_F9E4B0C6_6B39_4211_B8F3_83FC71C1725E" style="Mode=3;EOID=D15033B6;SOID=3F76AE2B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-107;SY=0;EX=0;EY=45;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=121:CY=14:OX=20:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=723:-1001$;" subject="EAID_EBE8AC56_41A8_45f2_AE75_CB65D4939C94" style="Mode=3;EOID=D15033B6;SOID=3F76AE2B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-135;SY=0;EX=0;EY=75;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=126:CY=14:OX=14:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=695:-971$;" subject="EAID_4DC15699_2F72_40f6_B574_D054957B5730" style="Mode=3;EOID=D15033B6;SOID=3F76AE2B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=8;EX=-10;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=154:CY=14:OX=93:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1105:-822$;" subject="EAID_FC595492_D281_46be_9A26_52D20C354765" style="Mode=3;EOID=B43510F2;SOID=3F76AE2B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=156:CY=14:OX=90:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_784ABA29_6A29_40cd_92A7_01703B8F5CBC" style="Mode=3;EOID=A3D25474;SOID=3F76AE2B;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EX=0;EY=0;SX=31;SY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=108:CY=14:OX=2:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1379:-22$169:-22$169:-1046$;" subject="EAID_D42B1380_78A6_4579_B0FD_C3609EBD8AFD" style="Mode=3;EOID=D15033B6;SOID=2E8AE75D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=50:OY=-16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D0F25E0B_E148_41e7_8C52_BAE14F5149F6" style="Mode=3;EOID=C34C6A2E;SOID=A48ABCC9;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=130:CY=14:OX=71:OY=-12:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_EF8F663B_E588_4ac1_A6E9_14A359A79866" style="Mode=3;EOID=2C90A106;SOID=6604F923;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-23;SY=0;EX=0;EY=-82;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=20:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1325:-1128$;" subject="EAID_4A4FE890_B03B_430a_A719_E1852BEECBEE" style="Mode=3;EOID=D15033B6;SOID=DCB3C54F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=2;SY=-25;EX=2;EY=-33;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_CEDC5261_E7FF_4ca6_8255_6B2812DC1B0C" style="Mode=3;EOID=D15033B6;SOID=DCB3C54F;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EX=0;EY=1;SX=7;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1355:-986$;" subject="EAID_06D187DF_9192_4549_BE01_736C22D89AEA" style="Mode=3;EOID=C34C6A2E;SOID=DCB3C54F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=1;EX=0;EY=1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=56:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_C70B3C1A_A0BD_494b_BEE6_89F708783872" style="Mode=3;EOID=A48ABCC9;SOID=DCB3C54F;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F0951C5B_94E2_4a5f_BF21_25D103CB3656" style="Mode=3;EOID=D15033B6;SOID=415072C6;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=112:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_DCA21CBC_3D4F_480a_B24B_49A69CC51624" style="Mode=3;EOID=CF66E3D4;SOID=415072C6;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=138:CY=14:OX=76:OY=-23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D8FEF002_D274_4157_BCA8_CFEC07ED34AE" style="Mode=3;EOID=DCB3C54F;SOID=415072C6;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-3;SY=-7;EX=7;EY=-23;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D8E29289_C54A_4d5e_987B_AEF828189A10" style="Mode=3;EOID=30702800;SOID=A6E8F70D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-2;EX=0;EY=-21;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=135:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=545:-432$545:-170$;" subject="EAID_6A127BB3_2702_45c1_99BF_B659211FD91B" style="Mode=3;EOID=DD6E9CD2;SOID=A6E8F70D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=12;EX=-62;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=93:CY=14:OX=53:OY=37:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1286:-418$;" subject="EAID_05ABFF05_AE37_4d14_9F45_D060A347AAB9" style="Mode=3;EOID=2E8AE75D;SOID=A6E8F70D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-25;EX=71;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=93:CY=14:OX=56:OY=-28:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1096:-313$;" subject="EAID_24C53A6F_084E_4dbf_817A_1DF5BE5981D8" style="Mode=3;EOID=CF66E3D4;SOID=2E8AE75D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=1;EX=0;EY=1;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=137:CY=14:OX=3:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_121E591C_5317_469b_8A3E_E1B1A7C39814" style="Mode=3;EOID=2A897310;SOID=3F76AE2B;Color=-1;LWidth=0;Hidden=0;"/>
+				</elements>
+			</diagram>
+			<diagram xmi:id="EAID_3B4E619D_0450_4807_99D0_954BEE5E834E">
+				<model package="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" localID="546" owner="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" tpos="2"/>
+				<properties name="invoicing roles" type="Logical"/>
+				<project author="andreea" version="1.0" created="2024-05-23 14:54:48" modified="2024-07-04 15:54:01"/>
+				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=9376EF7B;"/>
+				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
+				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
+				<extendedProperties/>
+				<elements>
+					<element geometry="Left=716;Top=349;Right=806;Bottom=407;" subject="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" seqno="1" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=20CA2783;"/>
+					<element geometry="Left=440;Top=288;Right=593;Bottom=328;" subject="EAID_8335C0F2_1EB0_4dcb_94E3_EFE2E0DF3118" seqno="2" style="DUID=958C71C5;"/>
+					<element geometry="Left=615;Top=288;Right=705;Bottom=328;" subject="EAID_6161E37F_B166_4ecf_A645_92E7667F0CC8" seqno="3" style="DUID=CD29995C;"/>
+					<element geometry="Left=124;Top=128;Right=343;Bottom=213;" subject="EAID_96B284C4_E759_4bad_9655_04521F703750" seqno="4" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=3F6634E2;"/>
+					<element geometry="Left=806;Top=161;Right=899;Bottom=206;" subject="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" seqno="5" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=75E0C7A9;"/>
+					<element geometry="Left=440;Top=128;Right=705;Bottom=239;" subject="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" seqno="6" style="DUID=7931F703;NSL=0;"/>
+					<element geometry="SX=1;SY=0;EX=0;EY=-12;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=517:-390$;" subject="EAID_2AAB3E29_13AA_402b_B91F_9E3189FB3EC9" style="Mode=3;EOID=20CA2783;SOID=958C71C5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=3;SY=0;EX=0;EY=18;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=663:-360$;" subject="EAID_D86AFBB4_83ED_4d20_960D_7A768CA3117C" style="Mode=3;EOID=20CA2783;SOID=CD29995C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=3;EX=0;EY=-2;SX=1;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=853:-380$;" subject="EAID_A88E2729_62D9_493c_8105_4D93D49DFA8A" style="Mode=3;EOID=20CA2783;SOID=75E0C7A9;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-20;SY=0;EX=0;EY=19;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=169:CY=14:OX=95:OY=-16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_A48A07FF_5921_4cfe_AF6B_AD0A239766EE" style="Mode=3;EOID=958C71C5;SOID=7931F703;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=89;SY=-8;EX=1;EY=-8;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=98:CY=14:OX=59:OY=-22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D018E81E_AC8E_4fec_BB96_E8521FBBE52E" style="Mode=3;EOID=CD29995C;SOID=7931F703;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-30;EX=-9;EY=9;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=81:CY=14:OX=6:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_ADB3D05D_CE75_486d_B38A_27314A2F62B2" style="Mode=3;EOID=3F6634E2;SOID=7931F703;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=80:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_E8BF523C_66C7_4412_825C_9D63A7DB9BFF" style="Mode=3;EOID=75E0C7A9;SOID=7931F703;Color=-1;LWidth=0;Hidden=0;"/>
+				</elements>
+			</diagram>
+			<diagram xmi:id="EAID_B528E476_666E_4b0b_AFF7_2AAF33C97767">
+				<model package="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" localID="547" owner="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" tpos="3"/>
+				<properties name="invoicing allowance charge and tax" type="Logical"/>
+				<project author="andreea" version="1.0" created="2024-05-30 11:24:36" modified="2024-06-25 13:27:33"/>
+				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=F85399F3;"/>
+				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
+				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
+				<extendedProperties/>
+				<elements>
+					<element geometry="Left=681;Top=158;Right=886;Bottom=240;" subject="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" seqno="1" style="NSL=0;DUID=B5CFAF2D;"/>
+					<element geometry="Left=995;Top=286;Right=1085;Bottom=346;" subject="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A" seqno="2" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=33DF2514;"/>
+					<element geometry="Left=995;Top=158;Right=1085;Bottom=218;" subject="EAID_33A89700_846B_47cb_93D9_9D4729194EA6" seqno="3" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=BBD2F9EF;"/>
+					<element geometry="Left=342;Top=199;Right=432;Bottom=259;" subject="EAID_D72442ED_835D_455e_970E_3D4CAF26A2F5" seqno="4" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=44AF80B4;"/>
+					<element geometry="Left=237;Top=312;Right=537;Bottom=392;" subject="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" seqno="5" style="NSL=0;DUID=F276E0C4;"/>
+					<element geometry="Left=650;Top=303;Right=917;Bottom=401;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="6" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=A7690E95;"/>
+					<element geometry="Left=371;Top=546;Right=547;Bottom=597;" subject="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" seqno="7" style="NSL=0;DUID=72F7652B;"/>
+					<element geometry="Left=237;Top=451;Right=413;Bottom=502;" subject="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" seqno="8" style="DUID=6B766FB8;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=678;Top=667;Right=900;Bottom=737;" subject="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" seqno="9" style="DUID=357ECAF1;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=282;Top=647;Right=547;Bottom=758;" subject="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" seqno="10" style="DUID=6F71AD3A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_5EDC73B7_1ABC_4e6f_9003_79369EBD749D" style="Mode=3;EOID=A7690E95;SOID=357ECAF1;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=12;SY=3;EX=12;EY=3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=148:CY=14:OX=82:OY=20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_6AA08C54_54FE_402e_8B58_8804E01D8889" style="Mode=3;EOID=72F7652B;SOID=6F71AD3A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-14;SY=-6;EX=-14;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=162:CY=14:OX=90:OY=19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_38248DFF_252A_4130_A663_5B676B14A992" style="Mode=3;EOID=6B766FB8;SOID=6F71AD3A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9BEABBA1_FA04_4d98_97DE_5E69567FADBC" style="Mode=3;EOID=A7690E95;SOID=6F71AD3A;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6B579730_463A_4857_B85E_6B8274FE3291" style="Mode=3;EOID=A7690E95;SOID=6F71AD3A;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BB64ED52_1D30_4395_ABC1_3473F1CBCDE7" style="Mode=3;EOID=A7690E95;SOID=6F71AD3A;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_357DB7CB_140F_4167_B4ED_129923676841" style="Mode=3;EOID=A7690E95;SOID=6F71AD3A;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F8221739_F0D9_41f5_A179_C864AC960D8F" style="Mode=3;EOID=A7690E95;SOID=6F71AD3A;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_11ACAC30_71BA_444b_B7E9_7062F4927536" style="Mode=3;EOID=A7690E95;SOID=6F71AD3A;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_5A597CB9_3064_430b_A49F_DC0D80093AA3" style="Mode=3;EOID=A7690E95;SOID=6F71AD3A;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_14B7672E_A531_45a7_BB29_EB9C02AF1551" style="Mode=3;EOID=A7690E95;SOID=6F71AD3A;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B20953AE_CF64_46a1_9C57_33B27067739D" style="Mode=3;EOID=A7690E95;SOID=6F71AD3A;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=124:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_46A59C5B_A5BD_4ae9_A4FB_1ADCCECB44D6" style="Mode=3;EOID=357ECAF1;SOID=6F71AD3A;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=-5;EX=0;EY=29;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=223:-707$223:-170$;" subject="EAID_DB71486E_B9DA_432e_B070_BFF4ECEF7300" style="Mode=3;EOID=B5CFAF2D;SOID=6F71AD3A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-53;SY=-5;EX=-53;EY=-5;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=51:OY=-18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_470D1B16_C07B_4868_91B2_799578663395" style="Mode=3;EOID=A7690E95;SOID=B5CFAF2D;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=-6;EX=79;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=76:OY=-15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1106:-708$1106:-113$862:-113$;" subject="EAID_8FE282D8_21BB_4e43_8F2A_1B37812ADCA1" style="Mode=3;EOID=B5CFAF2D;SOID=357ECAF1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-3;SY=0;EX=-65;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_308D4104_53D2_4be0_B731_D93BB56777D3" style="Mode=3;EOID=F276E0C4;SOID=6B766FB8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=1;EX=31;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=130:CY=14:OX=74:OY=-58:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=808:-475$;" subject="EAID_F3984A8F_8800_4bd8_89A8_7BF01AA3F7CB" style="Mode=3;EOID=357ECAF1;SOID=6B766FB8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=3;SY=20;EX=17;EY=-5;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D8788651_B092_4dea_82FA_E8F122CD0638" style="Mode=3;EOID=F276E0C4;SOID=72F7652B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-17;EX=-57;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=130:CY=14:OX=62:OY=-33:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=720:-588$;" subject="EAID_363E463C_04A8_41ba_94C0_F1ACF5EF8818" style="Mode=3;EOID=357ECAF1;SOID=72F7652B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=40;EX=0;EY=11;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85:CY=14:OX=-7:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_516CC611_B255_4c67_AAF8_2E19960E553F" style="Mode=3;EOID=A7690E95;SOID=F276E0C4;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=0;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=149:CY=14:OX=83:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-1:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_AF8C5388_D443_4b59_918C_44D86E9AC3CF" style="Mode=3;EOID=44AF80B4;SOID=F276E0C4;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;SX=-9;SY=-22;EX=0;EY=-14;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=-12:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_202AF5A1_B4FE_48a4_91D4_F6387465413F" style="Mode=3;EOID=A7690E95;SOID=F276E0C4;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=118;SY=0;EX=0;EY=-12;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=505:-211$;" subject="EAID_2EEE05CA_6A1E_4946_A54F_BC6967C07ADF" style="Mode=3;EOID=B5CFAF2D;SOID=F276E0C4;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-31;EX=-1;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=59:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1039:-230$;" subject="EAID_0D4101FD_7720_417c_B62C_6F674CDB3888" style="Mode=3;EOID=33DF2514;SOID=B5CFAF2D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;SX=102;SY=41;EX=-44;EY=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=-2:OY=-5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-7:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4D92CD55_08CD_4d21_806C_38F93CA90719" style="Mode=3;EOID=BBD2F9EF;SOID=B5CFAF2D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=60;SY=-3;EX=60;EY=-3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85:CY=14:OX=48:OY=-21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_87123434_C2AD_43de_925D_13E9A7667A18" style="Mode=3;EOID=A7690E95;SOID=B5CFAF2D;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8A3AB883_9FE4_42fd_AFC8_322B44CBDADD" style="Mode=3;EOID=A7690E95;SOID=6F71AD3A;Color=-1;LWidth=0;Hidden=1;"/>
+				</elements>
+			</diagram>
+			<diagram xmi:id="EAID_A82D85E1_D9F2_4d28_AB86_F4B343BCEB7D">
+				<model package="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" localID="548" owner="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" tpos="4"/>
+				<properties name="invoicing total amounts" type="Logical"/>
+				<project author="andreea" version="1.0" created="2024-05-30 12:17:40" modified="2024-06-20 16:30:02"/>
+				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=B25D3F85;"/>
+				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
+				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
+				<extendedProperties/>
+				<elements>
+					<element geometry="Left=664;Top=92;Right=869;Bottom=174;" subject="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" seqno="1" style="NSL=0;DUID=05026083;"/>
+					<element geometry="Left=0;Top=447;Right=90;Bottom=507;" subject="EAID_FBD046CD_CD18_4d96_99E0_63CAC8A5D594" seqno="2" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=983B245E;"/>
+					<element geometry="Left=167;Top=427;Right=539;Bottom=525;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="3" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=74BC9C7D;"/>
+					<element geometry="Left=167;Top=78;Right=539;Bottom=189;" subject="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" seqno="4" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=249AA16D;"/>
+					<element geometry="SX=-33;SY=0;EX=0;EY=30;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=16:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=733:-446$;" subject="EAID_470D1B16_C07B_4868_91B2_799578663395" style="Mode=3;EOID=74BC9C7D;SOID=05026083;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=30;SY=0;EX=0;EY=-14;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85:CY=14:OX=15:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=796:-490$;" subject="EAID_87123434_C2AD_43de_925D_13E9A7667A18" style="Mode=3;EOID=74BC9C7D;SOID=05026083;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=73:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_E9E2A1B8_A705_4847_8FE6_3B40BD241A4B" style="Mode=3;EOID=983B245E;SOID=74BC9C7D;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_DB71486E_B9DA_432e_B070_BFF4ECEF7300" style="Mode=3;EOID=05026083;SOID=249AA16D;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=175;SY=-30;EX=175;EY=-30;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=151:CY=14:OX=141:OY=-151:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_8A3AB883_9FE4_42fd_AFC8_322B44CBDADD" style="Mode=3;EOID=74BC9C7D;SOID=249AA16D;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=137;SY=-18;EX=137;EY=-18;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=123:CY=14:OX=113:OY=-129:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B20953AE_CF64_46a1_9C57_33B27067739D" style="Mode=3;EOID=74BC9C7D;SOID=249AA16D;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=98;SY=-21;EX=98;EY=-21;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=116:CY=14:OX=105:OY=-119:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_14B7672E_A531_45a7_BB29_EB9C02AF1551" style="Mode=3;EOID=74BC9C7D;SOID=249AA16D;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=18;SY=-7;EX=18;EY=-7;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=199:CY=14:OX=192:OY=-202:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_5A597CB9_3064_430b_A49F_DC0D80093AA3" style="Mode=3;EOID=74BC9C7D;SOID=249AA16D;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-25;SY=-3;EX=-25;EY=-3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=112:OY=-129:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_11ACAC30_71BA_444b_B7E9_7062F4927536" style="Mode=3;EOID=74BC9C7D;SOID=249AA16D;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=62;SY=-4;EX=62;EY=-4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=155:CY=14:OX=143:OY=-153:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F8221739_F0D9_41f5_A179_C864AC960D8F" style="Mode=3;EOID=74BC9C7D;SOID=249AA16D;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-60;SY=-9;EX=-60;EY=-9;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=156:CY=14:OX=145:OY=-159:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_357DB7CB_140F_4167_B4ED_129923676841" style="Mode=3;EOID=74BC9C7D;SOID=249AA16D;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-172;SY=-8;EX=-172;EY=-8;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=122:CY=14:OX=112:OY=-122:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_BB64ED52_1D30_4395_ABC1_3473F1CBCDE7" style="Mode=3;EOID=74BC9C7D;SOID=249AA16D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-103;SY=-1;EX=-103;EY=-1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=134:CY=14:OX=125:OY=-136:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_6B579730_463A_4857_B85E_6B8274FE3291" style="Mode=3;EOID=74BC9C7D;SOID=249AA16D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-138;SY=-3;EX=-138;EY=-3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=147:CY=14:OX=135:OY=-152:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9BEABBA1_FA04_4d98_97DE_5E69567FADBC" style="Mode=3;EOID=74BC9C7D;SOID=249AA16D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+				</elements>
+			</diagram>
+			<diagram xmi:id="EAID_C18F1E83_B9ED_474a_8118_10C3448D34F8">
+				<model package="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" localID="549" owner="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" tpos="5"/>
+				<properties name="invoicing tax breakdown" type="Logical"/>
+				<project author="andreea" version="1.0" created="2024-06-06 12:34:45" modified="2024-07-11 17:02:18"/>
+				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=6836FF0B;"/>
+				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
+				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
+				<extendedProperties/>
+				<elements>
+					<element geometry="Left=137;Top=460;Right=227;Bottom=520;" subject="EAID_D35F0B1D_07E6_483b_A105_B62A84FC828A" seqno="1" style="DUID=8D9FA405;"/>
+					<element geometry="Left=768;Top=338;Right=858;Bottom=398;" subject="EAID_33A89700_846B_47cb_93D9_9D4729194EA6" seqno="2" style="DUID=80FBB366;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=36;Top=341;Right=328;Bottom=397;" subject="EAID_BE27BBA5_3E46_4b8b_96B2_9B6152688E23" seqno="3" style="DUID=DC8B1093;"/>
+					<element geometry="Left=516;Top=212;Right=606;Bottom=272;" subject="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A" seqno="4" style="DUID=4B3D24D1;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=458;Top=327;Right=663;Bottom=409;" subject="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" seqno="5" style="NSL=0;DUID=79B4B947;"/>
+					<element geometry="Left=63;Top=161;Right=302;Bottom=272;" subject="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" seqno="6" style="DUID=CDF8FF15;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=827;Top=507;Right=917;Bottom=567;" subject="EAID_FBD046CD_CD18_4d96_99E0_63CAC8A5D594" seqno="7" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=8BED64EF;"/>
+					<element geometry="Left=374;Top=488;Right=746;Bottom=586;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="8" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=663080D5;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8A3AB883_9FE4_42fd_AFC8_322B44CBDADD" style="Mode=3;EOID=663080D5;SOID=CDF8FF15;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9BEABBA1_FA04_4d98_97DE_5E69567FADBC" style="Mode=3;EOID=663080D5;SOID=CDF8FF15;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6B579730_463A_4857_B85E_6B8274FE3291" style="Mode=3;EOID=663080D5;SOID=CDF8FF15;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BB64ED52_1D30_4395_ABC1_3473F1CBCDE7" style="Mode=3;EOID=663080D5;SOID=CDF8FF15;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_357DB7CB_140F_4167_B4ED_129923676841" style="Mode=3;EOID=663080D5;SOID=CDF8FF15;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F8221739_F0D9_41f5_A179_C864AC960D8F" style="Mode=3;EOID=663080D5;SOID=CDF8FF15;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_11ACAC30_71BA_444b_B7E9_7062F4927536" style="Mode=3;EOID=663080D5;SOID=CDF8FF15;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_5A597CB9_3064_430b_A49F_DC0D80093AA3" style="Mode=3;EOID=663080D5;SOID=CDF8FF15;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=73:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_E9E2A1B8_A705_4847_8FE6_3B40BD241A4B" style="Mode=3;EOID=8BED64EF;SOID=663080D5;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=1;SY=0;EX=1;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B20953AE_CF64_46a1_9C57_33B27067739D" style="Mode=3;EOID=663080D5;SOID=CDF8FF15;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=-1;SY=2;EX=-1;EY=2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=138:CY=14:OX=76:OY=-26:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_2608C1AC_B598_421e_AA18_F90C2D833913" style="Mode=3;EOID=8D9FA405;SOID=DC8B1093;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=159:CY=14:OX=88:OY=-23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D4BBBC22_877C_48dd_86DE_6D678DB27890" style="Mode=3;EOID=DC8B1093;SOID=CDF8FF15;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EX=0;EY=41;SX=0;SY=6;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=46:OY=-29:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=486:-210$;" subject="EAID_DB71486E_B9DA_432e_B070_BFF4ECEF7300" style="Mode=3;EOID=79B4B947;SOID=CDF8FF15;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=58:OY=19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0D4101FD_7720_417c_B62C_6F674CDB3888" style="Mode=3;EOID=4B3D24D1;SOID=79B4B947;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4D92CD55_08CD_4d21_806C_38F93CA90719" style="Mode=3;EOID=80FBB366;SOID=79B4B947;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=60;SY=-3;EX=60;EY=-3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85:CY=14:OX=48:OY=-21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_87123434_C2AD_43de_925D_13E9A7667A18" style="Mode=3;EOID=663080D5;SOID=79B4B947;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-53;SY=-5;EX=-53;EY=-5;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=51:OY=-18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_470D1B16_C07B_4868_91B2_799578663395" style="Mode=3;EOID=663080D5;SOID=79B4B947;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=1;SY=0;EX=1;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=-2:OY=-5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_AF564753_2A12_4d02_8DB3_0F11F0819AB2" style="Mode=3;EOID=79B4B947;SOID=DC8B1093;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_14B7672E_A531_45a7_BB29_EB9C02AF1551" style="Mode=3;EOID=663080D5;SOID=CDF8FF15;Color=-1;LWidth=0;Hidden=1;"/>
+				</elements>
+			</diagram>
+			<diagram xmi:id="EAID_2B64BA6D_2881_4974_8AEE_2099B1EB359E">
+				<model package="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" localID="550" owner="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" tpos="7"/>
+				<properties name="invoicing line" type="Logical"/>
+				<project author="andreea" version="1.0" created="2024-06-06 13:49:59" modified="2024-07-23 10:15:12"/>
+				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=56481477;"/>
+				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
+				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
+				<extendedProperties/>
+				<elements>
+					<element geometry="Left=354;Top=598;Right=444;Bottom=658;" subject="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A" seqno="1" style="DUID=944F64E5;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=521;Top=674;Right=726;Bottom=756;" subject="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" seqno="2" style="NSL=0;DUID=11F1467E;"/>
+					<element geometry="Left=190;Top=431;Right=366;Bottom=489;" subject="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" seqno="3" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=1A33345B;"/>
+					<element geometry="Left=878;Top=288;Right=968;Bottom=358;" subject="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" seqno="4" style="DUID=26693A3E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=512;Top=489;Right=779;Bottom=587;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="5" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=9F4826F8;"/>
+					<element geometry="Left=878;Top=527;Right=968;Bottom=587;" subject="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3" seqno="6" style="DUID=0A386BDD;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=821;Top=413;Right=1026;Bottom=483;" subject="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" seqno="7" style="DUID=7449985C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=175;Top=121;Right=382;Bottom=223;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="8" style="DUID=38B3E872;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=530;Top=121;Right=762;Bottom=186;" subject="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" seqno="9" style="DUID=A9108D0D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=159;Top=268;Right=398;Bottom=379;" subject="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" seqno="10" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=92E62F94;"/>
+					<element geometry="Left=535;Top=288;Right=757;Bottom=358;" subject="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" seqno="11" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=2A6F418B;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F8221739_F0D9_41f5_A179_C864AC960D8F" style="Mode=3;EOID=9F4826F8;SOID=92E62F94;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=-94;SY=0;EX=0;EY=-39;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=160:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=552:-211$;" subject="EAID_ABF2C561_D263_44c6_A9E0_140763A1B061" style="Mode=3;EOID=38B3E872;SOID=2A6F418B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=61:OY=-26:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_5EDC73B7_1ABC_4e6f_9003_79369EBD749D" style="Mode=3;EOID=9F4826F8;SOID=2A6F418B;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=111:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_8254F8D7_D6F0_4c63_A478_9179AAD0DF81" style="Mode=3;EOID=26693A3E;SOID=2A6F418B;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=64;SY=0;EX=0;EY=5;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=710:-443$;" subject="EAID_30A83FCD_B7E1_4f9c_95D1_48B460BCC4B8" style="Mode=3;EOID=7449985C;SOID=2A6F418B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-88;SY=0;EX=0;EY=4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=123:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=558:-456$;" subject="EAID_6D166D58_F0F4_4650_92D7_DAC20DD7E2F8" style="Mode=3;EOID=1A33345B;SOID=2A6F418B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=63;SY=0;EX=0;EY=-4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=11:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=709:-257$1040:-257$1040:-719$;" subject="EAID_8FE282D8_21BB_4e43_8F2A_1B37812ADCA1" style="Mode=3;EOID=11F1467E;SOID=2A6F418B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=124:CY=14:OX=-3:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_46A59C5B_A5BD_4ae9_A4FB_1ADCCECB44D6" style="Mode=3;EOID=2A6F418B;SOID=92E62F94;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=149:CY=14:OX=86:OY=16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_27A758A5_D658_4005_919F_992C4207B974" style="Mode=3;EOID=38B3E872;SOID=92E62F94;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9BEABBA1_FA04_4d98_97DE_5E69567FADBC" style="Mode=3;EOID=9F4826F8;SOID=92E62F94;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6B579730_463A_4857_B85E_6B8274FE3291" style="Mode=3;EOID=9F4826F8;SOID=92E62F94;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BB64ED52_1D30_4395_ABC1_3473F1CBCDE7" style="Mode=3;EOID=9F4826F8;SOID=92E62F94;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_CF00A26F_CB76_4971_854A_CE68DE5CB673" style="Mode=3;EOID=A9108D0D;SOID=2A6F418B;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_357DB7CB_140F_4167_B4ED_129923676841" style="Mode=3;EOID=9F4826F8;SOID=92E62F94;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=-43;SY=-3;EX=-14;EY=-49;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=46:OY=17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_470D1B16_C07B_4868_91B2_799578663395" style="Mode=3;EOID=9F4826F8;SOID=11F1467E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_11ACAC30_71BA_444b_B7E9_7062F4927536" style="Mode=3;EOID=9F4826F8;SOID=92E62F94;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_5A597CB9_3064_430b_A49F_DC0D80093AA3" style="Mode=3;EOID=9F4826F8;SOID=92E62F94;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_14B7672E_A531_45a7_BB29_EB9C02AF1551" style="Mode=3;EOID=9F4826F8;SOID=92E62F94;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B20953AE_CF64_46a1_9C57_33B27067739D" style="Mode=3;EOID=9F4826F8;SOID=92E62F94;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8A3AB883_9FE4_42fd_AFC8_322B44CBDADD" style="Mode=3;EOID=9F4826F8;SOID=92E62F94;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=-110;SY=0;EX=0;EY=-5;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=-16:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=168:-720$;" subject="EAID_DB71486E_B9DA_432e_B070_BFF4ECEF7300" style="Mode=3;EOID=11F1467E;SOID=92E62F94;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=5;EY=7;SX=5;SY=7;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044" style="Mode=3;EOID=38B3E872;SOID=A9108D0D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=74:CY=14:OX=40:OY=-15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_30CBA4D5_2CA0_4043_A8BC_8FBCF102380D" style="Mode=3;EOID=0A386BDD;SOID=7449985C;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=12;SY=-8;EX=-6;EY=-18;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=49:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0AC5D04E_7364_4118_9D94_CE93A68B3CF9" style="Mode=3;EOID=7449985C;SOID=26693A3E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-8;SY=0;EX=0;EY=-5;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=915:-158$;" subject="EAID_AA589EDA_B26B_44c3_BCCC_37421BA960DE" style="Mode=3;EOID=A9108D0D;SOID=26693A3E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-84;SY=0;EX=0;EY=-3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=539:-631$;" subject="EAID_0D4101FD_7720_417c_B62C_6F674CDB3888" style="Mode=3;EOID=944F64E5;SOID=11F1467E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=60;SY=29;EX=40;EY=6;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85:CY=14:OX=51:OY=32:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_87123434_C2AD_43de_925D_13E9A7667A18" style="Mode=3;EOID=9F4826F8;SOID=11F1467E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=114:CY=14:OX=62:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_45DE6A43_058C_45b5_9BD1_786F801B344D" style="Mode=3;EOID=1A33345B;SOID=92E62F94;Color=-1;LWidth=0;Hidden=0;"/>
+				</elements>
+			</diagram>
+			<diagram xmi:id="EAID_AA5E4159_940D_4cc4_B630_9E091E626852">
+				<model package="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" localID="551" owner="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" tpos="8"/>
+				<properties name="invoicing item" type="Logical"/>
+				<project author="andreea" version="1.0" created="2024-06-06 14:36:27" modified="2024-07-23 10:15:19"/>
+				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=30C961F5;"/>
+				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
+				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
+				<extendedProperties/>
+				<elements>
+					<element geometry="Left=1063;Top=179;Right=1282;Bottom=267;" subject="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" seqno="1" style="DUID=97F8E294;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=871;Top=348;Right=961;Bottom=408;" subject="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12" seqno="2" style="DUID=950E4F52;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=715;Top=348;Right=805;Bottom=408;" subject="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" seqno="3" style="DUID=FBB50A0A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=715;Top=1;Right=961;Bottom=89;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="4" style="DUID=56D0C9AB;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=715;Top=166;Right=961;Bottom=280;" subject="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" seqno="5" style="DUID=0221BE4C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=208;Top=503;Right=298;Bottom=563;" subject="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3" seqno="6" style="DUID=AB84D331;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=38;Top=604;Right=243;Bottom=674;" subject="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" seqno="7" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=8E8D5E9D;"/>
+					<element geometry="Left=84;Top=238;Right=260;Bottom=289;" subject="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" seqno="8" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=B191C2EB;"/>
+					<element geometry="Left=386;Top=198;Right=618;Bottom=260;" subject="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" seqno="9" style="DUID=9A68D3D7;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=84;Top=461;Right=196;Bottom=531;" subject="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" seqno="10" style="DUID=8C96F568;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=337;Top=447;Right=604;Bottom=545;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="11" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=D6F538AB;"/>
+					<element geometry="Left=360;Top=314;Right=582;Bottom=384;" subject="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" seqno="12" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=31C63B27;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=960;SCTR.TOP=-206;SCTR.RIGHT=991;SCTR.BOTTOM=-191;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=961:-206$991:-206$991:-191$961:-191$;" subject="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F" style="Mode=3;EOID=0221BE4C;SOID=0221BE4C;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=-94;SY=0;EX=0;EY=16;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=160:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-2:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=377:-29$;" subject="EAID_ABF2C561_D263_44c6_A9E0_140763A1B061" style="Mode=3;EOID=56D0C9AB;SOID=31C63B27;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=22;SY=0;EX=23;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=61:OY=-26:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_5EDC73B7_1ABC_4e6f_9003_79369EBD749D" style="Mode=3;EOID=D6F538AB;SOID=31C63B27;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=47;SY=0;EX=0;EY=10;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=519:-611$;" subject="EAID_30A83FCD_B7E1_4f9c_95D1_48B460BCC4B8" style="Mode=3;EOID=8E8D5E9D;SOID=31C63B27;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
+					<element geometry="SX=0;SY=2;EX=-6;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=72:CY=14:OX=47:OY=-38:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=134:-347$;" subject="EAID_02BBBEAA_ED71_4eaf_B786_4BBE7F52C5D5" style="Mode=3;EOID=8C96F568;SOID=31C63B27;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;SX=4;SY=27;EX=4;EY=27;$LLB=;LLT=;LMT=;LMB=;LRT=CX=130:CY=14:OX=-2:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=-1:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7" style="Mode=3;EOID=D6F538AB;SOID=8C96F568;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;SX=36;SY=0;EX=36;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A0FABF7A_1814_4dd4_BD97_28BD0C9F2F49" style="Mode=3;EOID=8E8D5E9D;SOID=8C96F568;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=4;SX=-45;SY=8;EX=-51;EY=8;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_1F622DE3_2DEE_491f_A5F1_B592E89F9030" style="Mode=3;EOID=8E8D5E9D;SOID=8C96F568;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=107:CY=14:OX=62:OY=-14:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9EA3B8C3_695C_4b42_8481_D40EEC904171" style="Mode=3;EOID=8E8D5E9D;SOID=8C96F568;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=-5;EX=0;EY=-5;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=139:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_47E28283_E9BB_4790_9AB4_37A6F31DF36A" style="Mode=3;EOID=D6F538AB;SOID=8C96F568;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;EX=-73;EY=0;SX=-30;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=154:CY=14:OX=96:OY=17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_15B1CFC6_0B95_4c94_B742_4DC2F5EAF55E" style="Mode=3;EOID=B191C2EB;SOID=8C96F568;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=92:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807" style="Mode=3;EOID=0221BE4C;SOID=9A68D3D7;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-13;SY=0;EX=0;EY=-23;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=489:-68$;" subject="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044" style="Mode=3;EOID=56D0C9AB;SOID=9A68D3D7;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=34;SY=0;EX=0;EY=24;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=130:CY=14:OX=-1:OY=-5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=206:-325$;" subject="EAID_F3984A8F_8800_4bd8_89A8_7BF01AA3F7CB" style="Mode=3;EOID=31C63B27;SOID=B191C2EB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=0;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_CF00A26F_CB76_4971_854A_CE68DE5CB673" style="Mode=3;EOID=9A68D3D7;SOID=31C63B27;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=-14;EY=-1;SX=-14;SY=-1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=118:CY=14:OX=63:OY=-30:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_056C94FE_E7B7_428e_B87E_F0795660EA2B" style="Mode=3;EOID=FBB50A0A;SOID=0221BE4C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=95:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0692BD51_5113_4e40_A80A_3CDDD84D3629" style="Mode=3;EOID=0221BE4C;SOID=97F8E294;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=115;SY=-8;EX=116;EY=-8;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BBC722BA_3236_4fcb_B51A_14A66F3D627C" style="Mode=3;EOID=56D0C9AB;SOID=0221BE4C;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=22;SY=0;EX=22;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=159:CY=14:OX=94:OY=31:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_52CB7369_B0C2_4acc_A513_76150076F808" style="Mode=3;EOID=56D0C9AB;SOID=0221BE4C;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=113;SY=-1;EX=114;EY=-1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=51:OY=12:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_ECEFDC69_19B4_47d7_A201_D8391B5C67DF" style="Mode=3;EOID=56D0C9AB;SOID=0221BE4C;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=960;SCTR.TOP=-206;SCTR.RIGHT=991;SCTR.BOTTOM=-191;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=961:-206$991:-206$991:-191$961:-191$;" subject="EAID_AF2B738F_531D_4495_9397_CE5771200854" style="Mode=3;EOID=0221BE4C;SOID=0221BE4C;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=1;SX=12;SY=0;EX=12;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=74:CY=14:OX=46:OY=9:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_30CBA4D5_2CA0_4043_A8BC_8FBCF102380D" style="Mode=3;EOID=AB84D331;SOID=8E8D5E9D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=960;SCTR.TOP=-206;SCTR.RIGHT=991;SCTR.BOTTOM=-191;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=961:-206$991:-206$991:-191$961:-191$;" subject="EAID_574DB5D8_4929_4670_9014_608B3C5534ED" style="Mode=3;EOID=0221BE4C;SOID=0221BE4C;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EX=22;EY=2;SX=22;SY=2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=123:CY=14:OX=71:OY=-28:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7EF1D4F7_398F_4f04_A19A_C5D793FA14E3" style="Mode=3;EOID=950E4F52;SOID=0221BE4C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=0;EY=19;SX=0;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=23:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=838:-620$;" subject="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65" style="Mode=3;EOID=8E8D5E9D;SOID=0221BE4C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-54;SY=-11;EX=-53;EY=-11;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=61:OY=49:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_15464872_BFB6_40bb_84F1_8A3969FE662E" style="Mode=3;EOID=56D0C9AB;SOID=0221BE4C;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-103;SY=-5;EX=-102;EY=-5;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=53:OY=24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA" style="Mode=3;EOID=56D0C9AB;SOID=0221BE4C;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-100;SY=-5;EX=-99;EY=-5;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_E507D198_1A41_4b43_873A_F9E88411186D" style="Mode=3;EOID=56D0C9AB;SOID=0221BE4C;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=960;SCTR.TOP=-206;SCTR.RIGHT=991;SCTR.BOTTOM=-191;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=961:-206$991:-206$991:-191$961:-191$;" subject="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24" style="Mode=3;EOID=0221BE4C;SOID=0221BE4C;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EX=0;EY=-14;SX=-2;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=112:CY=14:OX=22:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1170:-653$;" subject="EAID_B9C9C412_36FA_46d5_AA00_34CA1CC60CA2" style="Mode=3;EOID=8E8D5E9D;SOID=97F8E294;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=960;SCTR.TOP=-206;SCTR.RIGHT=991;SCTR.BOTTOM=-191;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=961:-206$991:-206$991:-191$961:-191$;" subject="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991" style="Mode=3;EOID=0221BE4C;SOID=0221BE4C;Color=-1;LWidth=0;Hidden=1;"/>
+				</elements>
+			</diagram>
+			<diagram xmi:id="EAID_F47DCEA4_48E2_4aca_B41C_421D570CE41D">
+				<model package="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" localID="556" owner="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" tpos="6"/>
+				<properties name="invoicing amount and price" type="Logical"/>
+				<project author="andreea" version="1.0" created="2024-06-26 12:04:55" modified="2024-07-23 10:17:03"/>
+				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=FE48DD10;"/>
+				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
+				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
+				<extendedProperties/>
+				<elements>
+					<element geometry="Left=1420;Top=165;Right=1720;Bottom=235;" subject="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" seqno="1" style="DUID=B8148B57;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1493;Top=433;Right=1647;Bottom=503;" subject="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" seqno="2" style="DUID=E3BA5B89;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=864;Top=574;Right=954;Bottom=634;" subject="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3" seqno="3" style="DUID=36934851;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1067;Top=568;Right=1272;Bottom=638;" subject="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" seqno="4" style="DUID=6B2ACA51;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=722;Top=165;Right=944;Bottom=235;" subject="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" seqno="5" style="DUID=19685A94;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=788;Top=308;Right=878;Bottom=355;" subject="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" seqno="6" style="DUID=392C5F6B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=52;Top=143;Right=298;Bottom=257;" subject="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" seqno="7" style="DUID=DB01F66A;NSL=0;"/>
+					<element geometry="Left=392;Top=165;Right=624;Bottom=235;" subject="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" seqno="8" style="DUID=3BB0ABAB;NSL=0;"/>
+					<element geometry="Left=1074;Top=414;Right=1264;Bottom=522;" subject="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" seqno="9" style="DUID=B049EEC9;NSL=0;"/>
+					<element geometry="Left=377;Top=406;Right=640;Bottom=530;" subject="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" seqno="10" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=E0BE4775;"/>
+					<element geometry="Left=1052;Top=151;Right=1319;Bottom=249;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="11" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=24BD02D0;"/>
+					<element geometry="SX=-76;SY=0;EX=-76;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_1F622DE3_2DEE_491f_A5F1_B592E89F9030" style="Mode=3;EOID=6B2ACA51;SOID=B049EEC9;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65" style="Mode=3;EOID=6B2ACA51;SOID=DB01F66A;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=2;SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;SCTR.LEFT=297;SCTR.TOP=-168;SCTR.RIGHT=328;SCTR.BOTTOM=-153;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=298:-168$328:-168$328:-153$298:-153$;" subject="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24" style="Mode=3;EOID=DB01F66A;SOID=DB01F66A;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=2;SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;SCTR.LEFT=297;SCTR.TOP=-168;SCTR.RIGHT=328;SCTR.BOTTOM=-153;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=298:-168$328:-168$328:-153$298:-153$;" subject="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F" style="Mode=3;EOID=DB01F66A;SOID=DB01F66A;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=4;EX=-5;EY=0;SX=0;SY=-3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=92:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807" style="Mode=3;EOID=DB01F66A;SOID=3BB0ABAB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=154:CY=14:OX=-10:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_15B1CFC6_0B95_4c94_B742_4DC2F5EAF55E" style="Mode=3;EOID=E3BA5B89;SOID=B049EEC9;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F475E438_48A3_41f5_A736_268C91FF8AF2" style="Mode=3;EOID=6B2ACA51;SOID=E0BE4775;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=15;SY=0;EX=15;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=107:CY=14:OX=62:OY=-15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9EA3B8C3_695C_4b42_8481_D40EEC904171" style="Mode=3;EOID=6B2ACA51;SOID=B049EEC9;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;SCTR.LEFT=297;SCTR.TOP=-168;SCTR.RIGHT=328;SCTR.BOTTOM=-153;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=298:-168$328:-168$328:-153$298:-153$;" subject="EAID_AF2B738F_531D_4495_9397_CE5771200854" style="Mode=3;EOID=DB01F66A;SOID=DB01F66A;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=66;SY=-4;EX=66;EY=-4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A0FABF7A_1814_4dd4_BD97_28BD0C9F2F49" style="Mode=3;EOID=6B2ACA51;SOID=B049EEC9;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=28;SY=27;EX=-52;EY=-5;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=130:CY=14:OX=70:OY=46:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7" style="Mode=3;EOID=24BD02D0;SOID=B049EEC9;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C33C0B35_4ADE_463d_BD51_7717D3E67FCB" style="Mode=3;EOID=3BB0ABAB;SOID=E0BE4775;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=-19;EX=0;EY=-32;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=140:CY=14:OX=-4:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_5E6E2C47_4590_4730_B50C_8F40D73778CB" style="Mode=3;EOID=B049EEC9;SOID=E0BE4775;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-9;SY=7;EX=-9;EY=5;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=72:CY=14:OX=-32:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-14:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3C28A6D1_3F44_48a1_A013_1A7BA2859AFA" style="Mode=3;EOID=B049EEC9;SOID=E0BE4775;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_E93A74BB_614F_4b1c_AE59_F45CD626BB7A" style="Mode=3;EOID=6B2ACA51;SOID=E0BE4775;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=0;SY=0;EX=56;EY=-1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=139:CY=14:OX=98:OY=26:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_47E28283_E9BB_4790_9AB4_37A6F31DF36A" style="Mode=3;EOID=24BD02D0;SOID=B049EEC9;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_5EDC73B7_1ABC_4e6f_9003_79369EBD749D" style="Mode=3;EOID=24BD02D0;SOID=19685A94;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=19;EX=0;EY=19;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_516CC611_B255_4c67_AAF8_2E19960E553F" style="Mode=3;EOID=24BD02D0;SOID=B8148B57;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=17;SY=9;EX=17;EY=9;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F3984A8F_8800_4bd8_89A8_7BF01AA3F7CB" style="Mode=3;EOID=19685A94;SOID=E3BA5B89;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=13;SY=13;EX=13;EY=13;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_2938C487_B424_424e_A34E_13EA1CB113F2" style="Mode=3;EOID=392C5F6B;SOID=E3BA5B89;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_308D4104_53D2_4be0_B731_D93BB56777D3" style="Mode=3;EOID=B8148B57;SOID=E3BA5B89;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=4;SX=0;SY=-1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=74:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_30CBA4D5_2CA0_4043_A8BC_8FBCF102380D" style="Mode=3;EOID=36934851;SOID=6B2ACA51;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;SX=100;SY=0;EX=-70;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=72:CY=14:OX=45:OY=-33:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=933:-327$1099:-327$;" subject="EAID_02BBBEAA_ED71_4eaf_B786_4BBE7F52C5D5" style="Mode=3;EOID=B049EEC9;SOID=19685A94;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;SCTR.LEFT=297;SCTR.TOP=-168;SCTR.RIGHT=328;SCTR.BOTTOM=-153;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=298:-168$328:-168$328:-153$298:-153$;" subject="EAID_574DB5D8_4929_4670_9014_608B3C5534ED" style="Mode=3;EOID=DB01F66A;SOID=DB01F66A;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=111:CY=14:OX=73:OY=-29:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_8254F8D7_D6F0_4c63_A478_9179AAD0DF81" style="Mode=3;EOID=392C5F6B;SOID=19685A94;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;SCTR.LEFT=297;SCTR.TOP=-168;SCTR.RIGHT=328;SCTR.BOTTOM=-153;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=298:-168$328:-168$328:-153$298:-153$;" subject="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991" style="Mode=3;EOID=DB01F66A;SOID=DB01F66A;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_CF00A26F_CB76_4971_854A_CE68DE5CB673" style="Mode=3;EOID=3BB0ABAB;SOID=19685A94;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=4;SX=0;SY=-1;EX=67;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=575:-332$;" subject="EAID_AA589EDA_B26B_44c3_BCCC_37421BA960DE" style="Mode=3;EOID=3BB0ABAB;SOID=392C5F6B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=3;EX=0;EY=35;SX=16;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=72:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-18:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=849:-433$;" subject="EAID_1F2E5010_8DA9_46f5_A0D6_59757CEC226D" style="Mode=3;EOID=B049EEC9;SOID=392C5F6B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_0AC5D04E_7364_4118_9D94_CE93A68B3CF9" style="Mode=3;EOID=6B2ACA51;SOID=392C5F6B;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=3;EX=0;EY=36;SX=-19;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=129:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=814:-432$;" subject="EAID_082B76C7_EF6B_4c76_8A07_9FF99AC0CF07" style="Mode=3;EOID=E0BE4775;SOID=392C5F6B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-17;EX=0;EY=-17;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_202AF5A1_B4FE_48a4_91D4_F6387465413F" style="Mode=3;EOID=24BD02D0;SOID=B8148B57;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_30A83FCD_B7E1_4f9c_95D1_48B460BCC4B8" style="Mode=3;EOID=6B2ACA51;SOID=19685A94;Color=-1;LWidth=0;Hidden=1;"/>
+				</elements>
+			</diagram>
+			<diagram xmi:id="EAID_88552016_78CC_428a_9DCF_518285F01AEB">
+				<model package="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" localID="557" owner="EAPK_0C7479E3_A3BF_4984_AEB1_34FFC0ADE49D" tpos="9"/>
+				<properties name="invoicing credit note" type="Logical"/>
+				<project author="andreea" version="1.0" created="2024-07-04 13:17:49" modified="2024-07-04 16:38:45"/>
+				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=752F62FB;"/>
+				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
+				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
+				<extendedProperties/>
+				<elements>
+					<element geometry="Left=68;Top=493;Right=353;Bottom=565;" subject="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" seqno="1" style="DUID=E1B64E78;NSL=0;"/>
+					<element geometry="Left=682;Top=451;Right=696;Bottom=465;" subject="EAID_119CC125_3338_4d92_B1AC_9656FAB69479" seqno="2" style="DUID=E7589C60;"/>
+					<element geometry="Left=682;Top=570;Right=696;Bottom=584;" subject="EAID_90ECE48B_7614_4efa_B90D_F964CC48D88F" seqno="3" style="DUID=37CDC630;"/>
+					<element geometry="Left=817;Top=560;Right=946;Bottom=595;" subject="EAID_666DA030_1385_4c0a_BDEA_7E543A745220" seqno="4" style="DUID=26E00050;"/>
+					<element geometry="Left=771;Top=423;Right=993;Bottom=493;" subject="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" seqno="5" style="DUID=64D628A2;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=693;Top=308;Right=783;Bottom=368;" subject="EAID_C3684D7C_E07D_415a_B935_B52376928738" seqno="6" style="DUID=FAB9AB65;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=451;Top=560;Right=561;Bottom=595;" subject="EAID_08C029B6_D4CA_4b3f_932A_FE0341103DDA" seqno="7" style="DUID=1984F265;"/>
+					<element geometry="Left=438;Top=315;Right=575;Bottom=361;" subject="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" seqno="8" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=846E1CE8;"/>
+					<element geometry="Left=410;Top=137;Right=605;Bottom=277;" subject="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" seqno="9" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=0DA20F22;"/>
+					<element geometry="Left=374;Top=410;Right=639;Bottom=506;" subject="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" seqno="10" style="DUID=949ADA3F;NSL=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9E6525F3_95EC_40a8_A04C_8DBE25A452AC" style="Mode=3;EOID=E7589C60;SOID=37CDC630;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=37;SY=-5;EX=37;EY=-5;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=144:CY=14:OX=95:OY=24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D733E621_C963_47fe_BD58_E0A4DB42E28A" style="Mode=3;EOID=64D628A2;SOID=26E00050;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-31;SY=3;EX=-31;EY=3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B721C9F4_7411_44f0_8C18_F21C663487A4" style="Mode=3;EOID=64D628A2;SOID=26E00050;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-39;SY=-1;EX=-3;EY=-48;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=101:CY=14:OX=50:OY=16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_18B4EBAA_337C_4029_8899_771627409CB7" style="Mode=3;EOID=949ADA3F;SOID=1984F265;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=23;SY=0;EX=24;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_206A035D_9984_470b_B11B_8D183EDF5B42" style="Mode=3;EOID=949ADA3F;SOID=1984F265;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=137:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_313091EC_C442_43be_A2FC_C86EE11EAC7C" style="Mode=3;EOID=26E00050;SOID=1984F265;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=114:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_233516AD_8114_473d_B8A6_42826FC39635" style="Mode=3;EOID=FAB9AB65;SOID=846E1CE8;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-1;SY=-2;EX=-1;EY=-2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_618070AC_783D_48ae_9723_9C69BB0EB7B4" style="Mode=3;EOID=0DA20F22;SOID=846E1CE8;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=583;SCTR.TOP=-151;SCTR.RIGHT=619;SCTR.BOTTOM=-115;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=139:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=605:-151$619:-151$619:-115$583:-115$583:-137$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=0DA20F22;SOID=0DA20F22;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=374;SCTR.TOP=-162;SCTR.RIGHT=425;SCTR.BOTTOM=-116;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=1:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=425:-137$425:-116$374:-116$374:-162$410:-162$;" subject="EAID_39F3583F_0D40_4e9f_8018_10297955785C" style="Mode=3;EOID=0DA20F22;SOID=0DA20F22;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=500;SCTR.TOP=-138;SCTR.RIGHT=541;SCTR.BOTTOM=-111;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=81:OY=-22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=541:-137$541:-111$500:-111$500:-137$;" subject="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9" style="Mode=3;EOID=0DA20F22;SOID=0DA20F22;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=19;EX=9;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=182:CY=14:OX=89:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=219:-439$;" subject="EAID_1BF72C1B_7093_491e_82BB_04BA37F9657F" style="Mode=3;EOID=E1B64E78;SOID=949ADA3F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-25;SY=1;EX=2;EY=-12;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_387C6C7A_CC14_4b5e_BAB7_F3D1FB910F35" style="Mode=3;EOID=846E1CE8;SOID=949ADA3F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=124:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_46A59C5B_A5BD_4ae9_A4FB_1ADCCECB44D6" style="Mode=3;EOID=64D628A2;SOID=949ADA3F;Color=-1;LWidth=0;Hidden=0;"/>
+				</elements>
+			</diagram>
+			<diagram xmi:id="EAID_08EC91F8_DB57_4285_9B0C_79300E9E4E11">
+				<model package="EAPK_BD141F2B_B3A1_4079_99FB_B1548747E3A9" localID="545" owner="EAPK_BD141F2B_B3A1_4079_99FB_B1548747E3A9" tpos="0"/>
+				<properties name="datatype" type="Logical"/>
+				<project author="lps" version="1.0" created="2022-04-29 20:18:40" modified="2022-04-29 20:27:06"/>
+				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=1;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=791;DocSize.cy=1134;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=40F87AE6;"/>
+				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
+				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
+				<extendedProperties/>
+				<elements>
+					<element geometry="Left=54;Top=41;Right=144;Bottom=79;" subject="EAID_7E687EAB_543A_41d0_8F94_00EC9DF8B207" seqno="1" style="DUID=1A585DF4;"/>
+					<element geometry="Left=54;Top=134;Right=144;Bottom=172;" subject="EAID_875F3C98_F2EB_4ca2_B02D_E00B66FC5EF3" seqno="2" style="DUID=4C1AC1D2;"/>
+					<element geometry="Left=162;Top=134;Right=252;Bottom=172;" subject="EAID_904AAE3B_BDAD_4438_85D8_650CBD717EFA" seqno="3" style="DUID=94790CE2;"/>
+					<element geometry="Left=162;Top=246;Right=252;Bottom=284;" subject="EAID_7F47096D_17ED_4ef0_B702_8BBE941201A9" seqno="4" style="DUID=D913AB64;"/>
+					<element geometry="Left=54;Top=246;Right=144;Bottom=284;" subject="EAID_1D7FE0CE_4B79_4c43_9264_D59F4A8A43EB" seqno="5" style="DUID=3F1A2251;"/>
+					<element geometry="Left=162;Top=42;Right=252;Bottom=80;" subject="EAID_5E50EE4A_45CD_49b0_88C5_E6D1A1B31A48" seqno="6" style="DUID=E15998B9;"/>
+					<element geometry="Left=54;Top=334;Right=144;Bottom=372;" subject="EAID_B011F488_70E3_4f4a_973C_8B35E69DA361" seqno="7" style="DUID=15E99713;"/>
+				</elements>
+			</diagram>
+		</diagrams>
+	</xmi:Extension>
+</xmi:XMI>
diff --git a/implementation/eInvoicing/xmi_conceptual_model/eSubmission.xml b/implementation/eInvoicing/xmi_conceptual_model/eSubmission.xml
new file mode 100644
index 00000000..0e2834ad
--- /dev/null
+++ b/implementation/eInvoicing/xmi_conceptual_model/eSubmission.xml
@@ -0,0 +1,3698 @@
+<?xml version="1.0" encoding="windows-1252"?>
+<xmi:XMI xmlns:uml="http://www.omg.org/spec/UML/20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:umldi="http://www.omg.org/spec/UML/20131001/UMLDI" xmlns:dc="http://www.omg.org/spec/UML/20131001/UMLDC">
+	<xmi:Documentation exporter="Enterprise Architect" exporterVersion="6.5" exporterID="1559"/>
+	<uml:Model xmi:type="uml:Model" name="EA_Model">
+		<packagedElement xmi:type="uml:Package" xmi:id="EAPK_53638E82_0EE0_4a4c_9560_38B724971FE9" name="Submission">
+			<packagedElement xmi:type="uml:Package" xmi:id="EAPK_5E7328A3_FB85_43c1_8DA5_AE7A684AE578" name="submission">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" name="diagrams"/>
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_BF99515E_23A1_4c32_ACF2_57A2EF805C41" name="classes">
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B" name="cccev:SupportedValue">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_690D9B32_F64D_4dd8_96E2_F3E43B834759" name="cccev:value">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000001_F64D_4dd8_96E2_F3E43B834759" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000002_F64D_4dd8_96E2_F3E43B834759" value="*"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstC6423E_1A9A_47fb_8C22_10175EEF3A31" name="cccev:providesValueFor" association="EAID_CFC6423E_1A9A_47fb_8C22_10175EEF3A31">
+							<type xmi:idref="EAID_86057FC2_7717_4160_8952_6A9F572F43B2"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000003__1A9A_47fb_8C22_10175EEF3A31" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000004__1A9A_47fb_8C22_10175EEF3A31" value="*"/>
+						</ownedAttribute>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_CFC6423E_1A9A_47fb_8C22_10175EEF3A31">
+						<memberEnd xmi:idref="EAID_dstC6423E_1A9A_47fb_8C22_10175EEF3A31"/>
+						<memberEnd xmi:idref="EAID_srcC6423E_1A9A_47fb_8C22_10175EEF3A31"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC6423E_1A9A_47fb_8C22_10175EEF3A31" association="EAID_CFC6423E_1A9A_47fb_8C22_10175EEF3A31">
+							<type xmi:idref="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3EE371EF_8DF9_4747_B49E_48C56317F5F9">
+						<memberEnd xmi:idref="EAID_dstE371EF_8DF9_4747_B49E_48C56317F5F9"/>
+						<memberEnd xmi:idref="EAID_srcE371EF_8DF9_4747_B49E_48C56317F5F9"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE371EF_8DF9_4747_B49E_48C56317F5F9" association="EAID_3EE371EF_8DF9_4747_B49E_48C56317F5F9">
+							<type xmi:idref="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_CE6EADDE_0D7D_40a5_B341_A616866CD789">
+						<memberEnd xmi:idref="EAID_dst6EADDE_0D7D_40a5_B341_A616866CD789"/>
+						<memberEnd xmi:idref="EAID_src6EADDE_0D7D_40a5_B341_A616866CD789"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6EADDE_0D7D_40a5_B341_A616866CD789" association="EAID_CE6EADDE_0D7D_40a5_B341_A616866CD789">
+							<type xmi:idref="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_02D4B752_188D_46ee_AF52_F2AAFF7E2E77" name="epo-sub:CertificateInformation">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_38195851_542F_4925_B8A1_035AE8338D83" name="epo-sub:coversAllSelectionCriteria">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000005_542F_4925_B8A1_035AE8338D83" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000006_542F_4925_B8A1_035AE8338D83" value="1"/>
+							<type xmi:idref="EAJava_xsd_boolean"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_848FD2BB_C8B5_4faf_AE53_68044F8BCFFA" name="dct:description">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000007_C8B5_4faf_AE53_68044F8BCFFA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000008_C8B5_4faf_AE53_68044F8BCFFA" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst57E831_F2FE_4a87_9BA9_5CF8B7A9D5AB" name="epo-sub:summarisesInformationAboutCertificate" association="EAID_CA57E831_F2FE_4a87_9BA9_5CF8B7A9D5AB">
+							<type xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000009__F2FE_4a87_9BA9_5CF8B7A9D5AB" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000010__F2FE_4a87_9BA9_5CF8B7A9D5AB" value="1"/>
+						</ownedAttribute>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_F0D24264_CD84_461f_AF53_509A8FB111D6" general="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_CA57E831_F2FE_4a87_9BA9_5CF8B7A9D5AB">
+						<memberEnd xmi:idref="EAID_dst57E831_F2FE_4a87_9BA9_5CF8B7A9D5AB"/>
+						<memberEnd xmi:idref="EAID_src57E831_F2FE_4a87_9BA9_5CF8B7A9D5AB"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src57E831_F2FE_4a87_9BA9_5CF8B7A9D5AB" association="EAID_CA57E831_F2FE_4a87_9BA9_5CF8B7A9D5AB">
+							<type xmi:idref="EAID_02D4B752_188D_46ee_AF52_F2AAFF7E2E77"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" name="epo-sub:ESPD">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstBCD522_5AC9_4199_A0FF_14B7A0FB6A6B" name="epo-sub:relatesToESPDRequest" association="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
+							<type xmi:idref="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000011__5AC9_4199_A0FF_14B7A0FB6A6B" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000012__5AC9_4199_A0FF_14B7A0FB6A6B" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF95470_AB2B_4b7d_BCCF_3E7847170DBD" name="epo-sub:specifiesResponse" association="EAID_ACF95470_AB2B_4b7d_BCCF_3E7847170DBD">
+							<type xmi:idref="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000013__AB2B_4b7d_BCCF_3E7847170DBD" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000014__AB2B_4b7d_BCCF_3E7847170DBD" value="*"/>
+						</ownedAttribute>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_C7D18971_E3AA_4bc3_B35F_CBFE4CDAAA84" general="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273" name="epo-sub:refersToOtherESPDResponse" association="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273">
+							<type xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000015__AFA9_4565_A69F_C36E3ABE8273" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000016__AFA9_4565_A69F_C36E3ABE8273" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F" name="epo-sub:providesInformationOn" association="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F">
+							<type xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000017__41B4_4817_850D_83D60BFADA1F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000018__41B4_4817_850D_83D60BFADA1F" value="*"/>
+						</ownedAttribute>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
+						<memberEnd xmi:idref="EAID_dstBCD522_5AC9_4199_A0FF_14B7A0FB6A6B"/>
+						<memberEnd xmi:idref="EAID_srcBCD522_5AC9_4199_A0FF_14B7A0FB6A6B"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBCD522_5AC9_4199_A0FF_14B7A0FB6A6B" association="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
+							<type xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_ACF95470_AB2B_4b7d_BCCF_3E7847170DBD">
+						<memberEnd xmi:idref="EAID_dstF95470_AB2B_4b7d_BCCF_3E7847170DBD"/>
+						<memberEnd xmi:idref="EAID_srcF95470_AB2B_4b7d_BCCF_3E7847170DBD"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF95470_AB2B_4b7d_BCCF_3E7847170DBD" association="EAID_ACF95470_AB2B_4b7d_BCCF_3E7847170DBD">
+							<type xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273">
+						<memberEnd xmi:idref="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273"/>
+						<memberEnd xmi:idref="EAID_src159B9F_AFA9_4565_A69F_C36E3ABE8273"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src159B9F_AFA9_4565_A69F_C36E3ABE8273" association="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273">
+							<type xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F">
+						<memberEnd xmi:idref="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F"/>
+						<memberEnd xmi:idref="EAID_srcFF2FFB_41B4_4817_850D_83D60BFADA1F"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFF2FFB_41B4_4817_850D_83D60BFADA1F" association="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F">
+							<type xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_E453F729_4B4E_44c9_AD20_DD8131AF4BEF">
+						<memberEnd xmi:idref="EAID_dst53F729_4B4E_44c9_AD20_DD8131AF4BEF"/>
+						<memberEnd xmi:idref="EAID_src53F729_4B4E_44c9_AD20_DD8131AF4BEF"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src53F729_4B4E_44c9_AD20_DD8131AF4BEF" association="EAID_E453F729_4B4E_44c9_AD20_DD8131AF4BEF">
+							<type xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D" name="epo-sub:LegalRepresentative">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE95E36_FC35_4adf_B5AC_F916221BB38E" name="epo-sub:hasPowerOfAttorney" association="EAID_15E95E36_FC35_4adf_B5AC_F916221BB38E">
+							<type xmi:idref="EAID_DE869DED_87AA_46a5_963D_EAEBF2AA6803"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000019__FC35_4adf_B5AC_F916221BB38E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000020__FC35_4adf_B5AC_F916221BB38E" value="1"/>
+						</ownedAttribute>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_1982F8A2_ECBE_47d6_9A92_7176519FD4A5" general="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst75FD52_1FE1_445c_9B8B_96AA208D3134" name="epo:actsOnBehalfOf" association="EAID_7775FD52_1FE1_445c_9B8B_96AA208D3134">
+							<type xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000021__1FE1_445c_9B8B_96AA208D3134" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000022__1FE1_445c_9B8B_96AA208D3134" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstAE0856_7B74_434f_BCD2_491FA097E6DE" name="epo-sub:hasMandate" association="EAID_C9AE0856_7B74_434f_BCD2_491FA097E6DE">
+							<type xmi:idref="EAID_95FD9F3B_1F77_4e3c_A91D_72310583752E"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000023__7B74_434f_BCD2_491FA097E6DE" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000024__7B74_434f_BCD2_491FA097E6DE" value="*"/>
+						</ownedAttribute>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_15E95E36_FC35_4adf_B5AC_F916221BB38E">
+						<memberEnd xmi:idref="EAID_dstE95E36_FC35_4adf_B5AC_F916221BB38E"/>
+						<memberEnd xmi:idref="EAID_srcE95E36_FC35_4adf_B5AC_F916221BB38E"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE95E36_FC35_4adf_B5AC_F916221BB38E" association="EAID_15E95E36_FC35_4adf_B5AC_F916221BB38E">
+							<type xmi:idref="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7775FD52_1FE1_445c_9B8B_96AA208D3134">
+						<memberEnd xmi:idref="EAID_dst75FD52_1FE1_445c_9B8B_96AA208D3134"/>
+						<memberEnd xmi:idref="EAID_src75FD52_1FE1_445c_9B8B_96AA208D3134"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src75FD52_1FE1_445c_9B8B_96AA208D3134" association="EAID_7775FD52_1FE1_445c_9B8B_96AA208D3134">
+							<type xmi:idref="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C9AE0856_7B74_434f_BCD2_491FA097E6DE">
+						<memberEnd xmi:idref="EAID_dstAE0856_7B74_434f_BCD2_491FA097E6DE"/>
+						<memberEnd xmi:idref="EAID_srcAE0856_7B74_434f_BCD2_491FA097E6DE"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcAE0856_7B74_434f_BCD2_491FA097E6DE" association="EAID_C9AE0856_7B74_434f_BCD2_491FA097E6DE">
+							<type xmi:idref="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_95FD9F3B_1F77_4e3c_A91D_72310583752E" name="epo-sub:Mandate">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_672E5CCE_F8C9_4117_A52B_56209E049485" general="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" name="epo-sub:NationalPreQualificationData">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_9C54C14F_AC2C_4e59_BBC8_FFB638255E64" name="epo-sub:providesOrganisationCompletedTaskDescription">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000025_AC2C_4e59_BBC8_FFB638255E64" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000026_AC2C_4e59_BBC8_FFB638255E64" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstCC2B92_731F_4428_B333_8582A36D1244" name="epo-sub:providesOrganisationPreQualificationListingIdentifier" association="EAID_23CC2B92_731F_4428_B333_8582A36D1244">
+							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000027__731F_4428_B333_8582A36D1244" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000028__731F_4428_B333_8582A36D1244" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstC6E00F_DAEB_4e79_8340_AC2FC83206DA" name="epo-sub:providesOrganisationEmployeeQuantity" association="EAID_87C6E00F_DAEB_4e79_8340_AC2FC83206DA">
+							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000029__DAEB_4e79_8340_AC2FC83206DA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000030__DAEB_4e79_8340_AC2FC83206DA" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF032E2_6893_45df_95FE_A08E92EA8618" name="epo-sub:providesOrganisationFinancialCapability" association="EAID_9BF032E2_6893_45df_95FE_A08E92EA8618">
+							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000031__6893_45df_95FE_A08E92EA8618" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000032__6893_45df_95FE_A08E92EA8618" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstD90197_EC7F_4a01_8047_2DAC846D9C03" name="epo-sub:concernsOrganisation" association="EAID_B6D90197_EC7F_4a01_8047_2DAC846D9C03">
+							<type xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000033__EC7F_4a01_8047_2DAC846D9C03" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000034__EC7F_4a01_8047_2DAC846D9C03" value="1"/>
+						</ownedAttribute>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_23CC2B92_731F_4428_B333_8582A36D1244">
+						<memberEnd xmi:idref="EAID_dstCC2B92_731F_4428_B333_8582A36D1244"/>
+						<memberEnd xmi:idref="EAID_srcCC2B92_731F_4428_B333_8582A36D1244"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCC2B92_731F_4428_B333_8582A36D1244" association="EAID_23CC2B92_731F_4428_B333_8582A36D1244">
+							<type xmi:idref="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_87C6E00F_DAEB_4e79_8340_AC2FC83206DA">
+						<memberEnd xmi:idref="EAID_dstC6E00F_DAEB_4e79_8340_AC2FC83206DA"/>
+						<memberEnd xmi:idref="EAID_srcC6E00F_DAEB_4e79_8340_AC2FC83206DA"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC6E00F_DAEB_4e79_8340_AC2FC83206DA" association="EAID_87C6E00F_DAEB_4e79_8340_AC2FC83206DA">
+							<type xmi:idref="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9BF032E2_6893_45df_95FE_A08E92EA8618">
+						<memberEnd xmi:idref="EAID_dstF032E2_6893_45df_95FE_A08E92EA8618"/>
+						<memberEnd xmi:idref="EAID_srcF032E2_6893_45df_95FE_A08E92EA8618"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF032E2_6893_45df_95FE_A08E92EA8618" association="EAID_9BF032E2_6893_45df_95FE_A08E92EA8618">
+							<type xmi:idref="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B6D90197_EC7F_4a01_8047_2DAC846D9C03">
+						<memberEnd xmi:idref="EAID_dstD90197_EC7F_4a01_8047_2DAC846D9C03"/>
+						<memberEnd xmi:idref="EAID_srcD90197_EC7F_4a01_8047_2DAC846D9C03"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD90197_EC7F_4a01_8047_2DAC846D9C03" association="EAID_B6D90197_EC7F_4a01_8047_2DAC846D9C03">
+							<type xmi:idref="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_DE869DED_87AA_46a5_963D_EAEBF2AA6803" name="epo-sub:PowerOfAttorney">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_4CC20250_2603_476b_8725_C9307E8BA364" general="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" name="epo-sub:Response">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE371EF_8DF9_4747_B49E_48C56317F5F9" name="cccev:supportsValue" association="EAID_3EE371EF_8DF9_4747_B49E_48C56317F5F9">
+							<type xmi:idref="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000035__8DF9_4747_B49E_48C56317F5F9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000036__8DF9_4747_B49E_48C56317F5F9" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst15AB6B_F88D_4b3e_857E_2AD843DEF3DE" name="epo-sub:answersQuestion" association="EAID_5715AB6B_F88D_4b3e_857E_2AD843DEF3DE">
+							<type xmi:idref="EAID_30DD6891_71FE_4f87_832B_477790550BBC"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000037__F88D_4b3e_857E_2AD843DEF3DE" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000038__F88D_4b3e_857E_2AD843DEF3DE" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstB47F0D_8871_4230_A6F8_522396CE72CF" name="epo-sub:isReinforcedBy" association="EAID_93B47F0D_8871_4230_A6F8_522396CE72CF">
+							<type xmi:idref="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000039__8871_4230_A6F8_522396CE72CF" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000040__8871_4230_A6F8_522396CE72CF" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstFBB3C3_8542_4cd9_8B7E_A25D4A6C9048" name="epo-sub:refersToApplicablePeriod" association="EAID_B2FBB3C3_8542_4cd9_8B7E_A25D4A6C9048">
+							<type xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000041__8542_4cd9_8B7E_A25D4A6C9048" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000042__8542_4cd9_8B7E_A25D4A6C9048" value="1"/>
+						</ownedAttribute>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_49631FAC_5F3D_4939_83C6_69057788A49B" supplier="EAID_B7F675EC_18B3_49b1_AAF4_E0FAB88D85EE" client="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_5715AB6B_F88D_4b3e_857E_2AD843DEF3DE">
+						<memberEnd xmi:idref="EAID_dst15AB6B_F88D_4b3e_857E_2AD843DEF3DE"/>
+						<memberEnd xmi:idref="EAID_src15AB6B_F88D_4b3e_857E_2AD843DEF3DE"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src15AB6B_F88D_4b3e_857E_2AD843DEF3DE" association="EAID_5715AB6B_F88D_4b3e_857E_2AD843DEF3DE">
+							<type xmi:idref="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_93B47F0D_8871_4230_A6F8_522396CE72CF">
+						<memberEnd xmi:idref="EAID_dstB47F0D_8871_4230_A6F8_522396CE72CF"/>
+						<memberEnd xmi:idref="EAID_srcB47F0D_8871_4230_A6F8_522396CE72CF"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB47F0D_8871_4230_A6F8_522396CE72CF" association="EAID_93B47F0D_8871_4230_A6F8_522396CE72CF">
+							<type xmi:idref="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B2FBB3C3_8542_4cd9_8B7E_A25D4A6C9048">
+						<memberEnd xmi:idref="EAID_dstFBB3C3_8542_4cd9_8B7E_A25D4A6C9048"/>
+						<memberEnd xmi:idref="EAID_srcFBB3C3_8542_4cd9_8B7E_A25D4A6C9048"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFBB3C3_8542_4cd9_8B7E_A25D4A6C9048" association="EAID_B2FBB3C3_8542_4cd9_8B7E_A25D4A6C9048">
+							<type xmi:idref="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC"/>
+						</ownedEnd>
+					</packagedElement>
+				</packagedElement>
+			</packagedElement>
+			<packagedElement xmi:type="uml:Package" xmi:id="EAPK_B08268CA_8A31_45bb_861A_FFC1F323A7AF" name="datatype">
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_41974725_E867_4940_946E_A67ADB8761A5" name="rdf:PlainLiteral"/>
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_05217498_C9A9_4647_B949_0363CFF85E87" name="xsd:anyURI"/>
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_9C8D9941_B96C_4ca6_AC2B_1DABF5BF140B" name="xsd:boolean"/>
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_614F9209_E81A_4113_B53B_FECF7887AB0C" name="xsd:date"/>
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_D8DFC001_8E9C_43cc_8B42_23986E82DA4A" name="xsd:dateTime"/>
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_1DAA2177_8FD2_4acc_9598_EDC5473782ED" name="xsd:decimal"/>
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_1664A675_DB09_4b0b_9372_D91610518291" name="xsd:integer"/>
+			</packagedElement>
+		</packagedElement>
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_EECFED90_0561_419e_ACA0_11A555E18F49" isFrame="false" modelElement="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9">
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_BE9C_C9CD1456AEBB" modelElement="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_BE9C_C9CD1456AEBB" text="epo-acc:ESPDRequest"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_BE9C_C9CD1456AEBB" x="384" y="540" width="124" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_B117_6B8C8C53C370" modelElement="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_B117_6B8C8C53C370" text="epo-sub:ESPD"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_B117_6B8C8C53C370" x="384" y="340" width="124" height="92"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_9655_04521F703750" modelElement="EAID_96B284C4_E759_4bad_9655_04521F703750">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_9655_04521F703750" text="epo:Buyer"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_9655_04521F703750" x="1079" y="400" width="219" height="85"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_B611_0048946DC070" modelElement="EAID_49EC0F16_408C_4b28_B611_0048946DC070">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_B611_0048946DC070" text="epo:ProcurementServiceProvider"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_B611_0048946DC070" x="1111" y="550" width="154" height="50"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_80B0_0C345D6703F4" modelElement="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_80B0_0C345D6703F4" text="epo:Procedure"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_80B0_0C345D6703F4" x="635" y="520" width="278" height="111"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_EECFED90_0561_419e_B823_3C4BB4A7AE6C" modelElement="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_B823_3C4BB4A7AE6C" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_B823_3C4BB4A7AE6C" x="906" y="478" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_EECFED90_0561_419e_80A4_32F092496FEF" modelElement="EAID_70B4792E_F818_45db_80A4_32F092496FEF">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_80A4_32F092496FEF" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_80A4_32F092496FEF" x="898" y="412" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_B61A_99942ED53255" modelElement="EAID_BCFFD008_5189_4d53_B61A_99942ED53255">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_B61A_99942ED53255" text="epo:AcquiringParty"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_B61A_99942ED53255" x="1359" y="407" width="90" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_A12E_00C2BE16F4B6" modelElement="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_A12E_00C2BE16F4B6" text="epo:AgentInRole"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_A12E_00C2BE16F4B6" x="1319" y="218" width="171" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_B584_D95C2DBBD7A1" modelElement="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_B584_D95C2DBBD7A1" text="foaf:Agent"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_B584_D95C2DBBD7A1" x="1621" y="218" width="164" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_81DD_DA4802D8A322" modelElement="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_81DD_DA4802D8A322" text="org:Organization"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_81DD_DA4802D8A322" x="1576" y="336" width="253" height="114"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_BE84_76269B5BBD68" modelElement="EAID_29678A10_6473_461a_BE84_76269B5BBD68">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_BE84_76269B5BBD68" text="locn:Address"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_BE84_76269B5BBD68" x="1932" y="317" width="202" height="153"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_A129_C30771A9833F" modelElement="EAID_33E9269C_0B96_4b38_A129_C30771A9833F">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_A129_C30771A9833F" text="cpov:ContactPoint"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_A129_C30771A9833F" x="1621" y="66" width="199" height="114"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_ABBB_CBDD98065B7F" modelElement="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_0561_419e_ABBB_CBDD98065B7F" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_ABBB_CBDD98065B7F" text="at-voc:country"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_ABBB_CBDD98065B7F" x="2044" y="508" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_8FE5_C4EE73295C40" modelElement="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_0561_419e_8FE5_C4EE73295C40" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_8FE5_C4EE73295C40" text="at-voc:nuts"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_8FE5_C4EE73295C40" x="1932" y="508" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_9284_B6F7309F5985" modelElement="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_9284_B6F7309F5985" text="epo:OfferingParty"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_9284_B6F7309F5985" x="1144" y="218" width="90" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_B217_37E957B3B448" modelElement="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_B217_37E957B3B448" text="epo:Document"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_B217_37E957B3B448" x="134" y="316" width="195" height="140"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_AC62_FA4769B4D88C" modelElement="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_AC62_FA4769B4D88C" text="epo:Lot"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_AC62_FA4769B4D88C" x="724" y="694" width="99" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_83AA_6740E666BCB4" modelElement="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_83AA_6740E666BCB4" text="epo:ProcurementCriterion"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_83AA_6740E666BCB4" x="330" y="694" width="232" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_B083_E051F46A909D" modelElement="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_B083_E051F46A909D" text="epo:OrganisationGroup"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_B083_E051F46A909D" x="1608" y="503" width="189" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_BF42_2A6E50CAF4E6" modelElement="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_BF42_2A6E50CAF4E6" text="epo:LotGroup"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_BF42_2A6E50CAF4E6" x="688" y="812" width="179" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_B4E1_7B69BF54F2E9" modelElement="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_B4E1_7B69BF54F2E9" text="epo-sub:NationalPreQualificationData"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_B4E1_7B69BF54F2E9" x="1532" y="627" width="339" height="52"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_8D25_BA714BA9C3EC" modelElement="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_8D25_BA714BA9C3EC" text="epo:Quantity"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_8D25_BA714BA9C3EC" x="2044" y="618" width="205" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_9B44_2FCDD6AB5C9D" modelElement="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_9B44_2FCDD6AB5C9D" text="epo:MonetaryValue"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_9B44_2FCDD6AB5C9D" x="1982" y="709" width="267" height="88"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_AD7B_7484B8FDA398" modelElement="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_AD7B_7484B8FDA398" text="adms:Identifier"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_AD7B_7484B8FDA398" x="1599" y="761" width="207" height="88"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_A56C_6D68CD1BEAF3" modelElement="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_A56C_6D68CD1BEAF3" text="epo:ProcurementDocument"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_A56C_6D68CD1BEAF3" x="157" y="540" width="148" height="71"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_B333_8582A36D1244" source="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_23CC2B92_731F_4428_B333_8582A36D1244">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_B333_8582A36D1244" text="+epo-sub:providesOrganisationPreQualificationListingIdentifier" modelElement="EAID_dstCC2B92_731F_4428_B333_8582A36D1244">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_B333_8582A36D1244" x="1534" y="719" width="210" height="27"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_B333_8582A36D1244" text="0..*" modelElement="EAID_dstCC2B92_731F_4428_B333_8582A36D1244">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_B333_8582A36D1244" x="1709" y="743" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_B333_8582A36D1244" x="1701" y="679"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_B333_8582A36D1244" x="1701" y="761"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_B087_27A619B6C819" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_FC7073E1_3362_472f_B087_27A619B6C819">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_B087_27A619B6C819" text="+epo:specifiesProcurementCriterion" modelElement="EAID_dst7073E1_3362_472f_B087_27A619B6C819">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_B087_27A619B6C819" x="365" y="798" width="142" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_B087_27A619B6C819" text="0..*" modelElement="EAID_dst7073E1_3362_472f_B087_27A619B6C819">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_B087_27A619B6C819" x="462" y="769" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_B087_27A619B6C819" x="688" y="844"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_B087_27A619B6C819" x="450" y="844"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_B087_27A619B6C819" x="450" y="764"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_AB11_165E12CB38A6" source="EAID_49EC0F16_408C_4b28_B611_0048946DC070" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_4714A192_0DFA_49f4_AB11_165E12CB38A6">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_AB11_165E12CB38A6" text="+epo:actsOnBehalfOf" modelElement="EAID_dst14A192_0DFA_49f4_AB11_165E12CB38A6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_AB11_165E12CB38A6" x="1098" y="504" width="87" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_AB11_165E12CB38A6" text="1..*" modelElement="EAID_dst14A192_0DFA_49f4_AB11_165E12CB38A6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_AB11_165E12CB38A6" x="1152" y="490" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_AB11_165E12CB38A6" x="1140" y="550"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_AB11_165E12CB38A6" x="1140" y="485"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_B80A_3B15D5AAC373" source="EAID_49EC0F16_408C_4b28_B611_0048946DC070" target="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" modelElement="EAID_657CE8BE_2717_41d1_B80A_3B15D5AAC373">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_B80A_3B15D5AAC373" x="1265" y="570"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_B80A_3B15D5AAC373" x="1401" y="570"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_B80A_3B15D5AAC373" x="1401" y="477"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_BBA1_4FFA393BE7FA" source="EAID_96B284C4_E759_4bad_9655_04521F703750" target="EAID_49EC0F16_408C_4b28_B611_0048946DC070" modelElement="EAID_E076346D_AFB2_421a_BBA1_4FFA393BE7FA">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_BBA1_4FFA393BE7FA" text="+epo:delegatesAncillaryActivitiesTo" modelElement="EAID_dst76346D_AFB2_421a_BBA1_4FFA393BE7FA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_BBA1_4FFA393BE7FA" x="1186" y="513" width="143" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_BBA1_4FFA393BE7FA" text="0..*" modelElement="EAID_dst76346D_AFB2_421a_BBA1_4FFA393BE7FA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_BBA1_4FFA393BE7FA" x="1248" y="532" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_BBA1_4FFA393BE7FA" x="1240" y="485"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_BBA1_4FFA393BE7FA" x="1240" y="550"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_9C21_84470056CF01" source="EAID_96B284C4_E759_4bad_9655_04521F703750" target="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" modelElement="EAID_BD5C98D5_43D4_41be_9C21_84470056CF01">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_9C21_84470056CF01" x="1298" y="442"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_9C21_84470056CF01" x="1359" y="442"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_A69F_C36E3ABE8273" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" modelElement="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_A69F_C36E3ABE8273" text="+epo-sub:refersToOtherESPDResponse 0..*" modelElement="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_A69F_C36E3ABE8273" x="504" y="311" width="158" height="27"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_A69F_C36E3ABE8273" text="0..*" modelElement="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_A69F_C36E3ABE8273" x="507" y="335" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_A69F_C36E3ABE8273" x="508" y="352"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_A69F_C36E3ABE8273" x="508" y="352"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_A69F_C36E3ABE8273" x="542" y="352"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_0561_419e_A69F_C36E3ABE8273" x="542" y="308"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_0561_419e_A69F_C36E3ABE8273" x="499" y="308"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_0561_419e_A69F_C36E3ABE8273" x="499" y="340"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_0561_419e_A69F_C36E3ABE8273" x="499" y="340"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_A0FF_14B7A0FB6A6B" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" modelElement="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_A0FF_14B7A0FB6A6B" text="+epo-sub:relatesToESPDRequest" modelElement="EAID_dstBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_A0FF_14B7A0FB6A6B" x="383" y="502" width="131" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_A0FF_14B7A0FB6A6B" text="1" modelElement="EAID_dstBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_A0FF_14B7A0FB6A6B" x="454" y="522" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_A0FF_14B7A0FB6A6B" x="446" y="432"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_A0FF_14B7A0FB6A6B" x="446" y="540"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_850D_83D60BFADA1F" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_850D_83D60BFADA1F" text="+epo-sub:providesInformationOn" modelElement="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_850D_83D60BFADA1F" x="1437" y="346" width="134" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_850D_83D60BFADA1F" text="0..*" modelElement="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_850D_83D60BFADA1F" x="1557" y="369" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_850D_83D60BFADA1F" x="508" y="364"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_850D_83D60BFADA1F" x="1576" y="364"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_B35F_CBFE4CDAAA84" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_C7D18971_E3AA_4bc3_B35F_CBFE4CDAAA84">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_B35F_CBFE4CDAAA84" x="384" y="386"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_B35F_CBFE4CDAAA84" x="329" y="386"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_BB86_A2E25524B058" source="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_881F7772_9A6C_4e5a_BB86_A2E25524B058">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_BB86_A2E25524B058" x="1654" y="503"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_BB86_A2E25524B058" x="1654" y="450"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_AB2B_CBE8A5D24AC5" source="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" target="EAID_49EC0F16_408C_4b28_B611_0048946DC070" modelElement="EAID_28460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_AB2B_CBE8A5D24AC5" text="+epo:isExecutedByProcurementServiceProvider" modelElement="EAID_dst460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_AB2B_CBE8A5D24AC5" x="920" y="557" width="189" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_AB2B_CBE8A5D24AC5" text="0..1" modelElement="EAID_dst460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_AB2B_CBE8A5D24AC5" x="1090" y="585" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_AB2B_CBE8A5D24AC5" x="913" y="575"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_AB2B_CBE8A5D24AC5" x="1111" y="575"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_A6DF_915A5FB0B3DB" source="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_F3F440DD_AB87_4730_A6DF_915A5FB0B3DB">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_A6DF_915A5FB0B3DB" text="+epo:leadBy" modelElement="EAID_dstF440DD_AB87_4730_A6DF_915A5FB0B3DB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_A6DF_915A5FB0B3DB" x="1682" y="477" width="51" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_A6DF_915A5FB0B3DB" text="0..1" modelElement="EAID_dstF440DD_AB87_4730_A6DF_915A5FB0B3DB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_A6DF_915A5FB0B3DB" x="1715" y="455" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_A6DF_915A5FB0B3DB" x="1703" y="503"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_A6DF_915A5FB0B3DB" x="1703" y="450"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_AA17_2A8EC003CCFE" source="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_D01E7677_5AC2_42b1_AA17_2A8EC003CCFE">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_AA17_2A8EC003CCFE" text="+epo:isResponsibilityOfBuyer" modelElement="EAID_dst1E7677_5AC2_42b1_AA17_2A8EC003CCFE">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_AA17_2A8EC003CCFE" x="960" y="467" width="117" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_AA17_2A8EC003CCFE" text="0..*" modelElement="EAID_dst1E7677_5AC2_42b1_AA17_2A8EC003CCFE">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_AA17_2A8EC003CCFE" x="1060" y="490" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_AA17_2A8EC003CCFE" x="913" y="520"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_AA17_2A8EC003CCFE" x="913" y="485"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_AA17_2A8EC003CCFE" x="1079" y="485"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_95FE_A08E92EA8618" source="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_9BF032E2_6893_45df_95FE_A08E92EA8618">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_95FE_A08E92EA8618" text="+epo-sub:providesOrganisationFinancialCapability" modelElement="EAID_dstF032E2_6893_45df_95FE_A08E92EA8618">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_95FE_A08E92EA8618" x="1816" y="698" width="160" height="27"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_95FE_A08E92EA8618" text="0..1" modelElement="EAID_dstF032E2_6893_45df_95FE_A08E92EA8618">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_95FE_A08E92EA8618" x="1963" y="738" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_95FE_A08E92EA8618" x="1808" y="679"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_95FE_A08E92EA8618" x="1808" y="733"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_95FE_A08E92EA8618" x="1982" y="733"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_8340_AC2FC83206DA" source="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_87C6E00F_DAEB_4e79_8340_AC2FC83206DA">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_8340_AC2FC83206DA" text="+epo-sub:providesOrganisationEmployeeQuantity" modelElement="EAID_dstC6E00F_DAEB_4e79_8340_AC2FC83206DA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_8340_AC2FC83206DA" x="1878" y="615" width="161" height="27"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_8340_AC2FC83206DA" text="0..1" modelElement="EAID_dstC6E00F_DAEB_4e79_8340_AC2FC83206DA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_8340_AC2FC83206DA" x="2025" y="658" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_8340_AC2FC83206DA" x="1871" y="653"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_8340_AC2FC83206DA" x="2044" y="653"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_8047_2DAC846D9C03" source="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_B6D90197_EC7F_4a01_8047_2DAC846D9C03">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_8047_2DAC846D9C03" text="+epo-sub:concernsOrganisation" modelElement="EAID_dstD90197_EC7F_4a01_8047_2DAC846D9C03">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_8047_2DAC846D9C03" x="1522" y="477" width="127" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_8047_2DAC846D9C03" text="1" modelElement="EAID_dstD90197_EC7F_4a01_8047_2DAC846D9C03">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_8047_2DAC846D9C03" x="1598" y="455" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_8047_2DAC846D9C03" x="1586" y="627"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_8047_2DAC846D9C03" x="1586" y="450"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_A6A4_14096262384A" source="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" target="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" modelElement="EAID_4E94CD77_EB61_4a9e_A6A4_14096262384A">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_A6A4_14096262384A" x="384" y="575"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_A6A4_14096262384A" x="305" y="575"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_96C4_9709B72BA620" source="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" target="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" modelElement="EAID_E69DD4EA_847D_4a36_96C4_9709B72BA620">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_96C4_9709B72BA620" text="+epo:concernsProcedure" modelElement="EAID_dst9DD4EA_847D_4a36_96C4_9709B72BA620">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_96C4_9709B72BA620" x="529" y="552" width="99" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_96C4_9709B72BA620" text="1" modelElement="EAID_dst9DD4EA_847D_4a36_96C4_9709B72BA620">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_96C4_9709B72BA620" x="627" y="580" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_96C4_9709B72BA620" x="508" y="575"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_96C4_9709B72BA620" x="635" y="575"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_9E28_8D741E0840F3" source="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_18CF5F1B_45DD_4b29_9E28_8D741E0840F3">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_9E28_8D741E0840F3" text="+epo:specifiesProcurementCriterion" modelElement="EAID_dstCF5F1B_45DD_4b29_9E28_8D741E0840F3">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_9E28_8D741E0840F3" x="374" y="635" width="142" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_9E28_8D741E0840F3" text="1..*" modelElement="EAID_dstCF5F1B_45DD_4b29_9E28_8D741E0840F3">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_9E28_8D741E0840F3" x="454" y="676" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_9E28_8D741E0840F3" x="446" y="610"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_9E28_8D741E0840F3" x="446" y="694"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_BFE6_593632EDB11F" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_20732599_332F_4f0e_BFE6_593632EDB11F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_BFE6_593632EDB11F" text="+epo:setsGroupingContextForLot" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_BFE6_593632EDB11F" x="720" y="786" width="131" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_BFE6_593632EDB11F" text="1..*" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_BFE6_593632EDB11F" x="786" y="769" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_BFE6_593632EDB11F" x="775" y="812"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_BFE6_593632EDB11F" x="774" y="764"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_B906_6DB183F74D9F" source="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_0AA8BD10_946A_403c_B906_6DB183F74D9F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_B906_6DB183F74D9F" text="+epo:hasMember" modelElement="EAID_dstA8BD10_946A_403c_B906_6DB183F74D9F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_B906_6DB183F74D9F" x="1750" y="471" width="73" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_B906_6DB183F74D9F" text="1..*" modelElement="EAID_dstA8BD10_946A_403c_B906_6DB183F74D9F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_B906_6DB183F74D9F" x="1787" y="455" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_B906_6DB183F74D9F" x="1775" y="503"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_B906_6DB183F74D9F" x="1775" y="450"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_AE66_986280A7B2F6" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_AE66_986280A7B2F6" text="+epo:hasLegalIdentifier" modelElement="EAID_dst57F338_A3A5_457d_AE66_986280A7B2F6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_AE66_986280A7B2F6" x="1502" y="771" width="95" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_AE66_986280A7B2F6" text="0..*" modelElement="EAID_dst57F338_A3A5_457d_AE66_986280A7B2F6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_AE66_986280A7B2F6" x="1580" y="794" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_AE66_986280A7B2F6" x="1576" y="417"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_AE66_986280A7B2F6" x="1497" y="417"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_AE66_986280A7B2F6" x="1497" y="789"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_0561_419e_AE66_986280A7B2F6" x="1599" y="789"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_A7F5_548146C45BC4" source="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_A7F5_548146C45BC4" text="+epo:specifiesProcurementCriterion" modelElement="EAID_dst1AA305_6E1E_4123_A7F5_548146C45BC4">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_A7F5_548146C45BC4" x="565" y="713" width="142" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_A7F5_548146C45BC4" text="0..*" modelElement="EAID_dst1AA305_6E1E_4123_A7F5_548146C45BC4">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_A7F5_548146C45BC4" x="565" y="736" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_A7F5_548146C45BC4" x="724" y="731"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_A7F5_548146C45BC4" x="562" y="731"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_B8FF_34E21440DAD9" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_B8FF_34E21440DAD9" text="+epo:refersToPrevious 0..*" modelElement="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_B8FF_34E21440DAD9" x="183" y="281" width="109" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_B8FF_34E21440DAD9" text="0..*" modelElement="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_B8FF_34E21440DAD9" x="225" y="311" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_B8FF_34E21440DAD9" x="260" y="316"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_B8FF_34E21440DAD9" x="260" y="316"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_B8FF_34E21440DAD9" x="260" y="295"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_0561_419e_B8FF_34E21440DAD9" x="217" y="295"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_0561_419e_B8FF_34E21440DAD9" x="217" y="316"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_0561_419e_B8FF_34E21440DAD9" x="217" y="316"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_947D_E6C47AAC7527" source="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" target="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" modelElement="EAID_4657FAEB_1A34_4ef7_947D_E6C47AAC7527">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_947D_E6C47AAC7527" x="1234" y="253"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_947D_E6C47AAC7527" x="1319" y="253"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_8CA6_9C68826B377B" source="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C" target="EAID_70B4792E_F818_45db_80A4_32F092496FEF" modelElement="EAID_84F5E9DD_96DE_4ca7_8CA6_9C68826B377B">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_8CA6_9C68826B377B" x="913" y="485"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_8CA6_9C68826B377B" x="905" y="419"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_BD17_379180274988" source="EAID_33E9269C_0B96_4b38_A129_C30771A9833F" target="EAID_29678A10_6473_461a_BE84_76269B5BBD68" modelElement="EAID_A4228FCF_2B3C_44e6_BD17_379180274988">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_BD17_379180274988" text="+locn:address" modelElement="EAID_dst228FCF_2B3C_44e6_BD17_379180274988">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_BD17_379180274988" x="2003" y="282" width="56" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_BD17_379180274988" text="0..1" modelElement="EAID_dst228FCF_2B3C_44e6_BD17_379180274988">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_BD17_379180274988" x="2038" y="299" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_BD17_379180274988" x="1820" y="119"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_BD17_379180274988" x="2030" y="119"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_BD17_379180274988" x="2030" y="317"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_8C52_BAE14F5149F6" source="EAID_29678A10_6473_461a_BE84_76269B5BBD68" target="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" modelElement="EAID_D0F25E0B_E148_41e7_8C52_BAE14F5149F6">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_8C52_BAE14F5149F6" x="2085" y="470"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_8C52_BAE14F5149F6" x="2085" y="508"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_B227_85988E5F2016" source="EAID_29678A10_6473_461a_BE84_76269B5BBD68" target="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40" modelElement="EAID_626183B8_93AC_4300_B227_85988E5F2016">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_B227_85988E5F2016" x="1980" y="470"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_B227_85988E5F2016" x="1980" y="508"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_878A_8035A42A43F9" source="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_9B2D6DCC_5092_48cf_878A_8035A42A43F9">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_878A_8035A42A43F9" text="+epo:involvesBuyer" modelElement="EAID_dst2D6DCC_5092_48cf_878A_8035A42A43F9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_878A_8035A42A43F9" x="997" y="401" width="80" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_878A_8035A42A43F9" text="0..*" modelElement="EAID_dst2D6DCC_5092_48cf_878A_8035A42A43F9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_878A_8035A42A43F9" x="1060" y="424" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_878A_8035A42A43F9" x="804" y="520"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_878A_8035A42A43F9" x="804" y="419"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_878A_8035A42A43F9" x="1079" y="419"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_8164_044CE03A05CB" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_8164_044CE03A05CB" text="+epo:hasTaxIdentifier" modelElement="EAID_dstABB55C_F52F_4373_8164_044CE03A05CB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_8164_044CE03A05CB" x="1509" y="815" width="88" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_8164_044CE03A05CB" text="0..*" modelElement="EAID_dstABB55C_F52F_4373_8164_044CE03A05CB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_8164_044CE03A05CB" x="1580" y="838" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_8164_044CE03A05CB" x="1576" y="396"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_8164_044CE03A05CB" x="1479" y="396"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_8164_044CE03A05CB" x="1479" y="833"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_0561_419e_8164_044CE03A05CB" x="1599" y="833"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_95A0_E058E0BD5450" source="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_29996CD1_F979_44e0_95A0_E058E0BD5450">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_95A0_E058E0BD5450" x="231" y="540"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_95A0_E058E0BD5450" x="231" y="456"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_B370_202D9A0110E0" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_2FF93267_E672_481d_B370_202D9A0110E0">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_B370_202D9A0110E0" text="+org:subOrganizationOf 0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_B370_202D9A0110E0" x="1808" y="298" width="115" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_B370_202D9A0110E0" text="0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_B370_202D9A0110E0" x="1831" y="331" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_B370_202D9A0110E0" x="1829" y="347"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_B370_202D9A0110E0" x="1829" y="347"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_B370_202D9A0110E0" x="1872" y="347"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_0561_419e_B370_202D9A0110E0" x="1872" y="316"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_0561_419e_B370_202D9A0110E0" x="1823" y="316"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_0561_419e_B370_202D9A0110E0" x="1823" y="336"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_0561_419e_B370_202D9A0110E0" x="1823" y="336"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_82ED_0BAA7D433501" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_29678A10_6473_461a_BE84_76269B5BBD68" modelElement="EAID_9F23612C_1865_4c8b_82ED_0BAA7D433501">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_82ED_0BAA7D433501" text="+locn:address" modelElement="EAID_dst23612C_1865_4c8b_82ED_0BAA7D433501">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_82ED_0BAA7D433501" x="1864" y="361" width="56" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_82ED_0BAA7D433501" text="0..*" modelElement="EAID_dst23612C_1865_4c8b_82ED_0BAA7D433501">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_82ED_0BAA7D433501" x="1913" y="386" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_82ED_0BAA7D433501" x="1829" y="381"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_82ED_0BAA7D433501" x="1932" y="381"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_A3E1_A997E86942D2" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" modelElement="EAID_19AD8C15_4D9D_48f2_A3E1_A997E86942D2">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_A3E1_A997E86942D2" x="1702" y="336"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_A3E1_A997E86942D2" x="1702" y="288"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_AD39_5BA2A66950B9" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_29678A10_6473_461a_BE84_76269B5BBD68" modelElement="EAID_6A50E4FC_E8DA_47c5_AD39_5BA2A66950B9">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_AD39_5BA2A66950B9" text="+cv:registeredAddress" modelElement="EAID_dst50E4FC_E8DA_47c5_AD39_5BA2A66950B9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_AD39_5BA2A66950B9" x="1840" y="403" width="90" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_AD39_5BA2A66950B9" text="0..1" modelElement="EAID_dst50E4FC_E8DA_47c5_AD39_5BA2A66950B9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_AD39_5BA2A66950B9" x="1913" y="426" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_AD39_5BA2A66950B9" x="1829" y="421"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_AD39_5BA2A66950B9" x="1932" y="421"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_82F3_D4CC50B411F4" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_33E9269C_0B96_4b38_A129_C30771A9833F" modelElement="EAID_C2D44282_10C8_422c_82F3_D4CC50B411F4">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_82F3_D4CC50B411F4" text="+epo:hasPrimaryContactPoint" modelElement="EAID_dstD44282_10C8_422c_82F3_D4CC50B411F4">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_82F3_D4CC50B411F4" x="1733" y="202" width="119" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_82F3_D4CC50B411F4" text="0..1" modelElement="EAID_dstD44282_10C8_422c_82F3_D4CC50B411F4">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_82F3_D4CC50B411F4" x="1809" y="185" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_82F3_D4CC50B411F4" x="1797" y="336"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_82F3_D4CC50B411F4" x="1797" y="180"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_BCE2_05E832F758D6" source="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" target="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" modelElement="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_BCE2_05E832F758D6" text="+epo:playedBy" modelElement="EAID_dst9200E2_D732_4a5e_BCE2_05E832F758D6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_BCE2_05E832F758D6" x="1558" y="235" width="61" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_BCE2_05E832F758D6" text="1" modelElement="EAID_dst9200E2_D732_4a5e_BCE2_05E832F758D6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_BCE2_05E832F758D6" x="1613" y="258" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_BCE2_05E832F758D6" x="1490" y="253"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_BCE2_05E832F758D6" x="1621" y="253"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_B7C9_925B517BC914" source="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" target="EAID_33E9269C_0B96_4b38_A129_C30771A9833F" modelElement="EAID_4B6E629B_BECA_4e04_B7C9_925B517BC914">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_B7C9_925B517BC914" text="+epo:hasContactPointInRole" modelElement="EAID_dst6E629B_BECA_4e04_B7C9_925B517BC914">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_B7C9_925B517BC914" x="1506" y="103" width="113" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_B7C9_925B517BC914" text="0..*" modelElement="EAID_dst6E629B_BECA_4e04_B7C9_925B517BC914">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_B7C9_925B517BC914" x="1602" y="126" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_B7C9_925B517BC914" x="1406" y="218"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_B7C9_925B517BC914" x="1406" y="121"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_B7C9_925B517BC914" x="1621" y="121"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_A266_DDF9F55EABCE" source="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" target="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" modelElement="EAID_93385F64_990A_44d0_A266_DDF9F55EABCE">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_A266_DDF9F55EABCE" x="1404" y="407"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_A266_DDF9F55EABCE" x="1404" y="288"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_9195_C96F98BD3349" source="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_9195_C96F98BD3349" text="+epo:hasProcurementScopeDividedIntoLot" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_9195_C96F98BD3349" x="687" y="645" width="171" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_9195_C96F98BD3349" text="1..*" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_9195_C96F98BD3349" x="781" y="676" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_9195_C96F98BD3349" x="773" y="631"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_9195_C96F98BD3349" x="773" y="694"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_ABED_4C9AC22FFF2A" source="EAID_29678A10_6473_461a_BE84_76269B5BBD68" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_C6F7D14A_11BF_430e_ABED_4C9AC22FFF2A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_ABED_4C9AC22FFF2A" text="+locn:addressID" modelElement="EAID_dstF7D14A_11BF_430e_ABED_4C9AC22FFF2A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_ABED_4C9AC22FFF2A" x="1809" y="802" width="65" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_ABED_4C9AC22FFF2A" text="0..1" modelElement="EAID_dstF7D14A_11BF_430e_ABED_4C9AC22FFF2A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_ABED_4C9AC22FFF2A" x="1809" y="825" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_ABED_4C9AC22FFF2A" x="2134" y="460"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_ABED_4C9AC22FFF2A" x="2253" y="460"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_ABED_4C9AC22FFF2A" x="2253" y="820"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_0561_419e_ABED_4C9AC22FFF2A" x="1806" y="820"/>
+			</ownedElement>
+		</umldi:Diagram>
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_D71DB35F_3004_48e5_8866_708D88C3BB20" isFrame="false" modelElement="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9">
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D71DB35F_3004_48e5_8C41_DD186A53D6A9" modelElement="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3004_48e5_8C41_DD186A53D6A9" text="cccev:Evidence"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3004_48e5_8C41_DD186A53D6A9" x="890" y="545" width="171" height="72"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D71DB35F_3004_48e5_898A_2D46C424EB1B" modelElement="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3004_48e5_898A_2D46C424EB1B" text="cccev:SupportedValue"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3004_48e5_898A_2D46C424EB1B" x="895" y="729" width="160" height="46"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D71DB35F_3004_48e5_8952_6A9F572F43B2" modelElement="EAID_86057FC2_7717_4160_8952_6A9F572F43B2">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3004_48e5_8952_6A9F572F43B2" text="cccev:InformationConcept"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3004_48e5_8952_6A9F572F43B2" x="1181" y="546" width="174" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D71DB35F_3004_48e5_8EF1_F83CAA04DDEC" modelElement="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3004_48e5_8EF1_F83CAA04DDEC" text="epo-sub:Response"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3004_48e5_8EF1_F83CAA04DDEC" x="643" y="546" width="90" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D71DB35F_3004_48e5_832B_477790550BBC" modelElement="EAID_30DD6891_71FE_4f87_832B_477790550BBC">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3004_48e5_832B_477790550BBC" text="cccev:InformationRequirement"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3004_48e5_832B_477790550BBC" x="616" y="288" width="144" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D71DB35F_3004_48e5_B3F6_8FC4EB9806DC" modelElement="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3004_48e5_B3F6_8FC4EB9806DC" text="cccev:Requirement"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3004_48e5_B3F6_8FC4EB9806DC" x="890" y="282" width="171" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D71DB35F_3004_48e5_B117_6B8C8C53C370" modelElement="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3004_48e5_B117_6B8C8C53C370" text="epo-sub:ESPD"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3004_48e5_B117_6B8C8C53C370" x="409" y="546" width="116" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D71DB35F_3004_48e5_AAF4_E0FAB88D85EE" modelElement="EAID_B7F675EC_18B3_49b1_AAF4_E0FAB88D85EE">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_3004_48e5_AAF4_E0FAB88D85EE" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3004_48e5_AAF4_E0FAB88D85EE" text="at-voc:access-rights"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3004_48e5_AAF4_E0FAB88D85EE" x="733" y="653" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D71DB35F_3004_48e5_847A_7E8C5EEC0432" modelElement="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3004_48e5_847A_7E8C5EEC0432" text="epo:Period"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3004_48e5_847A_7E8C5EEC0432" x="727" y="426" width="181" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D71DB35F_3004_48e5_A9E4_B33CA4DA4C39" modelElement="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3004_48e5_A9E4_B33CA4DA4C39" text="epo:Certificate"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3004_48e5_A9E4_B33CA4DA4C39" x="1020" y="426" width="224" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D71DB35F_3004_48e5_81DD_DA4802D8A322" modelElement="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3004_48e5_81DD_DA4802D8A322" text="org:Organization"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3004_48e5_81DD_DA4802D8A322" x="339" y="670" width="253" height="111"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D71DB35F_3004_48e5_BE9C_C9CD1456AEBB" modelElement="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3004_48e5_BE9C_C9CD1456AEBB" text="epo-acc:ESPDRequest"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3004_48e5_BE9C_C9CD1456AEBB" x="408" y="410" width="116" height="52"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D71DB35F_3004_48e5_80B0_0C345D6703F4" modelElement="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3004_48e5_80B0_0C345D6703F4" text="epo:Procedure"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3004_48e5_80B0_0C345D6703F4" x="30" y="205" width="278" height="111"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D71DB35F_3004_48e5_B8A4_6F969F59938C" modelElement="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3004_48e5_B8A4_6F969F59938C" text="epo:Notice"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3004_48e5_B8A4_6F969F59938C" x="47" y="367" width="245" height="137"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D71DB35F_3004_48e5_83AA_6740E666BCB4" modelElement="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3004_48e5_83AA_6740E666BCB4" text="epo:ProcurementCriterion"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3004_48e5_83AA_6740E666BCB4" x="351" y="160" width="232" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D71DB35F_3004_48e5_95E8_EBFA7B9EEE7D" modelElement="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3004_48e5_95E8_EBFA7B9EEE7D" text="cccev:Criterion"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3004_48e5_95E8_EBFA7B9EEE7D" x="838" y="160" width="275" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_8C22_10175EEF3A31" source="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B" target="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" modelElement="EAID_CFC6423E_1A9A_47fb_8C22_10175EEF3A31">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_8C22_10175EEF3A31" text="+cccev:providesValueFor" modelElement="EAID_dstC6423E_1A9A_47fb_8C22_10175EEF3A31">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_8C22_10175EEF3A31" x="1219" y="643" width="101" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_8C22_10175EEF3A31" text="0..*" modelElement="EAID_dstC6423E_1A9A_47fb_8C22_10175EEF3A31">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_8C22_10175EEF3A31" x="1286" y="621" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_8C22_10175EEF3A31" x="1055" y="748"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_8C22_10175EEF3A31" x="1274" y="748"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_8C22_10175EEF3A31" x="1274" y="616"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_9E28_8D741E0840F3" source="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_18CF5F1B_45DD_4b29_9E28_8D741E0840F3">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_9E28_8D741E0840F3" text="+epo:specifiesProcurementCriterion" modelElement="EAID_dstCF5F1B_45DD_4b29_9E28_8D741E0840F3">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_9E28_8D741E0840F3" x="397" y="257" width="142" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_9E28_8D741E0840F3" text="1..*" modelElement="EAID_dstCF5F1B_45DD_4b29_9E28_8D741E0840F3">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_9E28_8D741E0840F3" x="478" y="235" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_9E28_8D741E0840F3" x="466" y="410"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_9E28_8D741E0840F3" x="466" y="230"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_963A_7FE0F57DA5D8" source="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_D3DD6F7E_CC4D_4861_963A_7FE0F57DA5D8">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_963A_7FE0F57DA5D8" text="+epo-acc:refersToNotice" modelElement="EAID_dstDD6F7E_CC4D_4861_963A_7FE0F57DA5D8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_963A_7FE0F57DA5D8" x="295" y="417" width="98" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_963A_7FE0F57DA5D8" text="0..*" modelElement="EAID_dstDD6F7E_CC4D_4861_963A_7FE0F57DA5D8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_963A_7FE0F57DA5D8" x="295" y="440" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_963A_7FE0F57DA5D8" x="408" y="435"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_963A_7FE0F57DA5D8" x="292" y="435"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_96C4_9709B72BA620" source="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" target="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" modelElement="EAID_E69DD4EA_847D_4a36_96C4_9709B72BA620">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_96C4_9709B72BA620" text="+epo:concernsProcedure" modelElement="EAID_dst9DD4EA_847D_4a36_96C4_9709B72BA620">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_96C4_9709B72BA620" x="315" y="270" width="99" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_96C4_9709B72BA620" text="1" modelElement="EAID_dst9DD4EA_847D_4a36_96C4_9709B72BA620">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_96C4_9709B72BA620" x="311" y="295" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_96C4_9709B72BA620" x="431" y="410"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_96C4_9709B72BA620" x="431" y="290"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_96C4_9709B72BA620" x="308" y="290"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_BE52_91F3F7270840" source="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_7EE70932_F57C_4861_BE52_91F3F7270840">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_BE52_91F3F7270840" text="+epo:refersToNotice 0..1" modelElement="EAID_dstE70932_F57C_4861_BE52_91F3F7270840">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_BE52_91F3F7270840" x="81" y="529" width="100" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_BE52_91F3F7270840" text="0..1" modelElement="EAID_dstE70932_F57C_4861_BE52_91F3F7270840">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_BE52_91F3F7270840" x="157" y="509" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_BE52_91F3F7270840" x="114" y="504"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_BE52_91F3F7270840" x="114" y="504"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_BE52_91F3F7270840" x="114" y="525"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_3004_48e5_BE52_91F3F7270840" x="145" y="525"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_3004_48e5_BE52_91F3F7270840" x="145" y="504"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_3004_48e5_BE52_91F3F7270840" x="145" y="504"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_A411_E8DA312BC449" source="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" target="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" modelElement="EAID_F955E894_651A_4a8b_A411_E8DA312BC449">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_A411_E8DA312BC449" text="+epo:refersToProcedure" modelElement="EAID_dst55E894_651A_4a8b_A411_E8DA312BC449">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_A411_E8DA312BC449" x="115" y="335" width="97" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_A411_E8DA312BC449" text="1" modelElement="EAID_dst55E894_651A_4a8b_A411_E8DA312BC449">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_A411_E8DA312BC449" x="176" y="321" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_A411_E8DA312BC449" x="164" y="367"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_A411_E8DA312BC449" x="164" y="316"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_B735_322F9131A442" source="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" target="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D" modelElement="EAID_ACA750D2_84FF_4e07_B735_322F9131A442">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_B735_322F9131A442" x="583" y="195"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_B735_322F9131A442" x="838" y="195"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_BF53_F99082792332" source="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D" target="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" modelElement="EAID_C289FCF6_9241_4f06_BF53_F99082792332">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_BF53_F99082792332" x="975" y="230"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_BF53_F99082792332" x="975" y="282"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_9B78_BA9B3F1E9FF6" source="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" target="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" modelElement="EAID_6D204966_4BC2_452d_9B78_BA9B3F1E9FF6">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_9B78_BA9B3F1E9FF6" text="+cccev:supportsRequirement" modelElement="EAID_dst204966_4BC2_452d_9B78_BA9B3F1E9FF6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_9B78_BA9B3F1E9FF6" x="911" y="401" width="116" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_9B78_BA9B3F1E9FF6" text="0..*" modelElement="EAID_dst204966_4BC2_452d_9B78_BA9B3F1E9FF6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_9B78_BA9B3F1E9FF6" x="987" y="357" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_9B78_BA9B3F1E9FF6" x="975" y="545"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_9B78_BA9B3F1E9FF6" x="975" y="352"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_829F_004DFE769A97" source="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_1864913C_FE85_48db_829F_004DFE769A97">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_829F_004DFE769A97" text="+epo:hasValidityPeriod" modelElement="EAID_dst64913C_FE85_48db_829F_004DFE769A97">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_829F_004DFE769A97" x="823" y="531" width="93" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_829F_004DFE769A97" text="0..1" modelElement="EAID_dst64913C_FE85_48db_829F_004DFE769A97">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_829F_004DFE769A97" x="870" y="501" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_829F_004DFE769A97" x="890" y="553"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_829F_004DFE769A97" x="858" y="553"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_829F_004DFE769A97" x="858" y="496"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_919A_46302D44059E" source="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" target="EAID_B7F675EC_18B3_49b1_AAF4_E0FAB88D85EE" modelElement="EAID_A7C105EE_0251_4249_919A_46302D44059E">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_919A_46302D44059E" x="906" y="617"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_919A_46302D44059E" x="906" y="667"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_919A_46302D44059E" x="823" y="667"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_B370_202D9A0110E0" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_2FF93267_E672_481d_B370_202D9A0110E0">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_B370_202D9A0110E0" text="+org:subOrganizationOf 0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_B370_202D9A0110E0" x="565" y="650" width="115" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_B370_202D9A0110E0" text="0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_B370_202D9A0110E0" x="564" y="665" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_B370_202D9A0110E0" x="592" y="683"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_B370_202D9A0110E0" x="592" y="683"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_B370_202D9A0110E0" x="621" y="683"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_3004_48e5_B370_202D9A0110E0" x="621" y="643"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_3004_48e5_B370_202D9A0110E0" x="556" y="643"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_3004_48e5_B370_202D9A0110E0" x="556" y="670"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_3004_48e5_B370_202D9A0110E0" x="556" y="670"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_9596_5EC3247529A2" source="EAID_30DD6891_71FE_4f87_832B_477790550BBC" target="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" modelElement="EAID_6492D4E3_9631_45d4_9596_5EC3247529A2">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_9596_5EC3247529A2" x="760" y="317"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_9596_5EC3247529A2" x="890" y="317"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_BCCF_3E7847170DBD" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" modelElement="EAID_ACF95470_AB2B_4b7d_BCCF_3E7847170DBD">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_BCCF_3E7847170DBD" text="+epo-sub:specifiesResponse" modelElement="EAID_dstF95470_AB2B_4b7d_BCCF_3E7847170DBD">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_BCCF_3E7847170DBD" x="528" y="563" width="113" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_BCCF_3E7847170DBD" text="1..*" modelElement="EAID_dstF95470_AB2B_4b7d_BCCF_3E7847170DBD">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_BCCF_3E7847170DBD" x="624" y="586" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_BCCF_3E7847170DBD" x="525" y="581"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_BCCF_3E7847170DBD" x="643" y="581"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_A69F_C36E3ABE8273" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" modelElement="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_A69F_C36E3ABE8273" text="+epo-sub:refersToOtherESPDResponse 0..*" modelElement="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_A69F_C36E3ABE8273" x="302" y="523" width="158" height="27"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_A69F_C36E3ABE8273" text="0..*" modelElement="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_A69F_C36E3ABE8273" x="406" y="563" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_A69F_C36E3ABE8273" x="427" y="546"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_A69F_C36E3ABE8273" x="427" y="546"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_A69F_C36E3ABE8273" x="427" y="511"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_3004_48e5_A69F_C36E3ABE8273" x="377" y="511"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_3004_48e5_A69F_C36E3ABE8273" x="377" y="558"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_3004_48e5_A69F_C36E3ABE8273" x="409" y="558"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_3004_48e5_A69F_C36E3ABE8273" x="409" y="558"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_A0FF_14B7A0FB6A6B" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" modelElement="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_A0FF_14B7A0FB6A6B" text="+epo-sub:relatesToESPDRequest" modelElement="EAID_dstBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_A0FF_14B7A0FB6A6B" x="398" y="483" width="131" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_A0FF_14B7A0FB6A6B" text="1" modelElement="EAID_dstBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_A0FF_14B7A0FB6A6B" x="479" y="467" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_A0FF_14B7A0FB6A6B" x="467" y="546"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_A0FF_14B7A0FB6A6B" x="467" y="462"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_850D_83D60BFADA1F" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_850D_83D60BFADA1F" text="+epo-sub:providesInformationOn" modelElement="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_850D_83D60BFADA1F" x="409" y="629" width="134" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_850D_83D60BFADA1F" text="0..*" modelElement="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_850D_83D60BFADA1F" x="478" y="652" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_850D_83D60BFADA1F" x="470" y="616"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_850D_83D60BFADA1F" x="470" y="670"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_BFBB_56453EA7473F" source="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" target="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" modelElement="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_BFBB_56453EA7473F" text="+cccev:hasRequirement 0..*" modelElement="EAID_dst59B897_AEE0_4ae9_BFBB_56453EA7473F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_BFBB_56453EA7473F" x="794" y="357" width="114" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_BFBB_56453EA7473F" text="0..*" modelElement="EAID_dst59B897_AEE0_4ae9_BFBB_56453EA7473F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_BFBB_56453EA7473F" x="927" y="357" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_BFBB_56453EA7473F" x="890" y="339"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_BFBB_56453EA7473F" x="890" y="339"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_BFBB_56453EA7473F" x="867" y="339"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_3004_48e5_BFBB_56453EA7473F" x="867" y="391"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_3004_48e5_BFBB_56453EA7473F" x="915" y="391"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_3004_48e5_BFBB_56453EA7473F" x="915" y="352"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_3004_48e5_BFBB_56453EA7473F" x="915" y="352"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_AA04_83E4BB664FCB" source="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" target="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" modelElement="EAID_8990AB87_7AAE_4276_AA04_83E4BB664FCB">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_AA04_83E4BB664FCB" text="+cccev:supportsConcept" modelElement="EAID_dst90AB87_7AAE_4276_AA04_83E4BB664FCB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_AA04_83E4BB664FCB" x="1082" y="562" width="97" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_AA04_83E4BB664FCB" text="0..*" modelElement="EAID_dst90AB87_7AAE_4276_AA04_83E4BB664FCB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_AA04_83E4BB664FCB" x="1162" y="585" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_AA04_83E4BB664FCB" x="1061" y="580"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_AA04_83E4BB664FCB" x="1181" y="580"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_B341_A616866CD789" source="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" target="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B" modelElement="EAID_CE6EADDE_0D7D_40a5_B341_A616866CD789">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_B341_A616866CD789" text="+cccev:supportsValue" modelElement="EAID_dst6EADDE_0D7D_40a5_B341_A616866CD789">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_B341_A616866CD789" x="927" y="686" width="88" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_B341_A616866CD789" text="0..*" modelElement="EAID_dst6EADDE_0D7D_40a5_B341_A616866CD789">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_B341_A616866CD789" x="983" y="711" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_B341_A616866CD789" x="975" y="617"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_B341_A616866CD789" x="975" y="729"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_8B7E_A25D4A6C9048" source="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_B2FBB3C3_8542_4cd9_8B7E_A25D4A6C9048">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_8B7E_A25D4A6C9048" text="+epo-sub:refersToApplicablePeriod" modelElement="EAID_dstFBB3C3_8542_4cd9_8B7E_A25D4A6C9048">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_8B7E_A25D4A6C9048" x="695" y="518" width="140" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_8B7E_A25D4A6C9048" text="0..1" modelElement="EAID_dstFBB3C3_8542_4cd9_8B7E_A25D4A6C9048">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_8B7E_A25D4A6C9048" x="782" y="501" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_8B7E_A25D4A6C9048" x="733" y="554"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_8B7E_A25D4A6C9048" x="770" y="554"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_8B7E_A25D4A6C9048" x="770" y="496"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_83C6_69057788A49B" source="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" target="EAID_B7F675EC_18B3_49b1_AAF4_E0FAB88D85EE" modelElement="EAID_49631FAC_5F3D_4939_83C6_69057788A49B">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_83C6_69057788A49B" x="733" y="602"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_83C6_69057788A49B" x="774" y="602"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_83C6_69057788A49B" x="774" y="653"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_B49E_48C56317F5F9" source="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" target="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B" modelElement="EAID_3EE371EF_8DF9_4747_B49E_48C56317F5F9">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_B49E_48C56317F5F9" text="+cccev:supportsValue" modelElement="EAID_dstE371EF_8DF9_4747_B49E_48C56317F5F9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_B49E_48C56317F5F9" x="805" y="732" width="88" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_B49E_48C56317F5F9" text="0..*" modelElement="EAID_dstE371EF_8DF9_4747_B49E_48C56317F5F9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_B49E_48C56317F5F9" x="876" y="755" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_B49E_48C56317F5F9" x="687" y="616"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_B49E_48C56317F5F9" x="687" y="750"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_B49E_48C56317F5F9" x="895" y="750"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_A6F8_522396CE72CF" source="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" target="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" modelElement="EAID_93B47F0D_8871_4230_A6F8_522396CE72CF">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_A6F8_522396CE72CF" text="+epo-sub:isReinforcedBy" modelElement="EAID_dstB47F0D_8871_4230_A6F8_522396CE72CF">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_A6F8_522396CE72CF" x="789" y="561" width="99" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_A6F8_522396CE72CF" text="0..*" modelElement="EAID_dstB47F0D_8871_4230_A6F8_522396CE72CF">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_A6F8_522396CE72CF" x="871" y="586" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_A6F8_522396CE72CF" x="733" y="581"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_A6F8_522396CE72CF" x="890" y="581"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_857E_2AD843DEF3DE" source="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" target="EAID_30DD6891_71FE_4f87_832B_477790550BBC" modelElement="EAID_5715AB6B_F88D_4b3e_857E_2AD843DEF3DE">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_857E_2AD843DEF3DE" text="+epo-sub:answersQuestion" modelElement="EAID_dst15AB6B_F88D_4b3e_857E_2AD843DEF3DE">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_857E_2AD843DEF3DE" x="616" y="385" width="110" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_857E_2AD843DEF3DE" text="0..*" modelElement="EAID_dst15AB6B_F88D_4b3e_857E_2AD843DEF3DE">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_857E_2AD843DEF3DE" x="696" y="353" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_857E_2AD843DEF3DE" x="684" y="546"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_857E_2AD843DEF3DE" x="684" y="348"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_AEDA_E49049545B3B" source="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" target="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" modelElement="EAID_04EC0265_2665_47d4_AEDA_E49049545B3B">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_AEDA_E49049545B3B" x="1124" y="496"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_AEDA_E49049545B3B" x="1124" y="552"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_AEDA_E49049545B3B" x="1061" y="552"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_BB1B_A5C475115AB1" source="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" target="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" modelElement="EAID_4CC3B6CA_493A_4ff6_BB1B_A5C475115AB1">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_BB1B_A5C475115AB1" text="+cccev:hasConcept" modelElement="EAID_dstC3B6CA_493A_4ff6_BB1B_A5C475115AB1">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_BB1B_A5C475115AB1" x="1233" y="506" width="77" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_BB1B_A5C475115AB1" text="0..*" modelElement="EAID_dstC3B6CA_493A_4ff6_BB1B_A5C475115AB1">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_BB1B_A5C475115AB1" x="1278" y="528" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_BB1B_A5C475115AB1" x="1061" y="310"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_BB1B_A5C475115AB1" x="1270" y="310"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_BB1B_A5C475115AB1" x="1270" y="546"/>
+			</ownedElement>
+		</umldi:Diagram>
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_ADDA7381_B80A_426d_9FF6_137732CADDEF" isFrame="false" modelElement="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9">
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_ADDA7381_B80A_426d_B117_6B8C8C53C370" modelElement="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B80A_426d_B117_6B8C8C53C370" text="epo-sub:ESPD"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B80A_426d_B117_6B8C8C53C370" x="323" y="368" width="124" height="49"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_ADDA7381_B80A_426d_938E_5B67B449DF4D" modelElement="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B80A_426d_938E_5B67B449DF4D" text="epo-sub:LegalRepresentative"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B80A_426d_938E_5B67B449DF4D" x="1106" y="389" width="145" height="35"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_ADDA7381_B80A_426d_A12E_00C2BE16F4B6" modelElement="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B80A_426d_A12E_00C2BE16F4B6" text="epo:AgentInRole"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B80A_426d_A12E_00C2BE16F4B6" x="1093" y="177" width="171" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_ADDA7381_B80A_426d_B7BD_BF404238BDB5" modelElement="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B80A_426d_B7BD_BF404238BDB5" text="epo:AuxiliaryParty"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B80A_426d_B7BD_BF404238BDB5" x="1134" y="288" width="90" height="33"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_ADDA7381_B80A_426d_9284_B6F7309F5985" modelElement="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B80A_426d_9284_B6F7309F5985" text="epo:OfferingParty"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B80A_426d_9284_B6F7309F5985" x="1434" y="287" width="90" height="34"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_ADDA7381_B80A_426d_B217_37E957B3B448" modelElement="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B80A_426d_B217_37E957B3B448" text="epo:Document"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B80A_426d_B217_37E957B3B448" x="287" y="676" width="195" height="140"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_ADDA7381_B80A_426d_A91D_72310583752E" modelElement="EAID_95FD9F3B_1F77_4e3c_A91D_72310583752E">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B80A_426d_A91D_72310583752E" text="epo-sub:Mandate"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B80A_426d_A91D_72310583752E" x="671" y="676" width="90" height="35"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_ADDA7381_B80A_426d_963D_EAEBF2AA6803" modelElement="EAID_DE869DED_87AA_46a5_963D_EAEBF2AA6803">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B80A_426d_963D_EAEBF2AA6803" text="epo-sub:PowerOfAttorney"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B80A_426d_963D_EAEBF2AA6803" x="645" y="751" width="142" height="35"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_ADDA7381_B80A_426d_B584_D95C2DBBD7A1" modelElement="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B80A_426d_B584_D95C2DBBD7A1" text="foaf:Agent"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B80A_426d_B584_D95C2DBBD7A1" x="635" y="177" width="164" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_ADDA7381_B80A_426d_81DD_DA4802D8A322" modelElement="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B80A_426d_81DD_DA4802D8A322" text="org:Organization"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B80A_426d_81DD_DA4802D8A322" x="590" y="342" width="253" height="101"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_ADDA7381_B80A_426d_BE84_76269B5BBD68" modelElement="EAID_29678A10_6473_461a_BE84_76269B5BBD68">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B80A_426d_BE84_76269B5BBD68" text="locn:Address"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B80A_426d_BE84_76269B5BBD68" x="615" y="491" width="202" height="153"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_ADDA7381_B80A_426d_A129_C30771A9833F" modelElement="EAID_33E9269C_0B96_4b38_A129_C30771A9833F">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B80A_426d_A129_C30771A9833F" text="cpov:ContactPoint"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B80A_426d_A129_C30771A9833F" x="908" y="509" width="199" height="114"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_ADDA7381_B80A_426d_8FE5_C4EE73295C40" modelElement="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_B80A_426d_8FE5_C4EE73295C40" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B80A_426d_8FE5_C4EE73295C40" text="at-voc:nuts"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B80A_426d_8FE5_C4EE73295C40" x="420" y="584" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_ADDA7381_B80A_426d_ABBB_CBDD98065B7F" modelElement="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_B80A_426d_ABBB_CBDD98065B7F" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B80A_426d_ABBB_CBDD98065B7F" text="at-voc:country"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B80A_426d_ABBB_CBDD98065B7F" x="420" y="491" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_ADDA7381_B80A_426d_9491_D5301EE0DDE7" modelElement="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B80A_426d_9491_D5301EE0DDE7" text="epo:Subcontractor"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B80A_426d_9491_D5301EE0DDE7" x="1489" y="389" width="90" height="35"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_ADDA7381_B80A_426d_B795_B4D7DEE0BA53" modelElement="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B80A_426d_B795_B4D7DEE0BA53" text="epo:Tenderer"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B80A_426d_B795_B4D7DEE0BA53" x="1379" y="389" width="90" height="35"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_ADDA7381_B80A_426d_80A3_BA1B8B406A51" modelElement="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B80A_426d_80A3_BA1B8B406A51" text="epo:OtherEntity"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B80A_426d_80A3_BA1B8B406A51" x="1599" y="389" width="90" height="35"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_ADDA7381_B80A_426d_ADAC_88A2D6017C32" modelElement="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B80A_426d_ADAC_88A2D6017C32" text="epo:Candidate"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B80A_426d_ADAC_88A2D6017C32" x="1269" y="389" width="90" height="35"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_8018_10297955785C" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_39F3583F_0D40_4e9f_8018_10297955785C">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_B80A_426d_8018_10297955785C" text="+epo:associatedWith 0..*" modelElement="EAID_dstF3583F_0D40_4e9f_8018_10297955785C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B80A_426d_8018_10297955785C" x="206" y="662" width="103" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_B80A_426d_8018_10297955785C" text="0..*" modelElement="EAID_dstF3583F_0D40_4e9f_8018_10297955785C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B80A_426d_8018_10297955785C" x="284" y="695" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_8018_10297955785C" x="312" y="676"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_8018_10297955785C" x="312" y="676"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_B80A_426d_8018_10297955785C" x="312" y="656"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_B80A_426d_8018_10297955785C" x="267" y="656"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_B80A_426d_8018_10297955785C" x="267" y="690"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_B80A_426d_8018_10297955785C" x="287" y="690"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_B80A_426d_8018_10297955785C" x="287" y="690"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_A409_64CB2CE61248" source="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_199C3BDF_913A_42e4_A409_64CB2CE61248">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_A409_64CB2CE61248" x="1434" y="389"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_A409_64CB2CE61248" x="1470" y="321"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_AEF4_9EBDE5851B98" source="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_5729A98B_A925_4816_AEF4_9EBDE5851B98">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_AEF4_9EBDE5851B98" x="1637" y="389"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_AEF4_9EBDE5851B98" x="1510" y="321"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_B35F_CBFE4CDAAA84" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_C7D18971_E3AA_4bc3_B35F_CBFE4CDAAA84">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_B35F_CBFE4CDAAA84" x="384" y="417"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_B35F_CBFE4CDAAA84" x="384" y="676"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_850D_83D60BFADA1F" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_B80A_426d_850D_83D60BFADA1F" text="+epo-sub:providesInformationOn" modelElement="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B80A_426d_850D_83D60BFADA1F" x="454" y="376" width="134" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_B80A_426d_850D_83D60BFADA1F" text="0..*" modelElement="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B80A_426d_850D_83D60BFADA1F" x="571" y="399" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_850D_83D60BFADA1F" x="447" y="394"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_850D_83D60BFADA1F" x="590" y="394"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_A69F_C36E3ABE8273" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" modelElement="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_B80A_426d_A69F_C36E3ABE8273" text="+epo-sub:refersToOtherESPDResponse 0..*" modelElement="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B80A_426d_A69F_C36E3ABE8273" x="300" y="321" width="174" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_B80A_426d_A69F_C36E3ABE8273" text="0..*" modelElement="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B80A_426d_A69F_C36E3ABE8273" x="361" y="363" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_A69F_C36E3ABE8273" x="414" y="368"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_A69F_C36E3ABE8273" x="414" y="368"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_B80A_426d_A69F_C36E3ABE8273" x="414" y="340"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_B80A_426d_A69F_C36E3ABE8273" x="353" y="340"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_B80A_426d_A69F_C36E3ABE8273" x="353" y="368"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_B80A_426d_A69F_C36E3ABE8273" x="353" y="368"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_9B8B_96AA208D3134" source="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_7775FD52_1FE1_445c_9B8B_96AA208D3134">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_B80A_426d_9B8B_96AA208D3134" text="+epo:actsOnBehalfOf" modelElement="EAID_dst75FD52_1FE1_445c_9B8B_96AA208D3134">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B80A_426d_9B8B_96AA208D3134" x="1334" y="282" width="87" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_B80A_426d_9B8B_96AA208D3134" text="0..1" modelElement="EAID_dst75FD52_1FE1_445c_9B8B_96AA208D3134">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B80A_426d_9B8B_96AA208D3134" x="1415" y="309" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_9B8B_96AA208D3134" x="1239" y="389"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_9B8B_96AA208D3134" x="1239" y="304"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_B80A_426d_9B8B_96AA208D3134" x="1434" y="304"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_9A92_7176519FD4A5" source="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D" target="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5" modelElement="EAID_1982F8A2_ECBE_47d6_9A92_7176519FD4A5">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_9A92_7176519FD4A5" x="1178" y="389"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_9A92_7176519FD4A5" x="1178" y="321"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_B5AC_F916221BB38E" source="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D" target="EAID_DE869DED_87AA_46a5_963D_EAEBF2AA6803" modelElement="EAID_15E95E36_FC35_4adf_B5AC_F916221BB38E">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_B80A_426d_B5AC_F916221BB38E" text="+epo-sub:hasPowerOfAttorney" modelElement="EAID_dstE95E36_FC35_4adf_B5AC_F916221BB38E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B80A_426d_B5AC_F916221BB38E" x="790" y="746" width="125" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_B80A_426d_B5AC_F916221BB38E" text="0..1" modelElement="EAID_dstE95E36_FC35_4adf_B5AC_F916221BB38E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B80A_426d_B5AC_F916221BB38E" x="790" y="769" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_B5AC_F916221BB38E" x="1219" y="424"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_B5AC_F916221BB38E" x="1219" y="764"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_B80A_426d_B5AC_F916221BB38E" x="787" y="764"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_BCD2_491FA097E6DE" source="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D" target="EAID_95FD9F3B_1F77_4e3c_A91D_72310583752E" modelElement="EAID_C9AE0856_7B74_434f_BCD2_491FA097E6DE">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_B80A_426d_BCD2_491FA097E6DE" text="+epo-sub:hasMandate" modelElement="EAID_dstAE0856_7B74_434f_BCD2_491FA097E6DE">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B80A_426d_BCD2_491FA097E6DE" x="776" y="676" width="92" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_B80A_426d_BCD2_491FA097E6DE" text="0..*" modelElement="EAID_dstAE0856_7B74_434f_BCD2_491FA097E6DE">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B80A_426d_BCD2_491FA097E6DE" x="764" y="698" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_BCD2_491FA097E6DE" x="1145" y="424"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_BCD2_491FA097E6DE" x="1145" y="693"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_B80A_426d_BCD2_491FA097E6DE" x="761" y="693"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_B7C9_925B517BC914" source="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" target="EAID_33E9269C_0B96_4b38_A129_C30771A9833F" modelElement="EAID_4B6E629B_BECA_4e04_B7C9_925B517BC914">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_B80A_426d_B7C9_925B517BC914" text="+epo:hasContactPointInRole" modelElement="EAID_dst6E629B_BECA_4e04_B7C9_925B517BC914">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B80A_426d_B7C9_925B517BC914" x="993" y="463" width="113" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_B80A_426d_B7C9_925B517BC914" text="0..*" modelElement="EAID_dst6E629B_BECA_4e04_B7C9_925B517BC914">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B80A_426d_B7C9_925B517BC914" x="1049" y="491" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_B7C9_925B517BC914" x="1093" y="231"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_B7C9_925B517BC914" x="1041" y="231"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_B80A_426d_B7C9_925B517BC914" x="1041" y="509"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_BCE2_05E832F758D6" source="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" target="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" modelElement="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_B80A_426d_BCE2_05E832F758D6" text="+epo:playedBy" modelElement="EAID_dst9200E2_D732_4a5e_BCE2_05E832F758D6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B80A_426d_BCE2_05E832F758D6" x="802" y="194" width="61" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_B80A_426d_BCE2_05E832F758D6" text="1" modelElement="EAID_dst9200E2_D732_4a5e_BCE2_05E832F758D6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B80A_426d_BCE2_05E832F758D6" x="802" y="217" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_BCE2_05E832F758D6" x="1093" y="212"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_BCE2_05E832F758D6" x="799" y="212"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_AE88_A4F91623D21B" source="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5" target="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" modelElement="EAID_AE2DB18B_3AF3_4133_AE88_A4F91623D21B">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_AE88_A4F91623D21B" x="1178" y="288"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_AE88_A4F91623D21B" x="1178" y="247"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_A43E_D33DC6607852" source="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_A27A53B2_A6D1_4fdd_A43E_D33DC6607852">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_A43E_D33DC6607852" x="1524" y="389"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_A43E_D33DC6607852" x="1488" y="321"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_B8FF_34E21440DAD9" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_B80A_426d_B8FF_34E21440DAD9" text="+epo:refersToPrevious 0..*" modelElement="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B80A_426d_B8FF_34E21440DAD9" x="195" y="821" width="109" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_B80A_426d_B8FF_34E21440DAD9" text="0..*" modelElement="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B80A_426d_B8FF_34E21440DAD9" x="325" y="821" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_B8FF_34E21440DAD9" x="287" y="799"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_B8FF_34E21440DAD9" x="287" y="799"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_B80A_426d_B8FF_34E21440DAD9" x="267" y="799"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_B80A_426d_B8FF_34E21440DAD9" x="267" y="840"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_B80A_426d_B8FF_34E21440DAD9" x="313" y="840"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_B80A_426d_B8FF_34E21440DAD9" x="313" y="816"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_B80A_426d_B8FF_34E21440DAD9" x="313" y="816"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_B47E_F671B4F00F63" source="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_28774B07_2278_44a1_B47E_F671B4F00F63">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_B47E_F671B4F00F63" x="1332" y="389"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_B47E_F671B4F00F63" x="1449" y="321"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_B72E_BC6C99FF3009" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_B80A_426d_B72E_BC6C99FF3009" text="+epo:hasElectronicDigest 0..*" modelElement="EAID_dstE6AD20_DD67_4f31_B72E_BC6C99FF3009">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B80A_426d_B72E_BC6C99FF3009" x="489" y="817" width="119" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_B80A_426d_B72E_BC6C99FF3009" text="0..*" modelElement="EAID_dstE6AD20_DD67_4f31_B72E_BC6C99FF3009">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B80A_426d_B72E_BC6C99FF3009" x="485" y="807" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_B72E_BC6C99FF3009" x="473" y="816"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_B72E_BC6C99FF3009" x="473" y="816"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_B80A_426d_B72E_BC6C99FF3009" x="473" y="838"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_B80A_426d_B72E_BC6C99FF3009" x="506" y="838"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_B80A_426d_B72E_BC6C99FF3009" x="506" y="802"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_B80A_426d_B72E_BC6C99FF3009" x="482" y="802"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_B80A_426d_B72E_BC6C99FF3009" x="482" y="802"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_A52B_56209E049485" source="EAID_95FD9F3B_1F77_4e3c_A91D_72310583752E" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_672E5CCE_F8C9_4117_A52B_56209E049485">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_A52B_56209E049485" x="671" y="697"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_A52B_56209E049485" x="482" y="697"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_8725_C9307E8BA364" source="EAID_DE869DED_87AA_46a5_963D_EAEBF2AA6803" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_4CC20250_2603_476b_8725_C9307E8BA364">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_8725_C9307E8BA364" x="645" y="769"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_8725_C9307E8BA364" x="482" y="769"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_AB43_E5A825C5F2E2" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" modelElement="EAID_1FFF54A3_B491_40f9_AB43_E5A825C5F2E2">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_AB43_E5A825C5F2E2" x="590" y="429"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_AB43_E5A825C5F2E2" x="464" y="429"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_B80A_426d_AB43_E5A825C5F2E2" x="464" y="491"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_82F3_D4CC50B411F4" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_33E9269C_0B96_4b38_A129_C30771A9833F" modelElement="EAID_C2D44282_10C8_422c_82F3_D4CC50B411F4">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_B80A_426d_82F3_D4CC50B411F4" text="+epo:hasPrimaryContactPoint" modelElement="EAID_dstD44282_10C8_422c_82F3_D4CC50B411F4">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B80A_426d_82F3_D4CC50B411F4" x="881" y="445" width="119" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_B80A_426d_82F3_D4CC50B411F4" text="0..1" modelElement="EAID_dstD44282_10C8_422c_82F3_D4CC50B411F4">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B80A_426d_82F3_D4CC50B411F4" x="957" y="491" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_82F3_D4CC50B411F4" x="843" y="390"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_82F3_D4CC50B411F4" x="949" y="390"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_B80A_426d_82F3_D4CC50B411F4" x="949" y="509"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_AD39_5BA2A66950B9" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_29678A10_6473_461a_BE84_76269B5BBD68" modelElement="EAID_6A50E4FC_E8DA_47c5_AD39_5BA2A66950B9">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_B80A_426d_AD39_5BA2A66950B9" text="+cv:registeredAddress" modelElement="EAID_dst50E4FC_E8DA_47c5_AD39_5BA2A66950B9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B80A_426d_AD39_5BA2A66950B9" x="607" y="453" width="90" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_B80A_426d_AD39_5BA2A66950B9" text="0..1" modelElement="EAID_dst50E4FC_E8DA_47c5_AD39_5BA2A66950B9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B80A_426d_AD39_5BA2A66950B9" x="660" y="473" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_AD39_5BA2A66950B9" x="652" y="443"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_AD39_5BA2A66950B9" x="652" y="491"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_A3E1_A997E86942D2" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" modelElement="EAID_19AD8C15_4D9D_48f2_A3E1_A997E86942D2">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_A3E1_A997E86942D2" x="716" y="342"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_A3E1_A997E86942D2" x="716" y="247"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_82ED_0BAA7D433501" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_29678A10_6473_461a_BE84_76269B5BBD68" modelElement="EAID_9F23612C_1865_4c8b_82ED_0BAA7D433501">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_B80A_426d_82ED_0BAA7D433501" text="+locn:address" modelElement="EAID_dst23612C_1865_4c8b_82ED_0BAA7D433501">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B80A_426d_82ED_0BAA7D433501" x="730" y="456" width="56" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_B80A_426d_82ED_0BAA7D433501" text="0..*" modelElement="EAID_dst23612C_1865_4c8b_82ED_0BAA7D433501">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B80A_426d_82ED_0BAA7D433501" x="764" y="473" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_82ED_0BAA7D433501" x="756" y="443"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_82ED_0BAA7D433501" x="756" y="491"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_B370_202D9A0110E0" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_2FF93267_E672_481d_B370_202D9A0110E0">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_B80A_426d_B370_202D9A0110E0" text="+org:subOrganizationOf 0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B80A_426d_B370_202D9A0110E0" x="483" y="329" width="115" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_B80A_426d_B370_202D9A0110E0" text="0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B80A_426d_B370_202D9A0110E0" x="587" y="363" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_B370_202D9A0110E0" x="602" y="342"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_B370_202D9A0110E0" x="602" y="342"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_B80A_426d_B370_202D9A0110E0" x="602" y="320"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_B80A_426d_B370_202D9A0110E0" x="561" y="320"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_B80A_426d_B370_202D9A0110E0" x="561" y="358"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_B80A_426d_B370_202D9A0110E0" x="590" y="358"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_B80A_426d_B370_202D9A0110E0" x="590" y="358"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_B227_85988E5F2016" source="EAID_29678A10_6473_461a_BE84_76269B5BBD68" target="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40" modelElement="EAID_626183B8_93AC_4300_B227_85988E5F2016">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_B227_85988E5F2016" x="615" y="612"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_B227_85988E5F2016" x="510" y="612"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_8C52_BAE14F5149F6" source="EAID_29678A10_6473_461a_BE84_76269B5BBD68" target="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" modelElement="EAID_D0F25E0B_E148_41e7_8C52_BAE14F5149F6">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_8C52_BAE14F5149F6" x="615" y="522"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_8C52_BAE14F5149F6" x="510" y="522"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_BD17_379180274988" source="EAID_33E9269C_0B96_4b38_A129_C30771A9833F" target="EAID_29678A10_6473_461a_BE84_76269B5BBD68" modelElement="EAID_A4228FCF_2B3C_44e6_BD17_379180274988">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_B80A_426d_BD17_379180274988" text="+locn:address" modelElement="EAID_dst228FCF_2B3C_44e6_BD17_379180274988">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B80A_426d_BD17_379180274988" x="820" y="552" width="56" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_B80A_426d_BD17_379180274988" text="0..1" modelElement="EAID_dst228FCF_2B3C_44e6_BD17_379180274988">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B80A_426d_BD17_379180274988" x="820" y="575" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_BD17_379180274988" x="908" y="570"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_BD17_379180274988" x="817" y="570"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_947D_E6C47AAC7527" source="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" target="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" modelElement="EAID_4657FAEB_1A34_4ef7_947D_E6C47AAC7527">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_947D_E6C47AAC7527" x="1482" y="287"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_947D_E6C47AAC7527" x="1482" y="209"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_B80A_426d_947D_E6C47AAC7527" x="1264" y="209"/>
+			</ownedElement>
+		</umldi:Diagram>
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_94074245_1A03_44a0_83B7_7B182F8F5B41" isFrame="false" modelElement="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9">
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_94074245_1A03_44a0_B117_6B8C8C53C370" modelElement="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1A03_44a0_B117_6B8C8C53C370" text="epo-sub:ESPD"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1A03_44a0_B117_6B8C8C53C370" x="13" y="181" width="132" height="59"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_94074245_1A03_44a0_A159_824F0F6571E2" modelElement="EAID_432BFDAD_99CD_40ab_A159_824F0F6571E2">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1A03_44a0_A159_824F0F6571E2" text="epo:ParticipationCondition"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1A03_44a0_A159_824F0F6571E2" x="362" y="189" width="145" height="44"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_94074245_1A03_44a0_83AA_6740E666BCB4" modelElement="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1A03_44a0_83AA_6740E666BCB4" text="epo:ProcurementCriterion"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1A03_44a0_83AA_6740E666BCB4" x="319" y="42" width="232" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_94074245_1A03_44a0_95E8_EBFA7B9EEE7D" modelElement="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1A03_44a0_95E8_EBFA7B9EEE7D" text="cccev:Criterion"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1A03_44a0_95E8_EBFA7B9EEE7D" x="595" y="34" width="275" height="85"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_94074245_1A03_44a0_B39A_04F149020988" modelElement="EAID_31165801_5B33_4e47_B39A_04F149020988">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_1A03_44a0_B39A_04F149020988" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1A03_44a0_B39A_04F149020988" text="at-voc:criterion"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1A03_44a0_B39A_04F149020988" x="688" y="181" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_94074245_1A03_44a0_BE9C_C9CD1456AEBB" modelElement="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1A03_44a0_BE9C_C9CD1456AEBB" text="epo-acc:ESPDRequest"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1A03_44a0_BE9C_C9CD1456AEBB" x="17" y="42" width="124" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_94074245_1A03_44a0_9E28_8D741E0840F3" source="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_18CF5F1B_45DD_4b29_9E28_8D741E0840F3">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1A03_44a0_9E28_8D741E0840F3" text="+epo:specifiesProcurementCriterion" modelElement="EAID_dstCF5F1B_45DD_4b29_9E28_8D741E0840F3">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1A03_44a0_9E28_8D741E0840F3" x="165" y="57" width="142" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1A03_44a0_9E28_8D741E0840F3" text="1..*" modelElement="EAID_dstCF5F1B_45DD_4b29_9E28_8D741E0840F3">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1A03_44a0_9E28_8D741E0840F3" x="300" y="82" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1A03_44a0_9E28_8D741E0840F3" x="141" y="77"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1A03_44a0_9E28_8D741E0840F3" x="319" y="77"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_94074245_1A03_44a0_B88A_A418F4281BF1" source="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D" target="EAID_31165801_5B33_4e47_B39A_04F149020988" modelElement="EAID_D84D8FB5_6889_47af_B88A_A418F4281BF1">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1A03_44a0_B88A_A418F4281BF1" x="732" y="119"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1A03_44a0_B88A_A418F4281BF1" x="732" y="181"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_94074245_1A03_44a0_B735_322F9131A442" source="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" target="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D" modelElement="EAID_ACA750D2_84FF_4e07_B735_322F9131A442">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1A03_44a0_B735_322F9131A442" x="551" y="76"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1A03_44a0_B735_322F9131A442" x="595" y="76"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_94074245_1A03_44a0_BFBF_00E3B99864B4" source="EAID_432BFDAD_99CD_40ab_A159_824F0F6571E2" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_E51D25BC_E9FB_423c_BFBF_00E3B99864B4">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1A03_44a0_BFBF_00E3B99864B4" x="434" y="189"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1A03_44a0_BFBF_00E3B99864B4" x="434" y="112"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_94074245_1A03_44a0_A0FF_14B7A0FB6A6B" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" modelElement="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1A03_44a0_A0FF_14B7A0FB6A6B" text="+epo-sub:relatesToESPDRequest" modelElement="EAID_dstBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1A03_44a0_A0FF_14B7A0FB6A6B" x="13" y="137" width="131" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1A03_44a0_A0FF_14B7A0FB6A6B" text="1" modelElement="EAID_dstBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1A03_44a0_A0FF_14B7A0FB6A6B" x="91" y="117" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1A03_44a0_A0FF_14B7A0FB6A6B" x="79" y="181"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1A03_44a0_A0FF_14B7A0FB6A6B" x="79" y="112"/>
+			</ownedElement>
+		</umldi:Diagram>
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_71E43A2B_6D3D_4d9e_91FD_0F721EA0B021" isFrame="false" modelElement="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9">
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_71E43A2B_6D3D_4d9e_B117_6B8C8C53C370" modelElement="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6D3D_4d9e_B117_6B8C8C53C370" text="epo-sub:ESPD"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6D3D_4d9e_B117_6B8C8C53C370" x="197" y="388" width="140" height="40"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_71E43A2B_6D3D_4d9e_847A_7E8C5EEC0432" modelElement="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6D3D_4d9e_847A_7E8C5EEC0432" text="epo:Period"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6D3D_4d9e_847A_7E8C5EEC0432" x="210" y="220" width="176" height="58"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_71E43A2B_6D3D_4d9e_A9E4_B33CA4DA4C39" modelElement="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6D3D_4d9e_A9E4_B33CA4DA4C39" text="epo:Certificate"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6D3D_4d9e_A9E4_B33CA4DA4C39" x="493" y="78" width="239" height="72"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_71E43A2B_6D3D_4d9e_99E7_B387A7B402A1" modelElement="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6D3D_4d9e_99E7_B387A7B402A1" text="epo:Certifier"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6D3D_4d9e_99E7_B387A7B402A1" x="860" y="92" width="90" height="43"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_71E43A2B_6D3D_4d9e_8C41_DD186A53D6A9" modelElement="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6D3D_4d9e_8C41_DD186A53D6A9" text="cccev:Evidence"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6D3D_4d9e_8C41_DD186A53D6A9" x="527" y="218" width="171" height="62"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_71E43A2B_6D3D_4d9e_81DD_DA4802D8A322" modelElement="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6D3D_4d9e_81DD_DA4802D8A322" text="org:Organization"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6D3D_4d9e_81DD_DA4802D8A322" x="486" y="346" width="253" height="124"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_71E43A2B_6D3D_4d9e_AD7B_7484B8FDA398" modelElement="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6D3D_4d9e_AD7B_7484B8FDA398" text="adms:Identifier"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6D3D_4d9e_AD7B_7484B8FDA398" x="860" y="205" width="207" height="88"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_71E43A2B_6D3D_4d9e_AF52_F2AAFF7E2E77" modelElement="EAID_02D4B752_188D_46ee_AF52_F2AAFF7E2E77">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6D3D_4d9e_AF52_F2AAFF7E2E77" text="epo-sub:CertificateInformation"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6D3D_4d9e_AF52_F2AAFF7E2E77" x="29" y="79" width="239" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_71E43A2B_6D3D_4d9e_8164_044CE03A05CB" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_6D3D_4d9e_8164_044CE03A05CB" text="+epo:hasTaxIdentifier" modelElement="EAID_dstABB55C_F52F_4373_8164_044CE03A05CB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6D3D_4d9e_8164_044CE03A05CB" x="978" y="312" width="88" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6D3D_4d9e_8164_044CE03A05CB" text="0..*" modelElement="EAID_dstABB55C_F52F_4373_8164_044CE03A05CB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6D3D_4d9e_8164_044CE03A05CB" x="1032" y="298" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6D3D_4d9e_8164_044CE03A05CB" x="739" y="426"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6D3D_4d9e_8164_044CE03A05CB" x="1020" y="426"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_6D3D_4d9e_8164_044CE03A05CB" x="1020" y="293"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_71E43A2B_6D3D_4d9e_AE66_986280A7B2F6" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_6D3D_4d9e_AE66_986280A7B2F6" text="+epo:hasLegalIdentifier" modelElement="EAID_dst57F338_A3A5_457d_AE66_986280A7B2F6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6D3D_4d9e_AE66_986280A7B2F6" x="891" y="323" width="95" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6D3D_4d9e_AE66_986280A7B2F6" text="0..*" modelElement="EAID_dst57F338_A3A5_457d_AE66_986280A7B2F6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6D3D_4d9e_AE66_986280A7B2F6" x="959" y="298" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6D3D_4d9e_AE66_986280A7B2F6" x="739" y="386"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6D3D_4d9e_AE66_986280A7B2F6" x="947" y="386"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_6D3D_4d9e_AE66_986280A7B2F6" x="947" y="293"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_71E43A2B_6D3D_4d9e_B55B_A94D38ED4C2F" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" modelElement="EAID_8B71787B_152C_48e6_B55B_A94D38ED4C2F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_6D3D_4d9e_B55B_A94D38ED4C2F" text="+epo:canProvideTaxAndSocialSecuritiesEvidence" modelElement="EAID_dst71787B_152C_48e6_B55B_A94D38ED4C2F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6D3D_4d9e_B55B_A94D38ED4C2F" x="517" y="310" width="195" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6D3D_4d9e_B55B_A94D38ED4C2F" text="0..*" modelElement="EAID_dst71787B_152C_48e6_B55B_A94D38ED4C2F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6D3D_4d9e_B55B_A94D38ED4C2F" x="623" y="285" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6D3D_4d9e_B55B_A94D38ED4C2F" x="611" y="346"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6D3D_4d9e_B55B_A94D38ED4C2F" x="611" y="280"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_71E43A2B_6D3D_4d9e_9CB4_9A6821D5E3E1" source="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_7F56C70D_D0B9_4ad4_9CB4_9A6821D5E3E1">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_6D3D_4d9e_9CB4_9A6821D5E3E1" text="+adms:identifier" modelElement="EAID_dst56C70D_D0B9_4ad4_9CB4_9A6821D5E3E1">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6D3D_4d9e_9CB4_9A6821D5E3E1" x="788" y="230" width="66" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6D3D_4d9e_9CB4_9A6821D5E3E1" text="1" modelElement="EAID_dst56C70D_D0B9_4ad4_9CB4_9A6821D5E3E1">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6D3D_4d9e_9CB4_9A6821D5E3E1" x="852" y="255" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6D3D_4d9e_9CB4_9A6821D5E3E1" x="698" y="250"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6D3D_4d9e_9CB4_9A6821D5E3E1" x="860" y="250"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_71E43A2B_6D3D_4d9e_829F_004DFE769A97" source="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_1864913C_FE85_48db_829F_004DFE769A97">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_6D3D_4d9e_829F_004DFE769A97" text="+epo:hasValidityPeriod" modelElement="EAID_dst64913C_FE85_48db_829F_004DFE769A97">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6D3D_4d9e_829F_004DFE769A97" x="408" y="229" width="93" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6D3D_4d9e_829F_004DFE769A97" text="0..1" modelElement="EAID_dst64913C_FE85_48db_829F_004DFE769A97">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6D3D_4d9e_829F_004DFE769A97" x="389" y="253" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6D3D_4d9e_829F_004DFE769A97" x="527" y="248"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6D3D_4d9e_829F_004DFE769A97" x="386" y="248"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_71E43A2B_6D3D_4d9e_9A77_C246A6F21E71" source="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" target="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1" modelElement="EAID_97176015_1FBF_4d9c_9A77_C246A6F21E71">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_6D3D_4d9e_9A77_C246A6F21E71" text="+epo:issuedByCertifier" modelElement="EAID_dst176015_1FBF_4d9c_9A77_C246A6F21E71">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6D3D_4d9e_9A77_C246A6F21E71" x="767" y="96" width="90" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6D3D_4d9e_9A77_C246A6F21E71" text="0..1" modelElement="EAID_dst176015_1FBF_4d9c_9A77_C246A6F21E71">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6D3D_4d9e_9A77_C246A6F21E71" x="841" y="120" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6D3D_4d9e_9A77_C246A6F21E71" x="732" y="115"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6D3D_4d9e_9A77_C246A6F21E71" x="860" y="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_71E43A2B_6D3D_4d9e_AEDA_E49049545B3B" source="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" target="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" modelElement="EAID_04EC0265_2665_47d4_AEDA_E49049545B3B">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6D3D_4d9e_AEDA_E49049545B3B" x="611" y="150"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6D3D_4d9e_AEDA_E49049545B3B" x="611" y="218"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_71E43A2B_6D3D_4d9e_850D_83D60BFADA1F" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_6D3D_4d9e_850D_83D60BFADA1F" text="+epo-sub:providesInformationOn" modelElement="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6D3D_4d9e_850D_83D60BFADA1F" x="350" y="390" width="134" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6D3D_4d9e_850D_83D60BFADA1F" text="0..*" modelElement="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6D3D_4d9e_850D_83D60BFADA1F" x="467" y="413" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6D3D_4d9e_850D_83D60BFADA1F" x="337" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6D3D_4d9e_850D_83D60BFADA1F" x="486" y="408"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_71E43A2B_6D3D_4d9e_9BA9_5CF8B7A9D5AB" source="EAID_02D4B752_188D_46ee_AF52_F2AAFF7E2E77" target="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" modelElement="EAID_CA57E831_F2FE_4a87_9BA9_5CF8B7A9D5AB">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_6D3D_4d9e_9BA9_5CF8B7A9D5AB" text="+epo-sub:summarisesInformationAboutCertificate" modelElement="EAID_dst57E831_F2FE_4a87_9BA9_5CF8B7A9D5AB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6D3D_4d9e_9BA9_5CF8B7A9D5AB" x="284" y="92" width="200" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6D3D_4d9e_9BA9_5CF8B7A9D5AB" text="1" modelElement="EAID_dst57E831_F2FE_4a87_9BA9_5CF8B7A9D5AB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6D3D_4d9e_9BA9_5CF8B7A9D5AB" x="485" y="119" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6D3D_4d9e_9BA9_5CF8B7A9D5AB" x="268" y="114"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6D3D_4d9e_9BA9_5CF8B7A9D5AB" x="493" y="114"/>
+			</ownedElement>
+		</umldi:Diagram>
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_F3B9C2EE_40B3_4257_AFB2_39EE389FC525" isFrame="false" modelElement="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9">
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F3B9C2EE_40B3_4257_B117_6B8C8C53C370" modelElement="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_40B3_4257_B117_6B8C8C53C370" text="epo-sub:ESPD"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_40B3_4257_B117_6B8C8C53C370" x="417" y="221" width="119" height="84"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F3B9C2EE_40B3_4257_9284_B6F7309F5985" modelElement="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_40B3_4257_9284_B6F7309F5985" text="epo:OfferingParty"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_40B3_4257_9284_B6F7309F5985" x="157" y="98" width="90" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F3B9C2EE_40B3_4257_A12E_00C2BE16F4B6" modelElement="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_40B3_4257_A12E_00C2BE16F4B6" text="epo:AgentInRole"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_40B3_4257_A12E_00C2BE16F4B6" x="417" y="98" width="171" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F3B9C2EE_40B3_4257_B584_D95C2DBBD7A1" modelElement="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_40B3_4257_B584_D95C2DBBD7A1" text="foaf:Agent"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_40B3_4257_B584_D95C2DBBD7A1" x="722" y="98" width="164" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F3B9C2EE_40B3_4257_81DD_DA4802D8A322" modelElement="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_40B3_4257_81DD_DA4802D8A322" text="org:Organization"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_40B3_4257_81DD_DA4802D8A322" x="678" y="213" width="253" height="101"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F3B9C2EE_40B3_4257_B083_E051F46A909D" modelElement="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_40B3_4257_B083_E051F46A909D" text="epo:OrganisationGroup"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_40B3_4257_B083_E051F46A909D" x="710" y="382" width="189" height="51"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F3B9C2EE_40B3_4257_AD7B_7484B8FDA398" modelElement="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_40B3_4257_AD7B_7484B8FDA398" text="adms:Identifier"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_40B3_4257_AD7B_7484B8FDA398" x="958" y="89" width="207" height="88"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F3B9C2EE_40B3_4257_9491_D5301EE0DDE7" modelElement="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_40B3_4257_9491_D5301EE0DDE7" text="epo:Subcontractor"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_40B3_4257_9491_D5301EE0DDE7" x="207" y="277" width="90" height="35"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F3B9C2EE_40B3_4257_B795_B4D7DEE0BA53" modelElement="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_40B3_4257_B795_B4D7DEE0BA53" text="epo:Tenderer"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_40B3_4257_B795_B4D7DEE0BA53" x="108" y="277" width="90" height="35"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F3B9C2EE_40B3_4257_80A3_BA1B8B406A51" modelElement="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_40B3_4257_80A3_BA1B8B406A51" text="epo:OtherEntity"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_40B3_4257_80A3_BA1B8B406A51" x="306" y="277" width="90" height="35"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F3B9C2EE_40B3_4257_ADAC_88A2D6017C32" modelElement="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_40B3_4257_ADAC_88A2D6017C32" text="epo:Candidate"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_40B3_4257_ADAC_88A2D6017C32" x="9" y="277" width="90" height="35"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_8164_044CE03A05CB" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_40B3_4257_8164_044CE03A05CB" text="+epo:hasTaxIdentifier" modelElement="EAID_dstABB55C_F52F_4373_8164_044CE03A05CB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_40B3_4257_8164_044CE03A05CB" x="1064" y="214" width="88" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_40B3_4257_8164_044CE03A05CB" text="0..*" modelElement="EAID_dstABB55C_F52F_4373_8164_044CE03A05CB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_40B3_4257_8164_044CE03A05CB" x="1121" y="182" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_8164_044CE03A05CB" x="931" y="278"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_8164_044CE03A05CB" x="1109" y="278"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_40B3_4257_8164_044CE03A05CB" x="1109" y="177"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_A69F_C36E3ABE8273" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" modelElement="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_40B3_4257_A69F_C36E3ABE8273" text="+epo-sub:refersToOtherESPDResponse 0..*" modelElement="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_40B3_4257_A69F_C36E3ABE8273" x="317" y="200" width="158" height="27"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_40B3_4257_A69F_C36E3ABE8273" text="0..*" modelElement="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_40B3_4257_A69F_C36E3ABE8273" x="414" y="245" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_A69F_C36E3ABE8273" x="436" y="221"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_A69F_C36E3ABE8273" x="436" y="221"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_40B3_4257_A69F_C36E3ABE8273" x="436" y="194"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_40B3_4257_A69F_C36E3ABE8273" x="376" y="194"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_40B3_4257_A69F_C36E3ABE8273" x="376" y="240"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_40B3_4257_A69F_C36E3ABE8273" x="417" y="240"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_40B3_4257_A69F_C36E3ABE8273" x="417" y="240"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_947D_E6C47AAC7527" source="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" target="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" modelElement="EAID_4657FAEB_1A34_4ef7_947D_E6C47AAC7527">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_947D_E6C47AAC7527" x="247" y="133"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_947D_E6C47AAC7527" x="417" y="133"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_BCE2_05E832F758D6" source="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" target="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" modelElement="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_40B3_4257_BCE2_05E832F758D6" text="+epo:playedBy" modelElement="EAID_dst9200E2_D732_4a5e_BCE2_05E832F758D6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_40B3_4257_BCE2_05E832F758D6" x="659" y="115" width="61" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_40B3_4257_BCE2_05E832F758D6" text="1" modelElement="EAID_dst9200E2_D732_4a5e_BCE2_05E832F758D6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_40B3_4257_BCE2_05E832F758D6" x="714" y="138" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_BCE2_05E832F758D6" x="588" y="133"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_BCE2_05E832F758D6" x="722" y="133"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_B084_12D7110FE9E0" source="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_319F106B_6066_4ba7_B084_12D7110FE9E0">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_40B3_4257_B084_12D7110FE9E0" text="+adms:identifier" modelElement="EAID_dst9F106B_6066_4ba7_B084_12D7110FE9E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_40B3_4257_B084_12D7110FE9E0" x="890" y="115" width="66" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_40B3_4257_B084_12D7110FE9E0" text="0..*" modelElement="EAID_dst9F106B_6066_4ba7_B084_12D7110FE9E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_40B3_4257_B084_12D7110FE9E0" x="939" y="138" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_B084_12D7110FE9E0" x="886" y="133"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_B084_12D7110FE9E0" x="958" y="133"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_A3E1_A997E86942D2" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" modelElement="EAID_19AD8C15_4D9D_48f2_A3E1_A997E86942D2">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_A3E1_A997E86942D2" x="804" y="213"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_A3E1_A997E86942D2" x="804" y="168"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_850D_83D60BFADA1F" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_40B3_4257_850D_83D60BFADA1F" text="+epo-sub:providesInformationOn" modelElement="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_40B3_4257_850D_83D60BFADA1F" x="540" y="244" width="134" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_40B3_4257_850D_83D60BFADA1F" text="0..*" modelElement="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_40B3_4257_850D_83D60BFADA1F" x="659" y="268" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_850D_83D60BFADA1F" x="536" y="263"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_850D_83D60BFADA1F" x="678" y="263"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_AE66_986280A7B2F6" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_40B3_4257_AE66_986280A7B2F6" text="+epo:hasLegalIdentifier" modelElement="EAID_dst57F338_A3A5_457d_AE66_986280A7B2F6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_40B3_4257_AE66_986280A7B2F6" x="979" y="201" width="95" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_40B3_4257_AE66_986280A7B2F6" text="0..*" modelElement="EAID_dst57F338_A3A5_457d_AE66_986280A7B2F6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_40B3_4257_AE66_986280A7B2F6" x="1051" y="182" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_AE66_986280A7B2F6" x="931" y="247"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_AE66_986280A7B2F6" x="1039" y="247"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_40B3_4257_AE66_986280A7B2F6" x="1039" y="177"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_B47E_F671B4F00F63" source="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_28774B07_2278_44a1_B47E_F671B4F00F63">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_B47E_F671B4F00F63" x="69" y="277"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_B47E_F671B4F00F63" x="169" y="168"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_A6DF_915A5FB0B3DB" source="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_F3F440DD_AB87_4730_A6DF_915A5FB0B3DB">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_40B3_4257_A6DF_915A5FB0B3DB" text="+epo:leadBy" modelElement="EAID_dstF440DD_AB87_4730_A6DF_915A5FB0B3DB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_40B3_4257_A6DF_915A5FB0B3DB" x="776" y="351" width="51" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_40B3_4257_A6DF_915A5FB0B3DB" text="0..1" modelElement="EAID_dstF440DD_AB87_4730_A6DF_915A5FB0B3DB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_40B3_4257_A6DF_915A5FB0B3DB" x="814" y="319" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_A6DF_915A5FB0B3DB" x="802" y="382"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_A6DF_915A5FB0B3DB" x="802" y="314"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_B906_6DB183F74D9F" source="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_0AA8BD10_946A_403c_B906_6DB183F74D9F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_40B3_4257_B906_6DB183F74D9F" text="+epo:hasMember" modelElement="EAID_dstA8BD10_946A_403c_B906_6DB183F74D9F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_40B3_4257_B906_6DB183F74D9F" x="834" y="338" width="73" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_40B3_4257_B906_6DB183F74D9F" text="1..*" modelElement="EAID_dstA8BD10_946A_403c_B906_6DB183F74D9F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_40B3_4257_B906_6DB183F74D9F" x="879" y="319" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_B906_6DB183F74D9F" x="867" y="382"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_B906_6DB183F74D9F" x="867" y="314"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_BB86_A2E25524B058" source="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_881F7772_9A6C_4e5a_BB86_A2E25524B058">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_BB86_A2E25524B058" x="746" y="382"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_BB86_A2E25524B058" x="746" y="314"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_A43E_D33DC6607852" source="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_A27A53B2_A6D1_4fdd_A43E_D33DC6607852">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_A43E_D33DC6607852" x="246" y="277"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_A43E_D33DC6607852" x="212" y="168"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_A409_64CB2CE61248" source="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_199C3BDF_913A_42e4_A409_64CB2CE61248">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_A409_64CB2CE61248" x="158" y="277"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_A409_64CB2CE61248" x="191" y="168"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_AEF4_9EBDE5851B98" source="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_5729A98B_A925_4816_AEF4_9EBDE5851B98">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_AEF4_9EBDE5851B98" x="335" y="277"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_AEF4_9EBDE5851B98" x="234" y="168"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_B370_202D9A0110E0" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_2FF93267_E672_481d_B370_202D9A0110E0">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_40B3_4257_B370_202D9A0110E0" text="+org:subOrganizationOf 0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_40B3_4257_B370_202D9A0110E0" x="665" y="178" width="115" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_40B3_4257_B370_202D9A0110E0" text="0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_40B3_4257_B370_202D9A0110E0" x="727" y="208" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_B370_202D9A0110E0" x="756" y="213"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_B370_202D9A0110E0" x="756" y="213"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_40B3_4257_B370_202D9A0110E0" x="756" y="190"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_40B3_4257_B370_202D9A0110E0" x="719" y="190"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_40B3_4257_B370_202D9A0110E0" x="719" y="213"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_40B3_4257_B370_202D9A0110E0" x="719" y="213"/>
+			</ownedElement>
+		</umldi:Diagram>
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_7390C0BE_0F05_4823_ABE3_07757EF6B2CF" isFrame="false" modelElement="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9">
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_7390C0BE_0F05_4823_B117_6B8C8C53C370" modelElement="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0F05_4823_B117_6B8C8C53C370" text="epo-sub:ESPD"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0F05_4823_B117_6B8C8C53C370" x="310" y="297" width="143" height="44"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_7390C0BE_0F05_4823_A9E4_B33CA4DA4C39" modelElement="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0F05_4823_A9E4_B33CA4DA4C39" text="epo:Certificate"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0F05_4823_A9E4_B33CA4DA4C39" x="262" y="118" width="239" height="55"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_7390C0BE_0F05_4823_81DD_DA4802D8A322" modelElement="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0F05_4823_81DD_DA4802D8A322" text="org:Organization"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0F05_4823_81DD_DA4802D8A322" x="593" y="257" width="253" height="124"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_7390C0BE_0F05_4823_8C41_DD186A53D6A9" modelElement="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0F05_4823_8C41_DD186A53D6A9" text="cccev:Evidence"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0F05_4823_8C41_DD186A53D6A9" x="676" y="115" width="171" height="62"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_7390C0BE_0F05_4823_B131_6D083DB9839A" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" modelElement="EAID_2F19249F_490A_42c9_B131_6D083DB9839A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0F05_4823_B131_6D083DB9839A" text="+epo:canProvideNonDiscriminatoryEvidence" modelElement="EAID_dst19249F_490A_42c9_B131_6D083DB9839A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0F05_4823_B131_6D083DB9839A" x="671" y="213" width="177" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0F05_4823_B131_6D083DB9839A" text="0..*" modelElement="EAID_dst19249F_490A_42c9_B131_6D083DB9839A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0F05_4823_B131_6D083DB9839A" x="772" y="182" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0F05_4823_B131_6D083DB9839A" x="760" y="257"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0F05_4823_B131_6D083DB9839A" x="760" y="177"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_7390C0BE_0F05_4823_AEDA_E49049545B3B" source="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" target="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" modelElement="EAID_04EC0265_2665_47d4_AEDA_E49049545B3B">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0F05_4823_AEDA_E49049545B3B" x="501" y="145"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0F05_4823_AEDA_E49049545B3B" x="676" y="145"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_7390C0BE_0F05_4823_A69F_C36E3ABE8273" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" modelElement="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0F05_4823_A69F_C36E3ABE8273" text="+epo-sub:refersToOtherESPDResponse 0..*" modelElement="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0F05_4823_A69F_C36E3ABE8273" x="181" y="278" width="174" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0F05_4823_A69F_C36E3ABE8273" text="0..*" modelElement="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0F05_4823_A69F_C36E3ABE8273" x="307" y="327" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0F05_4823_A69F_C36E3ABE8273" x="323" y="297"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0F05_4823_A69F_C36E3ABE8273" x="323" y="297"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0F05_4823_A69F_C36E3ABE8273" x="323" y="264"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_0F05_4823_A69F_C36E3ABE8273" x="271" y="264"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_0F05_4823_A69F_C36E3ABE8273" x="271" y="322"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_0F05_4823_A69F_C36E3ABE8273" x="310" y="322"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_0F05_4823_A69F_C36E3ABE8273" x="310" y="322"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_7390C0BE_0F05_4823_850D_83D60BFADA1F" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0F05_4823_850D_83D60BFADA1F" text="+epo-sub:providesInformationOn" modelElement="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0F05_4823_850D_83D60BFADA1F" x="457" y="301" width="134" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0F05_4823_850D_83D60BFADA1F" text="0..*" modelElement="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0F05_4823_850D_83D60BFADA1F" x="574" y="324" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0F05_4823_850D_83D60BFADA1F" x="453" y="319"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0F05_4823_850D_83D60BFADA1F" x="593" y="319"/>
+			</ownedElement>
+		</umldi:Diagram>
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_A6FFBF40_ABD7_4fa9_9509_ADCA4A6A99C0" isFrame="false" modelElement="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9">
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A6FFBF40_ABD7_4fa9_B117_6B8C8C53C370" modelElement="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_ABD7_4fa9_B117_6B8C8C53C370" text="epo-sub:ESPD"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ABD7_4fa9_B117_6B8C8C53C370" x="151" y="79" width="140" height="44"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A6FFBF40_ABD7_4fa9_81DD_DA4802D8A322" modelElement="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_ABD7_4fa9_81DD_DA4802D8A322" text="org:Organization"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ABD7_4fa9_81DD_DA4802D8A322" x="94" y="181" width="253" height="113"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A6FFBF40_ABD7_4fa9_894E_2EFBAE78D71C" modelElement="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_ABD7_4fa9_894E_2EFBAE78D71C" text="epo:Business"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ABD7_4fa9_894E_2EFBAE78D71C" x="126" y="340" width="189" height="51"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A6FFBF40_ABD7_4fa9_8C11_F71753C30F8E" modelElement="EAID_52205A3C_8FF4_4195_8C11_F71753C30F8E">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_ABD7_4fa9_8C11_F71753C30F8E" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_ABD7_4fa9_8C11_F71753C30F8E" text="at-voc:economic-operator-size"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ABD7_4fa9_8C11_F71753C30F8E" x="150" y="447" width="141" height="35"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A6FFBF40_ABD7_4fa9_B4E1_7B69BF54F2E9" modelElement="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_ABD7_4fa9_B4E1_7B69BF54F2E9" text="epo-sub:NationalPreQualificationData"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ABD7_4fa9_B4E1_7B69BF54F2E9" x="488" y="212" width="339" height="51"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A6FFBF40_ABD7_4fa9_9B44_2FCDD6AB5C9D" modelElement="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_ABD7_4fa9_9B44_2FCDD6AB5C9D" text="epo:MonetaryValue"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ABD7_4fa9_9B44_2FCDD6AB5C9D" x="433" y="407" width="267" height="88"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A6FFBF40_ABD7_4fa9_8D25_BA714BA9C3EC" modelElement="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_ABD7_4fa9_8D25_BA714BA9C3EC" text="epo:Quantity"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ABD7_4fa9_8D25_BA714BA9C3EC" x="651" y="334" width="205" height="62"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A6FFBF40_ABD7_4fa9_AD7B_7484B8FDA398" modelElement="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_ABD7_4fa9_AD7B_7484B8FDA398" text="adms:Identifier"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ABD7_4fa9_AD7B_7484B8FDA398" x="546" y="57" width="207" height="88"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A6FFBF40_ABD7_4fa9_B333_8582A36D1244" source="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_23CC2B92_731F_4428_B333_8582A36D1244">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_ABD7_4fa9_B333_8582A36D1244" text="+epo-sub:providesOrganisationPreQualificationListingIdentifier" modelElement="EAID_dstCC2B92_731F_4428_B333_8582A36D1244">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ABD7_4fa9_B333_8582A36D1244" x="528" y="172" width="250" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_ABD7_4fa9_B333_8582A36D1244" text="0..*" modelElement="EAID_dstCC2B92_731F_4428_B333_8582A36D1244">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ABD7_4fa9_B333_8582A36D1244" x="667" y="150" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ABD7_4fa9_B333_8582A36D1244" x="655" y="212"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ABD7_4fa9_B333_8582A36D1244" x="655" y="145"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A6FFBF40_ABD7_4fa9_95FE_A08E92EA8618" source="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_9BF032E2_6893_45df_95FE_A08E92EA8618">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_ABD7_4fa9_95FE_A08E92EA8618" text="+epo-sub:providesOrganisationFinancialCapability" modelElement="EAID_dstF032E2_6893_45df_95FE_A08E92EA8618">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ABD7_4fa9_95FE_A08E92EA8618" x="447" y="349" width="200" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_ABD7_4fa9_95FE_A08E92EA8618" text="0..1" modelElement="EAID_dstF032E2_6893_45df_95FE_A08E92EA8618">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ABD7_4fa9_95FE_A08E92EA8618" x="559" y="389" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ABD7_4fa9_95FE_A08E92EA8618" x="551" y="263"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ABD7_4fa9_95FE_A08E92EA8618" x="551" y="407"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A6FFBF40_ABD7_4fa9_8340_AC2FC83206DA" source="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_87C6E00F_DAEB_4e79_8340_AC2FC83206DA">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_ABD7_4fa9_8340_AC2FC83206DA" text="+epo-sub:providesOrganisationEmployeeQuantity" modelElement="EAID_dstC6E00F_DAEB_4e79_8340_AC2FC83206DA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ABD7_4fa9_8340_AC2FC83206DA" x="673" y="294" width="201" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_ABD7_4fa9_8340_AC2FC83206DA" text="0..1" modelElement="EAID_dstC6E00F_DAEB_4e79_8340_AC2FC83206DA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ABD7_4fa9_8340_AC2FC83206DA" x="788" y="316" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ABD7_4fa9_8340_AC2FC83206DA" x="780" y="263"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ABD7_4fa9_8340_AC2FC83206DA" x="780" y="334"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A6FFBF40_ABD7_4fa9_8047_2DAC846D9C03" source="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_B6D90197_EC7F_4a01_8047_2DAC846D9C03">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_ABD7_4fa9_8047_2DAC846D9C03" text="+epo-sub:concernsOrganisation" modelElement="EAID_dstD90197_EC7F_4a01_8047_2DAC846D9C03">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ABD7_4fa9_8047_2DAC846D9C03" x="350" y="221" width="127" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_ABD7_4fa9_8047_2DAC846D9C03" text="1" modelElement="EAID_dstD90197_EC7F_4a01_8047_2DAC846D9C03">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ABD7_4fa9_8047_2DAC846D9C03" x="350" y="244" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ABD7_4fa9_8047_2DAC846D9C03" x="488" y="239"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ABD7_4fa9_8047_2DAC846D9C03" x="347" y="239"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A6FFBF40_ABD7_4fa9_A3EE_819F014FE1AC" source="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_A2F10537_FAE7_4ff3_A3EE_819F014FE1AC">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ABD7_4fa9_A3EE_819F014FE1AC" x="220" y="340"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ABD7_4fa9_A3EE_819F014FE1AC" x="220" y="294"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A6FFBF40_ABD7_4fa9_8A47_A62DAC97C6A3" source="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C" target="EAID_52205A3C_8FF4_4195_8C11_F71753C30F8E" modelElement="EAID_0A05E1A7_A032_44d5_8A47_A62DAC97C6A3">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ABD7_4fa9_8A47_A62DAC97C6A3" x="220" y="391"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ABD7_4fa9_8A47_A62DAC97C6A3" x="220" y="447"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A6FFBF40_ABD7_4fa9_850D_83D60BFADA1F" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_ABD7_4fa9_850D_83D60BFADA1F" text="+epo-sub:providesInformationOn" modelElement="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ABD7_4fa9_850D_83D60BFADA1F" x="153" y="144" width="134" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_ABD7_4fa9_850D_83D60BFADA1F" text="0..*" modelElement="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ABD7_4fa9_850D_83D60BFADA1F" x="228" y="163" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ABD7_4fa9_850D_83D60BFADA1F" x="220" y="123"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ABD7_4fa9_850D_83D60BFADA1F" x="220" y="181"/>
+			</ownedElement>
+		</umldi:Diagram>
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_D57C0343_5A78_480c_A411_138E27851C00" isFrame="false" modelElement="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9">
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D57C0343_5A78_480c_B3F6_8FC4EB9806DC" modelElement="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5A78_480c_B3F6_8FC4EB9806DC" text="cccev:Requirement"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5A78_480c_B3F6_8FC4EB9806DC" x="694" y="105" width="171" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D57C0343_5A78_480c_B117_6B8C8C53C370" modelElement="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5A78_480c_B117_6B8C8C53C370" text="epo-sub:ESPD"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5A78_480c_B117_6B8C8C53C370" x="151" y="358" width="116" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D57C0343_5A78_480c_BE9C_C9CD1456AEBB" modelElement="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5A78_480c_BE9C_C9CD1456AEBB" text="epo-acc:ESPDRequest"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5A78_480c_BE9C_C9CD1456AEBB" x="410" y="366" width="116" height="52"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D57C0343_5A78_480c_83AA_6740E666BCB4" modelElement="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5A78_480c_83AA_6740E666BCB4" text="epo:ProcurementCriterion"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5A78_480c_83AA_6740E666BCB4" x="352" y="234" width="232" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D57C0343_5A78_480c_95E8_EBFA7B9EEE7D" modelElement="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5A78_480c_95E8_EBFA7B9EEE7D" text="cccev:Criterion"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5A78_480c_95E8_EBFA7B9EEE7D" x="642" y="234" width="275" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D57C0343_5A78_480c_832B_477790550BBC" modelElement="EAID_30DD6891_71FE_4f87_832B_477790550BBC">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5A78_480c_832B_477790550BBC" text="cccev:InformationRequirement"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5A78_480c_832B_477790550BBC" x="944" y="252" width="152" height="35"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D57C0343_5A78_480c_8952_6A9F572F43B2" modelElement="EAID_86057FC2_7717_4160_8952_6A9F572F43B2">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5A78_480c_8952_6A9F572F43B2" text="cccev:InformationConcept"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5A78_480c_8952_6A9F572F43B2" x="382" y="106" width="171" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D57C0343_5A78_480c_8EF1_F83CAA04DDEC" modelElement="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5A78_480c_8EF1_F83CAA04DDEC" text="epo-sub:Response"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5A78_480c_8EF1_F83CAA04DDEC" x="164" y="224" width="90" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D57C0343_5A78_480c_857E_2AD843DEF3DE" source="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" target="EAID_30DD6891_71FE_4f87_832B_477790550BBC" modelElement="EAID_5715AB6B_F88D_4b3e_857E_2AD843DEF3DE">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5A78_480c_857E_2AD843DEF3DE" text="+epo-sub:answersQuestion" modelElement="EAID_dst15AB6B_F88D_4b3e_857E_2AD843DEF3DE">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5A78_480c_857E_2AD843DEF3DE" x="974" y="214" width="110" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5A78_480c_857E_2AD843DEF3DE" text="0..*" modelElement="EAID_dst15AB6B_F88D_4b3e_857E_2AD843DEF3DE">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5A78_480c_857E_2AD843DEF3DE" x="1026" y="234" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5A78_480c_857E_2AD843DEF3DE" x="208" y="224"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5A78_480c_857E_2AD843DEF3DE" x="208" y="88"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5A78_480c_857E_2AD843DEF3DE" x="1018" y="88"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_5A78_480c_857E_2AD843DEF3DE" x="1018" y="252"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D57C0343_5A78_480c_9596_5EC3247529A2" source="EAID_30DD6891_71FE_4f87_832B_477790550BBC" target="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" modelElement="EAID_6492D4E3_9631_45d4_9596_5EC3247529A2">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5A78_480c_9596_5EC3247529A2" x="965" y="252"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5A78_480c_9596_5EC3247529A2" x="965" y="139"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5A78_480c_9596_5EC3247529A2" x="865" y="139"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D57C0343_5A78_480c_BF53_F99082792332" source="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D" target="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" modelElement="EAID_C289FCF6_9241_4f06_BF53_F99082792332">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5A78_480c_BF53_F99082792332" x="779" y="234"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5A78_480c_BF53_F99082792332" x="779" y="175"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D57C0343_5A78_480c_B735_322F9131A442" source="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" target="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D" modelElement="EAID_ACA750D2_84FF_4e07_B735_322F9131A442">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5A78_480c_B735_322F9131A442" x="584" y="269"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5A78_480c_B735_322F9131A442" x="642" y="269"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D57C0343_5A78_480c_9E28_8D741E0840F3" source="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_18CF5F1B_45DD_4b29_9E28_8D741E0840F3">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5A78_480c_9E28_8D741E0840F3" text="+epo:specifiesProcurementCriterion" modelElement="EAID_dstCF5F1B_45DD_4b29_9E28_8D741E0840F3">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5A78_480c_9E28_8D741E0840F3" x="399" y="331" width="142" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5A78_480c_9E28_8D741E0840F3" text="1..*" modelElement="EAID_dstCF5F1B_45DD_4b29_9E28_8D741E0840F3">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5A78_480c_9E28_8D741E0840F3" x="480" y="309" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5A78_480c_9E28_8D741E0840F3" x="468" y="366"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5A78_480c_9E28_8D741E0840F3" x="468" y="304"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D57C0343_5A78_480c_BCCF_3E7847170DBD" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" modelElement="EAID_ACF95470_AB2B_4b7d_BCCF_3E7847170DBD">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5A78_480c_BCCF_3E7847170DBD" text="+epo-sub:specifiesResponse" modelElement="EAID_dstF95470_AB2B_4b7d_BCCF_3E7847170DBD">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5A78_480c_BCCF_3E7847170DBD" x="144" y="316" width="113" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5A78_480c_BCCF_3E7847170DBD" text="1..*" modelElement="EAID_dstF95470_AB2B_4b7d_BCCF_3E7847170DBD">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5A78_480c_BCCF_3E7847170DBD" x="221" y="299" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5A78_480c_BCCF_3E7847170DBD" x="209" y="358"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5A78_480c_BCCF_3E7847170DBD" x="209" y="294"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D57C0343_5A78_480c_A69F_C36E3ABE8273" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" modelElement="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5A78_480c_A69F_C36E3ABE8273" text="+epo-sub:refersToOtherESPDResponse 0..*" modelElement="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5A78_480c_A69F_C36E3ABE8273" x="37" y="439" width="158" height="27"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5A78_480c_A69F_C36E3ABE8273" text="0..*" modelElement="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5A78_480c_A69F_C36E3ABE8273" x="167" y="433" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5A78_480c_A69F_C36E3ABE8273" x="151" y="412"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5A78_480c_A69F_C36E3ABE8273" x="151" y="412"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5A78_480c_A69F_C36E3ABE8273" x="105" y="412"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_5A78_480c_A69F_C36E3ABE8273" x="105" y="459"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_5A78_480c_A69F_C36E3ABE8273" x="155" y="459"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_5A78_480c_A69F_C36E3ABE8273" x="155" y="428"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_5A78_480c_A69F_C36E3ABE8273" x="155" y="428"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D57C0343_5A78_480c_A0FF_14B7A0FB6A6B" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" modelElement="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5A78_480c_A0FF_14B7A0FB6A6B" text="+epo-sub:relatesToESPDRequest" modelElement="EAID_dstBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5A78_480c_A0FF_14B7A0FB6A6B" x="278" y="370" width="131" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5A78_480c_A0FF_14B7A0FB6A6B" text="1" modelElement="EAID_dstBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5A78_480c_A0FF_14B7A0FB6A6B" x="402" y="398" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5A78_480c_A0FF_14B7A0FB6A6B" x="267" y="393"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5A78_480c_A0FF_14B7A0FB6A6B" x="410" y="393"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D57C0343_5A78_480c_BFBB_56453EA7473F" source="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" target="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" modelElement="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5A78_480c_BFBB_56453EA7473F" text="+cccev:hasRequirement 0..*" modelElement="EAID_dst59B897_AEE0_4ae9_BFBB_56453EA7473F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5A78_480c_BFBB_56453EA7473F" x="596" y="180" width="114" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5A78_480c_BFBB_56453EA7473F" text="0..*" modelElement="EAID_dst59B897_AEE0_4ae9_BFBB_56453EA7473F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5A78_480c_BFBB_56453EA7473F" x="729" y="180" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5A78_480c_BFBB_56453EA7473F" x="694" y="162"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5A78_480c_BFBB_56453EA7473F" x="694" y="162"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5A78_480c_BFBB_56453EA7473F" x="671" y="162"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_5A78_480c_BFBB_56453EA7473F" x="671" y="203"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_5A78_480c_BFBB_56453EA7473F" x="717" y="203"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_5A78_480c_BFBB_56453EA7473F" x="717" y="175"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_5A78_480c_BFBB_56453EA7473F" x="717" y="175"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D57C0343_5A78_480c_BB1B_A5C475115AB1" source="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" target="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" modelElement="EAID_4CC3B6CA_493A_4ff6_BB1B_A5C475115AB1">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5A78_480c_BB1B_A5C475115AB1" text="+cccev:hasConcept" modelElement="EAID_dstC3B6CA_493A_4ff6_BB1B_A5C475115AB1">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5A78_480c_BB1B_A5C475115AB1" x="556" y="122" width="77" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5A78_480c_BB1B_A5C475115AB1" text="0..*" modelElement="EAID_dstC3B6CA_493A_4ff6_BB1B_A5C475115AB1">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5A78_480c_BB1B_A5C475115AB1" x="556" y="145" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5A78_480c_BB1B_A5C475115AB1" x="694" y="140"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5A78_480c_BB1B_A5C475115AB1" x="553" y="140"/>
+			</ownedElement>
+		</umldi:Diagram>
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_CD28F0FD_0C9A_4da8_A603_10B89BAA6A1C" isFrame="false" modelElement="EAPK_B08268CA_8A31_45bb_861A_FFC1F323A7AF">
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_CD28F0FD_0C9A_4da8_AC2B_1DABF5BF140B" modelElement="EAID_9C8D9941_B96C_4ca6_AC2B_1DABF5BF140B">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0C9A_4da8_AC2B_1DABF5BF140B" text="xsd:boolean"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0C9A_4da8_AC2B_1DABF5BF140B" x="54" y="334" width="90" height="38"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_CD28F0FD_0C9A_4da8_B949_0363CFF85E87" modelElement="EAID_05217498_C9A9_4647_B949_0363CFF85E87">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0C9A_4da8_B949_0363CFF85E87" text="xsd:anyURI"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0C9A_4da8_B949_0363CFF85E87" x="162" y="42" width="90" height="38"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_CD28F0FD_0C9A_4da8_B53B_FECF7887AB0C" modelElement="EAID_614F9209_E81A_4113_B53B_FECF7887AB0C">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0C9A_4da8_B53B_FECF7887AB0C" text="xsd:date"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0C9A_4da8_B53B_FECF7887AB0C" x="54" y="246" width="90" height="38"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_CD28F0FD_0C9A_4da8_8B42_23986E82DA4A" modelElement="EAID_D8DFC001_8E9C_43cc_8B42_23986E82DA4A">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0C9A_4da8_8B42_23986E82DA4A" text="xsd:dateTime"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0C9A_4da8_8B42_23986E82DA4A" x="162" y="246" width="90" height="38"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_CD28F0FD_0C9A_4da8_9372_D91610518291" modelElement="EAID_1664A675_DB09_4b0b_9372_D91610518291">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0C9A_4da8_9372_D91610518291" text="xsd:integer"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0C9A_4da8_9372_D91610518291" x="162" y="134" width="90" height="38"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_CD28F0FD_0C9A_4da8_9598_EDC5473782ED" modelElement="EAID_1DAA2177_8FD2_4acc_9598_EDC5473782ED">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0C9A_4da8_9598_EDC5473782ED" text="xsd:decimal"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0C9A_4da8_9598_EDC5473782ED" x="54" y="134" width="90" height="38"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_CD28F0FD_0C9A_4da8_946E_A67ADB8761A5" modelElement="EAID_41974725_E867_4940_946E_A67ADB8761A5">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0C9A_4da8_946E_A67ADB8761A5" text="rdf:PlainLiteral"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0C9A_4da8_946E_A67ADB8761A5" x="54" y="41" width="90" height="38"/>
+			</ownedElement>
+		</umldi:Diagram>
+	</uml:Model>
+	<xmi:Extension extender="Enterprise Architect" extenderID="6.5">
+		<elements>
+			<element xmi:idref="EAPK_53638E82_0EE0_4a4c_9560_38B724971FE9">
+				<packageproperties version="1.0" tpos="8"/>
+				<paths/>
+				<times created="2024-02-29 00:00:00" modified="2024-02-29 00:00:00"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;"/>
+			</element>
+			<element xmi:idref="EAPK_5E7328A3_FB85_43c1_8DA5_AE7A684AE578" xmi:type="uml:Package" name="submission" scope="public">
+				<model package2="EAID_5E7328A3_FB85_43c1_8DA5_AE7A684AE578" package="EAPK_53638E82_0EE0_4a4c_9560_38B724971FE9" tpos="1" ea_localid="230" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-02-29 14:38:13" modified="2024-02-29 14:38:13" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="Submission"/>
+				<packageproperties version="1.0" tpos="1"/>
+				<paths/>
+				<times created="2024-02-29 14:38:13" modified="2024-02-29 14:38:13"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
+			</element>
+			<element xmi:idref="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" xmi:type="uml:Package" name="diagrams" scope="public">
+				<model package2="EAID_8EE934F3_0B94_4baa_9F43_9488B8E902C9" package="EAPK_5E7328A3_FB85_43c1_8DA5_AE7A684AE578" tpos="1" ea_localid="242" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:41:51" modified="2024-07-23 11:41:51" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="submission"/>
+				<packageproperties version="1.0" tpos="1"/>
+				<paths/>
+				<times created="2024-07-23 11:41:51" modified="2024-07-23 11:41:51"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+			</element>
+			<element xmi:idref="EAPK_BF99515E_23A1_4c32_ACF2_57A2EF805C41" xmi:type="uml:Package" name="classes" scope="public">
+				<model package2="EAID_BF99515E_23A1_4c32_ACF2_57A2EF805C41" package="EAPK_5E7328A3_FB85_43c1_8DA5_AE7A684AE578" tpos="2" ea_localid="243" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:42:06" modified="2024-07-23 11:42:06" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="submission"/>
+				<packageproperties version="1.0" tpos="2"/>
+				<paths/>
+				<times created="2024-07-23 11:42:06" modified="2024-07-23 11:42:06"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+			</element>
+			<element xmi:idref="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B" xmi:type="uml:Class" name="cccev:SupportedValue" scope="public">
+				<model package="EAPK_BF99515E_23A1_4c32_ACF2_57A2EF805C41" tpos="0" ea_localid="3470" ea_eleType="element"/>
+				<properties documentation="Value for an Information Concept that is provided by an Evidence.&#xA;&#xA;Additional Information:&#xA;The notion of Supported Value is closely related to actual data exchange between two parties: (a) the Requirement processor, i.e. the Agent setting out Requirements for an objective and processing the supplied Evidences in the context of the Requirements, and (b) the Evidence provider, i.e. the Agent supplying information to an information request expressed as Requirements. The Requirement processor has expressed its expectations (both business as technical) for the information it wants to recieve as an Information Concept. The Evidence provider is able to supply information for that Information Concept, but its native data representation might not be coherent with the expectations set by the Requirement processor. The Supported Value is bridging both. The Evidence provider can either provide a derived value (fact) from its native data representation that complies with the Information Concept expectations. Or it can provide a query in an agreed language between Evidence provider and Requirement processor that allows the Requirement processor to retrieve the value from the native data representation. Implementers are free to choose their language. It is recommended to document the made agreements well." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-02-08 16:04:04" modified="2024-07-23 11:42:15" complexity="1" status="Proposed"/>
+				<code product_name="Java" gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<attributes>
+					<attribute xmi:idref="EAID_690D9B32_F64D_4dd8_96E2_F3E43B834759" name="cccev:value" scope="Public">
+						<initial/>
+						<documentation value="Value for the Information Concept that the Evidence supports."/>
+						<model ea_localid="2610" ea_guid="{690D9B32-F64D-4dd8-96E2-F3E43B834759}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="0"/>
+						<stereotype/>
+						<bounds lower="0" upper="*"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
+				<links>
+					<Association xmi:id="EAID_CFC6423E_1A9A_47fb_8C22_10175EEF3A31" start="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B" end="EAID_86057FC2_7717_4160_8952_6A9F572F43B2"/>
+					<Association xmi:id="EAID_3EE371EF_8DF9_4747_B49E_48C56317F5F9" start="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" end="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B"/>
+					<Association xmi:id="EAID_CE6EADDE_0D7D_40a5_B341_A616866CD789" start="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" end="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_02D4B752_188D_46ee_AF52_F2AAFF7E2E77" xmi:type="uml:Class" name="epo-sub:CertificateInformation" scope="public">
+				<model package="EAPK_BF99515E_23A1_4c32_ACF2_57A2EF805C41" tpos="0" ea_localid="3528" ea_eleType="element"/>
+				<properties documentation="Information about a Certificate.&#xA;&#xA;WG approval 12/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-02-20 16:51:30" modified="2024-07-23 11:42:15" complexity="1" status="Proposed"/>
+				<code product_name="Java" gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<attributes>
+					<attribute xmi:idref="EAID_38195851_542F_4925_B8A1_035AE8338D83" name="epo-sub:coversAllSelectionCriteria" scope="Public">
+						<initial/>
+						<documentation value="Indicator that the Certificate proves whether the Organization fulfils all Selection Criteria.&#xA;&#xA;WG approval 12/03/2024"/>
+						<model ea_localid="2608" ea_guid="{38195851-542F-4925-B8A1-035AE8338D83}"/>
+						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="1"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_848FD2BB_C8B5_4faf_AE53_68044F8BCFFA" name="dct:description" scope="Public">
+						<initial/>
+						<documentation value="An account of the resource.&#xA;&#xA;Additional Information:&#xA;Description may include but is not limited to: an abstract, a table of contents, a graphical representation, or a free-text account of the resource.&#xA;&#xA;WG Approval 30/05/2023&#xA;"/>
+						<model ea_localid="2605" ea_guid="{848FD2BB-C8B5-4faf-AE53-68044F8BCFFA}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="2"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
+				<links>
+					<Association xmi:id="EAID_CA57E831_F2FE_4a87_9BA9_5CF8B7A9D5AB" start="EAID_02D4B752_188D_46ee_AF52_F2AAFF7E2E77" end="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39"/>
+					<Generalization xmi:id="EAID_F0D24264_CD84_461f_AF53_509A8FB111D6" start="EAID_02D4B752_188D_46ee_AF52_F2AAFF7E2E77" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" xmi:type="uml:Class" name="epo-sub:ESPD" scope="public">
+				<model package="EAPK_BF99515E_23A1_4c32_ACF2_57A2EF805C41" tpos="0" ea_localid="1628" ea_eleType="element"/>
+				<properties documentation="A document conveying the fulfilment or not by the economic operator of the Exclusion Grounds and the Selection Criteria set out by the Buyer for a specific Procurement using an European Single Procurement Document (ESPD) Request. &#xA;&#xA;WG Approval 05/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-03-01 17:09:31" modified="2024-07-23 11:42:15" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<links>
+					<Association xmi:id="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B" start="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" end="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB"/>
+					<Association xmi:id="EAID_ACF95470_AB2B_4b7d_BCCF_3E7847170DBD" start="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" end="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC"/>
+					<Generalization xmi:id="EAID_C7D18971_E3AA_4bc3_B35F_CBFE4CDAAA84" start="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Association xmi:id="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273" start="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" end="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370"/>
+					<Association xmi:id="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F" start="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" end="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
+					<Association xmi:id="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273" start="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" end="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370"/>
+					<Association xmi:id="EAID_E453F729_4B4E_44c9_AD20_DD8131AF4BEF" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D" xmi:type="uml:Class" name="epo-sub:LegalRepresentative" scope="public">
+				<model package="EAPK_BF99515E_23A1_4c32_ACF2_57A2EF805C41" tpos="0" ea_localid="3474" ea_eleType="element"/>
+				<properties documentation="The Role of an Agent that can represent an Organization.&#xA;&#xA;WG approval 05/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-02-13 11:22:37" modified="2024-07-23 11:42:15" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<links>
+					<Association xmi:id="EAID_15E95E36_FC35_4adf_B5AC_F916221BB38E" start="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D" end="EAID_DE869DED_87AA_46a5_963D_EAEBF2AA6803"/>
+					<Generalization xmi:id="EAID_1982F8A2_ECBE_47d6_9A92_7176519FD4A5" start="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
+					<Association xmi:id="EAID_7775FD52_1FE1_445c_9B8B_96AA208D3134" start="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+					<Association xmi:id="EAID_C9AE0856_7B74_434f_BCD2_491FA097E6DE" start="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D" end="EAID_95FD9F3B_1F77_4e3c_A91D_72310583752E"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_95FD9F3B_1F77_4e3c_A91D_72310583752E" xmi:type="uml:Class" name="epo-sub:Mandate" scope="public">
+				<model package="EAPK_BF99515E_23A1_4c32_ACF2_57A2EF805C41" tpos="0" ea_localid="3475" ea_eleType="element"/>
+				<properties documentation="An authorization to act as a representative of an Organization.&#xA;&#xA;WG approval 05/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-02-13 12:52:49" modified="2024-07-23 11:42:15" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<links>
+					<Generalization xmi:id="EAID_672E5CCE_F8C9_4117_A52B_56209E049485" start="EAID_95FD9F3B_1F77_4e3c_A91D_72310583752E" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Association xmi:id="EAID_C9AE0856_7B74_434f_BCD2_491FA097E6DE" start="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D" end="EAID_95FD9F3B_1F77_4e3c_A91D_72310583752E"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" xmi:type="uml:Class" name="epo-sub:NationalPreQualificationData" scope="public">
+				<model package="EAPK_BF99515E_23A1_4c32_ACF2_57A2EF805C41" tpos="0" ea_localid="3466" ea_eleType="element"/>
+				<properties documentation="Data that describe the distinctive features or characteristics that qualify an economic operator to take part in a tendering process.&#xA;&#xA;WG approval 05/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-02-06 11:57:51" modified="2024-07-23 11:42:15" complexity="1" status="Proposed"/>
+				<code product_name="Java" gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<attributes>
+					<attribute xmi:idref="EAID_9C54C14F_AC2C_4e59_BBC8_FFB638255E64" name="epo-sub:providesOrganisationCompletedTaskDescription" scope="Public">
+						<initial/>
+						<documentation value="Text describing the works, supplies or services executed, delivered or performed in a procurement project that can be used as an evidence for the classification of the Organization.&#xA;&#xA;WG approval 05/03/2024"/>
+						<model ea_localid="2578" ea_guid="{9C54C14F-AC2C-4e59-BBC8-FFB638255E64}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="1"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
+				<links>
+					<Association xmi:id="EAID_23CC2B92_731F_4428_B333_8582A36D1244" start="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_87C6E00F_DAEB_4e79_8340_AC2FC83206DA" start="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_9BF032E2_6893_45df_95FE_A08E92EA8618" start="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_B6D90197_EC7F_4a01_8047_2DAC846D9C03" start="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" end="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_DE869DED_87AA_46a5_963D_EAEBF2AA6803" xmi:type="uml:Class" name="epo-sub:PowerOfAttorney" scope="public">
+				<model package="EAPK_BF99515E_23A1_4c32_ACF2_57A2EF805C41" tpos="0" ea_localid="3476" ea_eleType="element"/>
+				<properties documentation="A legal document that grants someone the authority to make decisions on behalf of an Organization.&#xA;&#xA;WG approval 05/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-02-13 12:52:57" modified="2024-07-23 11:42:15" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<links>
+					<Generalization xmi:id="EAID_4CC20250_2603_476b_8725_C9307E8BA364" start="EAID_DE869DED_87AA_46a5_963D_EAEBF2AA6803" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Association xmi:id="EAID_15E95E36_FC35_4adf_B5AC_F916221BB38E" start="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D" end="EAID_DE869DED_87AA_46a5_963D_EAEBF2AA6803"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" xmi:type="uml:Class" name="epo-sub:Response" scope="public">
+				<model package="EAPK_BF99515E_23A1_4c32_ACF2_57A2EF805C41" tpos="0" ea_localid="3467" ea_eleType="element"/>
+				<properties documentation="An answer given to a question that is part of an ESPD Request.&#xA;&#xA;WG approval 12/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-02-06 17:01:10" modified="2024-07-23 11:42:15" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<links>
+					<Association xmi:id="EAID_3EE371EF_8DF9_4747_B49E_48C56317F5F9" start="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" end="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B"/>
+					<Dependency xmi:id="EAID_49631FAC_5F3D_4939_83C6_69057788A49B" start="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" end="EAID_B7F675EC_18B3_49b1_AAF4_E0FAB88D85EE"/>
+					<Association xmi:id="EAID_5715AB6B_F88D_4b3e_857E_2AD843DEF3DE" start="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" end="EAID_30DD6891_71FE_4f87_832B_477790550BBC"/>
+					<Association xmi:id="EAID_93B47F0D_8871_4230_A6F8_522396CE72CF" start="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" end="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9"/>
+					<Association xmi:id="EAID_B2FBB3C3_8542_4cd9_8B7E_A25D4A6C9048" start="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+					<Association xmi:id="EAID_ACF95470_AB2B_4b7d_BCCF_3E7847170DBD" start="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" end="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC"/>
+				</links>
+			</element>
+			<element xmi:idref="EAPK_B08268CA_8A31_45bb_861A_FFC1F323A7AF" xmi:type="uml:Package" name="datatype" scope="public">
+				<model package2="EAID_B08268CA_8A31_45bb_861A_FFC1F323A7AF" package="EAPK_53638E82_0EE0_4a4c_9560_38B724971FE9" tpos="2" ea_localid="235" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:18:28" modified="2022-04-29 20:24:39" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="Submission"/>
+				<packageproperties version="1.0" tpos="2"/>
+				<paths/>
+				<times created="2022-04-29 20:18:28" modified="2022-04-29 20:24:39" lastloaddate="2023-12-12 14:58:26" lastsavedate="2023-12-12 14:58:26"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" batchsave="0" batchload="0" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
+			</element>
+			<element xmi:idref="EAID_41974725_E867_4940_946E_A67ADB8761A5" xmi:type="uml:DataType" name="rdf:PlainLiteral" scope="public">
+				<model package="EAPK_B08268CA_8A31_45bb_861A_FFC1F323A7AF" tpos="0" ea_localid="3569" ea_eleType="element"/>
+				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:26:11" modified="2023-04-27 10:28:15" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+			<element xmi:idref="EAID_05217498_C9A9_4647_B949_0363CFF85E87" xmi:type="uml:DataType" name="xsd:anyURI" scope="public">
+				<model package="EAPK_B08268CA_8A31_45bb_861A_FFC1F323A7AF" tpos="0" ea_localid="3564" ea_eleType="element"/>
+				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:24:54" modified="2022-04-29 20:24:55" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+			<element xmi:idref="EAID_9C8D9941_B96C_4ca6_AC2B_1DABF5BF140B" xmi:type="uml:DataType" name="xsd:boolean" scope="public">
+				<model package="EAPK_B08268CA_8A31_45bb_861A_FFC1F323A7AF" tpos="0" ea_localid="3563" ea_eleType="element"/>
+				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:18:43" modified="2022-04-29 20:18:49" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+			<element xmi:idref="EAID_614F9209_E81A_4113_B53B_FECF7887AB0C" xmi:type="uml:DataType" name="xsd:date" scope="public">
+				<model package="EAPK_B08268CA_8A31_45bb_861A_FFC1F323A7AF" tpos="0" ea_localid="3565" ea_eleType="element"/>
+				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:25:19" modified="2022-04-29 20:25:22" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+			<element xmi:idref="EAID_D8DFC001_8E9C_43cc_8B42_23986E82DA4A" xmi:type="uml:DataType" name="xsd:dateTime" scope="public">
+				<model package="EAPK_B08268CA_8A31_45bb_861A_FFC1F323A7AF" tpos="0" ea_localid="3566" ea_eleType="element"/>
+				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:25:26" modified="2022-04-29 20:25:30" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+			<element xmi:idref="EAID_1DAA2177_8FD2_4acc_9598_EDC5473782ED" xmi:type="uml:DataType" name="xsd:decimal" scope="public">
+				<model package="EAPK_B08268CA_8A31_45bb_861A_FFC1F323A7AF" tpos="0" ea_localid="3568" ea_eleType="element"/>
+				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:25:42" modified="2022-04-29 20:25:57" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+			<element xmi:idref="EAID_1664A675_DB09_4b0b_9372_D91610518291" xmi:type="uml:DataType" name="xsd:integer" scope="public">
+				<model package="EAPK_B08268CA_8A31_45bb_861A_FFC1F323A7AF" tpos="0" ea_localid="3567" ea_eleType="element"/>
+				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:25:33" modified="2022-04-29 20:25:38" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+		</elements>
+		<connectors>
+			<connector xmi:idref="EAID_CFC6423E_1A9A_47fb_8C22_10175EEF3A31">
+				<source xmi:idref="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B">
+					<model ea_localid="3470" type="Class" name="cccev:SupportedValue"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_86057FC2_7717_4160_8952_6A9F572F43B2">
+					<model ea_localid="1968" type="Class" name="cccev:InformationConcept"/>
+					<role name="cccev:providesValueFor" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5188"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Information Concept for which the Supported Value provides a value."/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+cccev:providesValueFor"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_3EE371EF_8DF9_4747_B49E_48C56317F5F9">
+				<source xmi:idref="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC">
+					<model ea_localid="3467" type="Class" name="epo-sub:Response"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B">
+					<model ea_localid="3470" type="Class" name="cccev:SupportedValue"/>
+					<role name="cccev:supportsValue" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5191"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Supported Value that the Evidence contains."/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+cccev:supportsValue"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_CE6EADDE_0D7D_40a5_B341_A616866CD789">
+				<source xmi:idref="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9">
+					<model ea_localid="1966" type="Class" name="cccev:Evidence"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B">
+					<model ea_localid="3470" type="Class" name="cccev:SupportedValue"/>
+					<role name="cccev:supportsValue" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5187"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Supported Value that the Evidence contains."/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+cccev:supportsValue"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_CA57E831_F2FE_4a87_9BA9_5CF8B7A9D5AB">
+				<source xmi:idref="EAID_02D4B752_188D_46ee_AF52_F2AAFF7E2E77">
+					<model ea_localid="3528" type="Class" name="epo-sub:CertificateInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
+					<model ea_localid="1952" type="Class" name="epo:Certificate"/>
+					<role name="epo-sub:summarisesInformationAboutCertificate" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5259"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Relation indicating the Certificate that the information refers to.&#xA;&#xA;WG approval 12/03/2024 "/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo-sub:summarisesInformationAboutCertificate"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_F0D24264_CD84_461f_AF53_509A8FB111D6">
+				<source xmi:idref="EAID_02D4B752_188D_46ee_AF52_F2AAFF7E2E77">
+					<model ea_localid="3528" type="Class" name="epo-sub:CertificateInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0">
+					<model ea_localid="1718" type="Class" name="epo:ContextDescription"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5260"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
+				<source xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
+					<model ea_localid="1628" type="Class" name="epo-sub:ESPD"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB">
+					<model ea_localid="1664" type="Class" name="epo-acc:ESPDRequest"/>
+					<role name="epo-sub:relatesToESPDRequest" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4784"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Is about an European Single Procurement Document (ESPD) Request.&#xA;&#xA;WG approval 05/03/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo-sub:relatesToESPDRequest"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_ACF95470_AB2B_4b7d_BCCF_3E7847170DBD">
+				<source xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
+					<model ea_localid="1628" type="Class" name="epo-sub:ESPD"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC">
+					<model ea_localid="3467" type="Class" name="epo-sub:Response"/>
+					<role name="epo-sub:specifiesResponse" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5184"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Relation indicating that an ESPD Response contains a Response.&#xA;&#xA;WG approval 12/03/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1..*" rt="+epo-sub:specifiesResponse"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_C7D18971_E3AA_4bc3_B35F_CBFE4CDAAA84">
+				<source xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
+					<model ea_localid="1628" type="Class" name="epo-sub:ESPD"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
+					<model ea_localid="878" type="Class" name="epo:Document"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="2754"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273">
+				<source xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
+					<model ea_localid="1628" type="Class" name="epo-sub:ESPD"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
+					<model ea_localid="1628" type="Class" name="epo-sub:ESPD"/>
+					<role name="epo-sub:refersToOtherESPDResponse" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5205"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Reference to other European Single Procurement Document (ESPD) Response.&#xA;&#xA;WG approval 05/03/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-sub:refersToOtherESPDResponse"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F">
+				<source xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
+					<model ea_localid="1628" type="Class" name="epo-sub:ESPD"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+					<model ea_localid="913" type="Class" name="org:Organization"/>
+					<role name="epo-sub:providesInformationOn" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5257"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Offers information about an instance of a concept.&#xA;&#xA;WG approval 05/03/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-sub:providesInformationOn"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_E453F729_4B4E_44c9_AD20_DD8131AF4BEF">
+				<source xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
+					<model ea_localid="958" type="Class" name="epo:Tender"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
+					<model ea_localid="1628" type="Class" name="epo-sub:ESPD"/>
+					<role name="epo:isSupportedBy" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="2828"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo:isSupportedBy"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_15E95E36_FC35_4adf_B5AC_F916221BB38E">
+				<source xmi:idref="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D">
+					<model ea_localid="3474" type="Class" name="epo-sub:LegalRepresentative"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_DE869DED_87AA_46a5_963D_EAEBF2AA6803">
+					<model ea_localid="3476" type="Class" name="epo-sub:PowerOfAttorney"/>
+					<role name="epo-sub:hasPowerOfAttorney" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5201"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Relation indicating that a Legal Representative has a Power of Attorney.&#xA;&#xA;WG approval 12/03/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-sub:hasPowerOfAttorney"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_1982F8A2_ECBE_47d6_9A92_7176519FD4A5">
+				<source xmi:idref="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D">
+					<model ea_localid="3474" type="Class" name="epo-sub:LegalRepresentative"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5">
+					<model ea_localid="2111" type="Class" name="epo:AuxiliaryParty"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5197"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_7775FD52_1FE1_445c_9B8B_96AA208D3134">
+				<source xmi:idref="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D">
+					<model ea_localid="3474" type="Class" name="epo-sub:LegalRepresentative"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
+					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
+					<role name="epo:actsOnBehalfOf" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5262"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:actsOnBehalfOf"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_C9AE0856_7B74_434f_BCD2_491FA097E6DE">
+				<source xmi:idref="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D">
+					<model ea_localid="3474" type="Class" name="epo-sub:LegalRepresentative"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_95FD9F3B_1F77_4e3c_A91D_72310583752E">
+					<model ea_localid="3475" type="Class" name="epo-sub:Mandate"/>
+					<role name="epo-sub:hasMandate" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5202"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Relation indicating that a Legal Representative has a Mandate.&#xA;&#xA;WG approval 12/03/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-sub:hasMandate"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_672E5CCE_F8C9_4117_A52B_56209E049485">
+				<source xmi:idref="EAID_95FD9F3B_1F77_4e3c_A91D_72310583752E">
+					<model ea_localid="3475" type="Class" name="epo-sub:Mandate"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
+					<model ea_localid="878" type="Class" name="epo:Document"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5200"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_23CC2B92_731F_4428_B333_8582A36D1244">
+				<source xmi:idref="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9">
+					<model ea_localid="3466" type="Class" name="epo-sub:NationalPreQualificationData"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-sub:providesOrganisationPreQualificationListingIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5181"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The identifier assigned to an economic operator in a national pre-qualification system or official list.&#xA;&#xA;WG approval 05/03/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-sub:providesOrganisationPreQualificationListi"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_87C6E00F_DAEB_4e79_8340_AC2FC83206DA">
+				<source xmi:idref="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9">
+					<model ea_localid="3466" type="Class" name="epo-sub:NationalPreQualificationData"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-sub:providesOrganisationEmployeeQuantity" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5179"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The number of people hired by the Organization.&#xA;&#xA;WG approval 05/03/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-sub:providesOrganisationEmployeeQuantity"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_9BF032E2_6893_45df_95FE_A08E92EA8618">
+				<source xmi:idref="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9">
+					<model ea_localid="3466" type="Class" name="epo-sub:NationalPreQualificationData"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-sub:providesOrganisationFinancialCapability" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5180"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="A monetary amount representing the financial capability of the Organization.&#xA;&#xA;Additional information:&#xA;Used to represent the general Turnover of the Organization (for statistical purposes).&#xA;&#xA;WG approval 05/03/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-sub:providesOrganisationFinancialCapability"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_B6D90197_EC7F_4a01_8047_2DAC846D9C03">
+				<source xmi:idref="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9">
+					<model ea_localid="3466" type="Class" name="epo-sub:NationalPreQualificationData"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+					<model ea_localid="913" type="Class" name="org:Organization"/>
+					<role name="epo-sub:concernsOrganisation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5177"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Relates to Organization.&#xA;&#xA;WG approval 05/03/2024&#xA;&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo-sub:concernsOrganisation"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_4CC20250_2603_476b_8725_C9307E8BA364">
+				<source xmi:idref="EAID_DE869DED_87AA_46a5_963D_EAEBF2AA6803">
+					<model ea_localid="3476" type="Class" name="epo-sub:PowerOfAttorney"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
+					<model ea_localid="878" type="Class" name="epo:Document"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5199"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_49631FAC_5F3D_4939_83C6_69057788A49B">
+				<source xmi:idref="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC">
+					<model ea_localid="3467" type="Class" name="epo-sub:Response"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_B7F675EC_18B3_49b1_AAF4_E0FAB88D85EE">
+					<model ea_localid="1969" type="Enumeration" name="at-voc:access-rights"/>
+					<role name="cccev:confidentialityLevelType" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5192"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="Security classification assigned to an Evidence e.g. classified, sensitive, public.&#xA;&#xA;Additional Information:&#xA;&#xA;Classifications should be defined by an organisation/country as an outcome of a security assessment."/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+cccev:confidentialityLevelType"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_5715AB6B_F88D_4b3e_857E_2AD843DEF3DE">
+				<source xmi:idref="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC">
+					<model ea_localid="3467" type="Class" name="epo-sub:Response"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_30DD6891_71FE_4f87_832B_477790550BBC">
+					<model ea_localid="3185" type="Class" name="cccev:InformationRequirement"/>
+					<role name="epo-sub:answersQuestion" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5189"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Relation indicating that the Response replies to a question.&#xA;&#xA;WG approval 12/03/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-sub:answersQuestion"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_93B47F0D_8871_4230_A6F8_522396CE72CF">
+				<source xmi:idref="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC">
+					<model ea_localid="3467" type="Class" name="epo-sub:Response"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9">
+					<model ea_localid="1966" type="Class" name="cccev:Evidence"/>
+					<role name="epo-sub:isReinforcedBy" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5190"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Relation indicating an Evidence that supports the Response.&#xA;&#xA;WG approval 12/03/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-sub:isReinforcedBy"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_B2FBB3C3_8542_4cd9_8B7E_A25D4A6C9048">
+				<source xmi:idref="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC">
+					<model ea_localid="3467" type="Class" name="epo-sub:Response"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
+					<model ea_localid="915" type="Class" name="epo:Period"/>
+					<role name="epo-sub:refersToApplicablePeriod" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5193"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Relation indicating the period to which the Response shall apply.&#xA;&#xA;WG approval 12/03/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-sub:refersToApplicablePeriod"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+		</connectors>
+		<primitivetypes>
+			<packagedElement xmi:type="uml:Package" xmi:id="EAPrimitiveTypesPackage" name="EA_PrimitiveTypes_Package">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAJavaTypesPackage" name="EA_Java_Types_Package">
+					<packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_rdf_PlainLiteral" name="rdf:PlainLiteral"/>
+					<packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_xsd_boolean" name="xsd:boolean"/>
+				</packagedElement>
+			</packagedElement>
+		</primitivetypes>
+		<profiles/>
+		<diagrams>
+			<diagram xmi:id="EAID_EECFED90_0561_419e_ACA0_11A555E18F49">
+				<model package="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" localID="518" owner="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" tpos="1"/>
+				<properties name="submission" type="Logical"/>
+				<project author="andreea" version="1.0" created="2024-02-06 11:31:21" modified="2024-07-11 13:51:31"/>
+				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=32C8F1AF;"/>
+				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
+				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
+				<extendedProperties/>
+				<elements>
+					<element geometry="Left=157;Top=540;Right=305;Bottom=611;" subject="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" seqno="1" style="DUID=DF47CF56;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1599;Top=761;Right=1806;Bottom=849;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="2" style="DUID=F64843FC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1982;Top=709;Right=2249;Bottom=797;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="3" style="DUID=321CED68;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=2044;Top=618;Right=2249;Bottom=688;" subject="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" seqno="4" style="DUID=FC42AE80;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1532;Top=627;Right=1871;Bottom=679;" subject="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" seqno="5" style="DUID=5488FD73;NSL=0;"/>
+					<element geometry="Left=688;Top=812;Right=867;Bottom=882;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="6" style="DUID=EA6D7AE2;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1608;Top=503;Right=1797;Bottom=573;" subject="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" seqno="7" style="DUID=607C57DA;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=330;Top=694;Right=562;Bottom=764;" subject="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" seqno="8" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=AD5DB35A;"/>
+					<element geometry="Left=724;Top=694;Right=823;Bottom=764;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="9" style="DUID=48707437;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=134;Top=316;Right=329;Bottom=456;" subject="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" seqno="10" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=8EB4BEC5;"/>
+					<element geometry="Left=1144;Top=218;Right=1234;Bottom=288;" subject="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" seqno="11" style="DUID=919A19D7;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1932;Top=508;Right=2022;Bottom=568;" subject="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40" seqno="12" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=D858C5F4;"/>
+					<element geometry="Left=2044;Top=508;Right=2134;Bottom=568;" subject="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" seqno="13" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=4E964F40;"/>
+					<element geometry="Left=1621;Top=66;Right=1820;Bottom=180;" subject="EAID_33E9269C_0B96_4b38_A129_C30771A9833F" seqno="14" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=35C6DD13;"/>
+					<element geometry="Left=1932;Top=317;Right=2134;Bottom=470;" subject="EAID_29678A10_6473_461a_BE84_76269B5BBD68" seqno="15" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=B047601D;"/>
+					<element geometry="Left=1576;Top=336;Right=1829;Bottom=450;" subject="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" seqno="16" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=44F1E995;"/>
+					<element geometry="Left=1621;Top=218;Right=1785;Bottom=288;" subject="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" seqno="17" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=4C1792D8;"/>
+					<element geometry="Left=1319;Top=218;Right=1490;Bottom=288;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" seqno="18" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=56839C81;"/>
+					<element geometry="Left=1359;Top=407;Right=1449;Bottom=477;" subject="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" seqno="19" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=40B8EE7B;"/>
+					<element geometry="Left=898;Top=412;Right=912;Bottom=426;" subject="EAID_70B4792E_F818_45db_80A4_32F092496FEF" seqno="20" style=" DUID=7219D4C9;"/>
+					<element geometry="Left=906;Top=478;Right=920;Bottom=492;" subject="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C" seqno="21" style=" DUID=232C1D9B;"/>
+					<element geometry="Left=635;Top=520;Right=913;Bottom=631;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="22" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=EE50BCFA;"/>
+					<element geometry="Left=1111;Top=550;Right=1265;Bottom=600;" subject="EAID_49EC0F16_408C_4b28_B611_0048946DC070" seqno="23" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=293DF811;"/>
+					<element geometry="Left=1079;Top=400;Right=1298;Bottom=485;" subject="EAID_96B284C4_E759_4bad_9655_04521F703750" seqno="24" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=47F89F85;"/>
+					<element geometry="Left=384;Top=340;Right=508;Bottom=432;" subject="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" seqno="25" style="NSL=0;DUID=4AA5FF13;"/>
+					<element geometry="Left=384;Top=540;Right=508;Bottom=610;" subject="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" seqno="26" style="NSL=0;DUID=8DFC7E16;"/>
+					<element geometry="SX=0;SY=6;EX=0;EY=6;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=210:CY=27:OX=90:OY=-24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_23CC2B92_731F_4428_B333_8582A36D1244" style="Mode=3;EOID=F64843FC;SOID=5488FD73;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=3;EX=4;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=64:OY=29:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=450:-844$;" subject="EAID_FC7073E1_3362_472f_B087_27A619B6C819" style="Mode=3;EOID=AD5DB35A;SOID=EA6D7AE2;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-42;SY=-2;EX=-70;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87:CY=14:OX=52:OY=14:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4714A192_0DFA_49f4_AB11_165E12CB38A6" style="Mode=3;EOID=47F89F85;SOID=293DF811;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=5;EX=-3;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1401:-570$;" subject="EAID_657CE8BE_2717_41d1_B80A_3B15D5AAC373" style="Mode=3;EOID=40B8EE7B;SOID=293DF811;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-20;SY=-42;EX=-20;EY=-56;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_46812517_A9DA_432d_A7B8_F5FEC69BBDA5" style="Mode=3;EOID=35C6DD13;SOID=47F89F85;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=57;SY=0;EX=52;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=143:CY=14:OX=96:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_E076346D_AFB2_421a_BBA1_4FFA393BE7FA" style="Mode=3;EOID=293DF811;SOID=47F89F85;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BD5C98D5_43D4_41be_9C21_84470056CF01" style="Mode=3;EOID=40B8EE7B;SOID=47F89F85;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=499;SCTR.TOP=-352;SCTR.RIGHT=542;SCTR.BOTTOM=-308;$LLB=;LLT=;LMT=;LMB=;LRT=CX=158:CY=27:OX=186:OY=-11:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=508:-352$542:-352$542:-308$499:-308$499:-340$;" subject="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273" style="Mode=3;EOID=4AA5FF13;SOID=4AA5FF13;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=75:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B" style="Mode=3;EOID=8DFC7E16;SOID=4AA5FF13;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;SX=27;SY=22;EX=27;EY=29;$LLB=;LLT=;LMT=;LMB=;LRT=CX=134:CY=14:OX=-3:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F" style="Mode=3;EOID=44F1E995;SOID=4AA5FF13;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C7D18971_E3AA_4bc3_B35F_CBFE4CDAAA84" style="Mode=3;EOID=8EB4BEC5;SOID=4AA5FF13;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-48;SY=-4;EX=-48;EY=-4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_881F7772_9A6C_4e5a_BB86_A2E25524B058" style="Mode=3;EOID=44F1E995;SOID=607C57DA;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=189:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-2:OY=5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_28460B26_E1D3_4c16_AB2B_CBE8A5D24AC5" style="Mode=3;EOID=293DF811;SOID=EE50BCFA;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=1;SY=-6;EX=1;EY=-6;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=51:CY=14:OX=37:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F3F440DD_AB87_4730_A6DF_915A5FB0B3DB" style="Mode=3;EOID=44F1E995;SOID=607C57DA;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=139;SY=0;EX=0;EY=-43;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=117:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=913:-485$;" subject="EAID_D01E7677_5AC2_42b1_AA17_2A8EC003CCFE" style="Mode=3;EOID=47F89F85;SOID=EE50BCFA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=0;EY=20;SX=107;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=160:CY=27:OX=36:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1808:-733$;" subject="EAID_9BF032E2_6893_45df_95FE_A08E92EA8618" style="Mode=3;EOID=321CED68;SOID=5488FD73;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=161:CY=27:OX=37:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_87C6E00F_DAEB_4e79_8340_AC2FC83206DA" style="Mode=3;EOID=FC42AE80;SOID=5488FD73;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-115;SY=1;EX=-115;EY=1;EDGE=1;SCME=0;SCTR=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=127:CY=14:OX=70:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B6D90197_EC7F_4a01_8047_2DAC846D9C03" style="Mode=3;EOID=44F1E995;SOID=5488FD73;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=7;SY=0;EX=45;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4E94CD77_EB61_4a9e_A6A4_14096262384A" style="Mode=3;EOID=DF47CF56;SOID=8DFC7E16;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=-131;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=-5:OY=-5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_E69DD4EA_847D_4a36_96C4_9709B72BA620" style="Mode=3;EOID=EE50BCFA;SOID=8DFC7E16;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=77:OY=-41:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_18CF5F1B_45DD_4b29_9E28_8D741E0840F3" style="Mode=3;EOID=AD5DB35A;SOID=8DFC7E16;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=-1;EX=0;EY=-1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_608CC8C6_3A48_4541_8467_9DDA71E8D534" style="Mode=3;EOID=F64843FC;SOID=EA6D7AE2;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=84:OY=17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_20732599_332F_4f0e_BFE6_593632EDB11F" style="Mode=3;EOID=48707437;SOID=EA6D7AE2;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_72A7614C_D179_4558_8F62_2FA41A99DF74" style="Mode=3;EOID=321CED68;SOID=EA6D7AE2;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC" style="Mode=3;EOID=321CED68;SOID=EA6D7AE2;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_55771AD3_C775_4324_AEBA_EA277D05F7E8" style="Mode=3;EOID=F64843FC;SOID=EA6D7AE2;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=73;SY=-2;EX=73;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=73:CY=14:OX=55:OY=16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0AA8BD10_946A_403c_B906_6DB183F74D9F" style="Mode=3;EOID=44F1E995;SOID=607C57DA;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=-24;EX=0;EY=16;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=95:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1497:-417$1497:-789$;" subject="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6" style="Mode=3;EOID=F64843FC;SOID=44F1E995;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-3;EX=111;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4" style="Mode=3;EOID=AD5DB35A;SOID=48707437;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=224;SCTR.TOP=-317;SCTR.RIGHT=239;SCTR.BOTTOM=-286;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=239:-316$239:-286$224:-286$224:-316$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=8EB4BEC5;SOID=8EB4BEC5;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=4;SCTR.LEFT=65;SCTR.TOP=-415;SCTR.RIGHT=150;SCTR.BOTTOM=-344;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=134:-344$65:-344$65:-415$134:-415$;" subject="EAID_39F3583F_0D40_4e9f_8018_10297955785C" style="Mode=3;EOID=8EB4BEC5;SOID=8EB4BEC5;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=217;SCTR.TOP=-319;SCTR.RIGHT=260;SCTR.BOTTOM=-295;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=82:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=260:-316$260:-295$217:-295$217:-316$;" subject="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9" style="Mode=3;EOID=8EB4BEC5;SOID=8EB4BEC5;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-29;SY=-38;EX=-29;EY=-38;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_1BEBAC59_19C6_4908_B93C_EED975A6974F" style="Mode=3;EOID=F64843FC;SOID=8EB4BEC5;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_3AA2C83C_532C_460c_99CE_63F041A42F06" style="Mode=3;EOID=F64843FC;SOID=8EB4BEC5;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4657FAEB_1A34_4ef7_947D_E6C47AAC7527" style="Mode=3;EOID=56839C81;SOID=919A19D7;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=0;SY=1;EX=0;EY=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_84F5E9DD_96DE_4ca7_8CA6_9C68826B377B" style="Mode=3;EOID=7219D4C9;SOID=232C1D9B;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=4;EX=-3;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=56:CY=14:OX=36:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2030:-119$;" subject="EAID_A4228FCF_2B3C_44e6_BD17_379180274988" style="Mode=3;EOID=B047601D;SOID=35C6DD13;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=8;SY=-1;EX=8;EY=-1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=48:OY=-9:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D0F25E0B_E148_41e7_8C52_BAE14F5149F6" style="Mode=3;EOID=4E964F40;SOID=B047601D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-8;SY=-1;EX=-8;EY=-1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=76:CY=14:OX=45:OY=-12:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_626183B8_93AC_4300_B227_85988E5F2016" style="Mode=3;EOID=D858C5F4;SOID=B047601D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=30;SY=0;EX=0;EY=23;$LLB=;LLT=;LMT=;LMB=;LRT=CX=80:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=804:-419$;" subject="EAID_9B2D6DCC_5092_48cf_878A_8035A42A43F9" style="Mode=3;EOID=47F89F85;SOID=EE50BCFA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-3;EX=0;EY=-28;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1479:-396$1479:-833$;" subject="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB" style="Mode=3;EOID=F64843FC;SOID=44F1E995;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_29996CD1_F979_44e0_95A0_E058E0BD5450" style="Mode=3;EOID=8EB4BEC5;SOID=DF47CF56;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=1823;SCTR.TOP=-347;SCTR.RIGHT=1872;SCTR.BOTTOM=-316;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=107:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=1829:-347$1872:-347$1872:-316$1823:-316$1823:-336$;" subject="EAID_2FF93267_E672_481d_B370_202D9A0110E0" style="Mode=3;EOID=44F1E995;SOID=44F1E995;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-2;SY=12;EX=-2;EY=12;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=56:CY=14:OX=-10:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9F23612C_1865_4c8b_82ED_0BAA7D433501" style="Mode=3;EOID=B047601D;SOID=44F1E995;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_19AD8C15_4D9D_48f2_A3E1_A997E86942D2" style="Mode=3;EOID=4C1792D8;SOID=44F1E995;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-2;SY=-28;EX=-2;EY=-28;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_6A50E4FC_E8DA_47c5_AD39_5BA2A66950B9" style="Mode=3;EOID=B047601D;SOID=44F1E995;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=126;SY=-2;EX=77;EY=-54;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=62:OY=17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_C2D44282_10C8_422c_82F3_D4CC50B411F4" style="Mode=3;EOID=35C6DD13;SOID=44F1E995;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-30;SY=12;EX=-30;EY=12;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_1FFF54A3_B491_40f9_AB43_E5A825C5F2E2" style="Mode=3;EOID=4E964F40;SOID=44F1E995;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=-38;SY=15;EX=-56;EY=15;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_319F106B_6066_4ba7_B084_12D7110FE9E0" style="Mode=3;EOID=F64843FC;SOID=4C1792D8;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=61:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6" style="Mode=3;EOID=4C1792D8;SOID=56839C81;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=2;SY=0;EX=0;EY=2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=113:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1406:-121$;" subject="EAID_4B6E629B_BECA_4e04_B7C9_925B517BC914" style="Mode=3;EOID=35C6DD13;SOID=56839C81;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_93385F64_990A_44d0_A266_DDF9F55EABCE" style="Mode=3;EOID=56839C81;SOID=40B8EE7B;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=92:OY=-31:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=48707437;SOID=EE50BCFA;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EX=0;EY=-15;SX=0;SY=-67;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=65:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2253:-460$2253:-820$;" subject="EAID_C6F7D14A_11BF_430e_ABED_4C9AC22FFF2A" style="Mode=3;EOID=F64843FC;SOID=B047601D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+				</elements>
+			</diagram>
+			<diagram xmi:id="EAID_D71DB35F_3004_48e5_8866_708D88C3BB20">
+				<model package="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" localID="522" owner="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" tpos="3"/>
+				<properties name="submission response" type="Logical"/>
+				<project author="andreea" version="1.0" created="2024-02-08 16:07:41" modified="2024-07-11 13:48:52"/>
+				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=AC81D177;"/>
+				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
+				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
+				<extendedProperties/>
+				<elements>
+					<element geometry="Left=838;Top=160;Right=1113;Bottom=230;" subject="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D" seqno="1" style="DUID=BDECA88E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=351;Top=160;Right=583;Bottom=230;" subject="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" seqno="2" style="DUID=D917CF60;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=47;Top=367;Right=292;Bottom=504;" subject="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" seqno="3" style="DUID=7FB3CFC3;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=30;Top=205;Right=308;Bottom=316;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="4" style="DUID=B4C9BD0C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=408;Top=410;Right=524;Bottom=462;" subject="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" seqno="5" style="DUID=3EE231B5;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=339;Top=670;Right=592;Bottom=781;" subject="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" seqno="6" style="DUID=8A2147CC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1020;Top=426;Right=1244;Bottom=496;" subject="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" seqno="7" style="DUID=D8C3AB2C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=727;Top=426;Right=908;Bottom=496;" subject="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" seqno="8" style="DUID=3692932E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=733;Top=653;Right=823;Bottom=713;" subject="EAID_B7F675EC_18B3_49b1_AAF4_E0FAB88D85EE" seqno="9" style="DUID=A238C92F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=409;Top=546;Right=525;Bottom=616;" subject="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" seqno="10" style="DUID=91285388;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=890;Top=282;Right=1061;Bottom=352;" subject="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" seqno="11" style="DUID=6552D208;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=616;Top=288;Right=760;Bottom=348;" subject="EAID_30DD6891_71FE_4f87_832B_477790550BBC" seqno="12" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=18AD0FF1;"/>
+					<element geometry="Left=643;Top=546;Right=733;Bottom=616;" subject="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" seqno="13" style="NSL=0;DUID=1BC92C8C;"/>
+					<element geometry="Left=1181;Top=546;Right=1355;Bottom=616;" subject="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" seqno="14" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=28546C02;"/>
+					<element geometry="Left=895;Top=729;Right=1055;Bottom=775;" subject="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B" seqno="15" style="DUID=EB41E43B;NSL=0;"/>
+					<element geometry="Left=890;Top=545;Right=1061;Bottom=617;" subject="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" seqno="16" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=6F216BE8;"/>
+					<element geometry="SX=0;SY=4;EX=6;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=101:CY=14:OX=53:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1274:-748$;" subject="EAID_CFC6423E_1A9A_47fb_8C22_10175EEF3A31" style="Mode=3;EOID=28546C02;SOID=EB41E43B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=34;SY=-55;EX=34;EY=-35;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D01BEE04_A51F_434f_9F2B_CD75C658FF42" style="Mode=3;EOID=D8C3AB2C;SOID=8A2147CC;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=24;SY=-44;EX=24;EY=-30;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8B71787B_152C_48e6_B55B_A94D38ED4C2F" style="Mode=3;EOID=6F216BE8;SOID=8A2147CC;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_2F19249F_490A_42c9_B131_6D083DB9839A" style="Mode=3;EOID=6F216BE8;SOID=8A2147CC;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=80:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_18CF5F1B_45DD_4b29_9E28_8D741E0840F3" style="Mode=3;EOID=D917CF60;SOID=3EE231B5;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=98:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D3DD6F7E_CC4D_4861_963A_7FE0F57DA5D8" style="Mode=3;EOID=7FB3CFC3;SOID=3EE231B5;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-35;SY=0;EX=0;EY=-30;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=4:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=431:-290$;" subject="EAID_E69DD4EA_847D_4a36_96C4_9709B72BA620" style="Mode=3;EOID=B4C9BD0C;SOID=3EE231B5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=3;SCTR.LEFT=114;SCTR.TOP=-525;SCTR.RIGHT=145;SCTR.BOTTOM=-503;$LLB=;LLT=;LMT=;LMB=;LRT=CX=100:CY=14:OX=43:OY=20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=114:-504$114:-525$145:-525$145:-504$;" subject="EAID_7EE70932_F57C_4861_BE52_91F3F7270840" style="Mode=3;EOID=7FB3CFC3;SOID=7FB3CFC3;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-13;SY=0;EX=0;EY=4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=55:OY=14:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F955E894_651A_4a8b_A411_E8DA312BC449" style="Mode=3;EOID=B4C9BD0C;SOID=7FB3CFC3;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_ACA750D2_84FF_4e07_B735_322F9131A442" style="Mode=3;EOID=BDECA88E;SOID=D917CF60;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C289FCF6_9241_4f06_BF53_F99082792332" style="Mode=3;EOID=6552D208;SOID=BDECA88E;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=116:CY=14:OX=59:OY=44:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_6D204966_4BC2_452d_9B78_BA9B3F1E9FF6" style="Mode=3;EOID=6552D208;SOID=6F216BE8;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=28;EX=41;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=93:CY=14:OX=65:OY=30:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=858:-553$;" subject="EAID_1864913C_FE85_48db_829F_004DFE769A97" style="Mode=3;EOID=3692932E;SOID=6F216BE8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=0;EY=16;SX=-69;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=128:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=906:-667$;" subject="EAID_A7C105EE_0251_4249_919A_46302D44059E" style="Mode=3;EOID=A238C92F;SOID=6F216BE8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=556;SCTR.TOP=-683;SCTR.RIGHT=621;SCTR.BOTTOM=-643;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=131:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=592:-683$621:-683$621:-643$556:-643$556:-670$;" subject="EAID_2FF93267_E672_481d_B370_202D9A0110E0" style="Mode=3;EOID=8A2147CC;SOID=8A2147CC;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6492D4E3_9631_45d4_9596_5EC3247529A2" style="Mode=3;EOID=6552D208;SOID=18AD0FF1;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;EX=-44;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=113:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_ACF95470_AB2B_4b7d_BCCF_3E7847170DBD" style="Mode=3;EOID=1BC92C8C;SOID=91285388;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=377;SCTR.TOP=-558;SCTR.RIGHT=427;SCTR.BOTTOM=-511;$LLB=;LLT=;LMT=;LMB=;LRT=CX=158:CY=27:OX=69:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=427:-546$427:-511$377:-511$377:-558$409:-558$;" subject="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273" style="Mode=3;EOID=91285388;SOID=91285388;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=-1;EX=1;EY=-1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=69:OY=16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B" style="Mode=3;EOID=3EE231B5;SOID=91285388;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;SX=3;SY=2;EX=5;EY=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=134:CY=14:OX=80:OY=-23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F" style="Mode=3;EOID=8A2147CC;SOID=91285388;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=4;SCTR.LEFT=867;SCTR.TOP=-391;SCTR.RIGHT=915;SCTR.BOTTOM=-339;$LLB=;LLT=;LMT=;LMB=;LRT=CX=114:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=890:-339$867:-339$867:-391$915:-391$915:-352$;" subject="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F" style="Mode=3;EOID=6552D208;SOID=6552D208;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=1;EX=-87;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_8990AB87_7AAE_4276_AA04_83E4BB664FCB" style="Mode=3;EOID=28546C02;SOID=6F216BE8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=6;SY=12;EX=6;EY=12;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_110A81E5_E1CC_45be_BCFD_56F87C51B05A" style="Mode=3;EOID=B4C9BD0C;SOID=18AD0FF1;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=47:OY=-25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_CE6EADDE_0D7D_40a5_B341_A616866CD789" style="Mode=3;EOID=EB41E43B;SOID=6F216BE8;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=27;EX=-47;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=140:CY=14:OX=72:OY=17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=770:-554$;" subject="EAID_B2FBB3C3_8542_4cd9_8B7E_A25D4A6C9048" style="Mode=3;EOID=3692932E;SOID=1BC92C8C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-21;EX=-4;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=128:CY=14:OX=70:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=774:-602$;" subject="EAID_49631FAC_5F3D_4939_83C6_69057788A49B" style="Mode=3;EOID=A238C92F;SOID=1BC92C8C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-1;SY=0;EX=0;EY=2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=687:-750$;" subject="EAID_3EE371EF_8DF9_4747_B49E_48C56317F5F9" style="Mode=3;EOID=EB41E43B;SOID=1BC92C8C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=0:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_93B47F0D_8871_4230_A6F8_522396CE72CF" style="Mode=3;EOID=6F216BE8;SOID=1BC92C8C;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-4;SY=0;EX=-4;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=110:CY=14:OX=49:OY=32:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_5715AB6B_F88D_4b3e_857E_2AD843DEF3DE" style="Mode=3;EOID=18AD0FF1;SOID=1BC92C8C;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;SX=-8;SY=0;EX=0;EY=29;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1124:-552$;" subject="EAID_04EC0265_2665_47d4_AEDA_E49049545B3B" style="Mode=3;EOID=6F216BE8;SOID=D8C3AB2C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=2;EY=0;SX=0;SY=7;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=77:CY=14:OX=47:OY=-22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1270:-310$;" subject="EAID_4CC3B6CA_493A_4ff6_BB1B_A5C475115AB1" style="Mode=3;EOID=28546C02;SOID=6552D208;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+				</elements>
+			</diagram>
+			<diagram xmi:id="EAID_ADDA7381_B80A_426d_9FF6_137732CADDEF">
+				<model package="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" localID="523" owner="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" tpos="4"/>
+				<properties name="submission eo roles" type="Logical"/>
+				<project author="andreea" version="1.0" created="2024-02-13 11:21:44" modified="2024-03-08 12:37:57"/>
+				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=D64F6804;"/>
+				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
+				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
+				<extendedProperties/>
+				<elements>
+					<element geometry="Left=1269;Top=389;Right=1359;Bottom=424;" subject="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32" seqno="1" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=C9ED4C22;"/>
+					<element geometry="Left=1599;Top=389;Right=1689;Bottom=424;" subject="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51" seqno="2" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=1E4B000B;"/>
+					<element geometry="Left=1379;Top=389;Right=1469;Bottom=424;" subject="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" seqno="3" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=C506BCAA;"/>
+					<element geometry="Left=1489;Top=389;Right=1579;Bottom=424;" subject="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" seqno="4" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=723B70F9;"/>
+					<element geometry="Left=420;Top=491;Right=510;Bottom=551;" subject="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" seqno="5" style="DUID=C2D00891;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=420;Top=584;Right=510;Bottom=644;" subject="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40" seqno="6" style="DUID=3B4DF54F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=908;Top=509;Right=1107;Bottom=623;" subject="EAID_33E9269C_0B96_4b38_A129_C30771A9833F" seqno="7" style="DUID=4F502937;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=615;Top=491;Right=817;Bottom=644;" subject="EAID_29678A10_6473_461a_BE84_76269B5BBD68" seqno="8" style="DUID=1B858DBA;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=590;Top=342;Right=843;Bottom=443;" subject="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" seqno="9" style="DUID=1EE9182B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=635;Top=177;Right=799;Bottom=247;" subject="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" seqno="10" style="DUID=4B04111B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=645;Top=751;Right=787;Bottom=786;" subject="EAID_DE869DED_87AA_46a5_963D_EAEBF2AA6803" seqno="11" style="DUID=202280B7;"/>
+					<element geometry="Left=671;Top=676;Right=761;Bottom=711;" subject="EAID_95FD9F3B_1F77_4e3c_A91D_72310583752E" seqno="12" style="DUID=CDDE0738;"/>
+					<element geometry="Left=287;Top=676;Right=482;Bottom=816;" subject="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" seqno="13" style="DUID=8803E427;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1434;Top=287;Right=1524;Bottom=321;" subject="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" seqno="14" style="DUID=C681E638;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1134;Top=288;Right=1224;Bottom=321;" subject="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5" seqno="15" style="DUID=9E550157;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1093;Top=177;Right=1264;Bottom=247;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" seqno="16" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=F1441E44;"/>
+					<element geometry="Left=1106;Top=389;Right=1251;Bottom=424;" subject="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D" seqno="17" style="DUID=5C7FFE28;"/>
+					<element geometry="Left=323;Top=368;Right=447;Bottom=417;" subject="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" seqno="18" style="NSL=0;DUID=F20F5B52;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=267;SCTR.TOP=-690;SCTR.RIGHT=312;SCTR.BOTTOM=-656;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=24:OY=-10:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=312:-676$312:-656$267:-656$267:-690$287:-690$;" subject="EAID_39F3583F_0D40_4e9f_8018_10297955785C" style="Mode=3;EOID=8803E427;SOID=8803E427;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=9;SY=15;EX=9;EY=15;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_199C3BDF_913A_42e4_A409_64CB2CE61248" style="Mode=3;EOID=C681E638;SOID=C506BCAA;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-5;SY=16;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_5729A98B_A925_4816_AEF4_9EBDE5851B98" style="Mode=3;EOID=C681E638;SOID=1E4B000B;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C7D18971_E3AA_4bc3_B35F_CBFE4CDAAA84" style="Mode=3;EOID=8803E427;SOID=F20F5B52;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=8;SY=-2;EX=8;EY=-2;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=134:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F" style="Mode=3;EOID=1EE9182B;SOID=F20F5B52;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=353;SCTR.TOP=-369;SCTR.RIGHT=414;SCTR.BOTTOM=-340;$LLB=;LLT=;LMT=;LMB=;LRT=CX=174:CY=14:OX=128:OY=-29:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=414:-368$414:-340$353:-340$353:-368$;" subject="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273" style="Mode=3;EOID=F20F5B52;SOID=F20F5B52;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=61;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87:CY=14:OX=-11:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1239:-304$;" subject="EAID_7775FD52_1FE1_445c_9B8B_96AA208D3134" style="Mode=3;EOID=C681E638;SOID=5C7FFE28;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_1982F8A2_ECBE_47d6_9A92_7176519FD4A5" style="Mode=3;EOID=9E550157;SOID=5C7FFE28;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=41;SY=0;EX=0;EY=4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=125:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1219:-764$;" subject="EAID_15E95E36_FC35_4adf_B5AC_F916221BB38E" style="Mode=3;EOID=202280B7;SOID=5C7FFE28;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-33;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=92:CY=14:OX=12:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1145:-693$;" subject="EAID_C9AE0856_7B74_434f_BCD2_491FA097E6DE" style="Mode=3;EOID=CDDE0738;SOID=5C7FFE28;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-19;EX=34;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=113:CY=14:OX=72:OY=-28:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1041:-231$;" subject="EAID_4B6E629B_BECA_4e04_B7C9_925B517BC914" style="Mode=3;EOID=4F502937;SOID=F1441E44;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=61:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6" style="Mode=3;EOID=4B04111B;SOID=F1441E44;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-1;SY=0;EX=0;EY=-26;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_AE2DB18B_3AF3_4133_AE88_A4F91623D21B" style="Mode=3;EOID=F1441E44;SOID=9E550157;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A27A53B2_A6D1_4fdd_A43E_D33DC6607852" style="Mode=3;EOID=C681E638;SOID=723B70F9;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=4;SCTR.LEFT=267;SCTR.TOP=-840;SCTR.RIGHT=313;SCTR.BOTTOM=-799;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=-2:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=287:-799$267:-799$267:-840$313:-840$313:-816$;" subject="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9" style="Mode=3;EOID=8803E427;SOID=8803E427;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=17;SY=16;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_28774B07_2278_44a1_B47E_F671B4F00F63" style="Mode=3;EOID=C681E638;SOID=C9ED4C22;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=3;SCTR.LEFT=473;SCTR.TOP=-838;SCTR.RIGHT=506;SCTR.BOTTOM=-802;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=122:OY=33:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=473:-816$473:-838$506:-838$506:-802$482:-802$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=8803E427;SOID=8803E427;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-45;SY=-4;EX=-5;EY=41;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_672E5CCE_F8C9_4117_A52B_56209E049485" style="Mode=3;EOID=8803E427;SOID=CDDE0738;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=5;SY=0;EX=0;EY=-28;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4CC20250_2603_476b_8725_C9307E8BA364" style="Mode=3;EOID=8803E427;SOID=202280B7;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=-1;EY=0;SX=0;SY=-37;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=116:CY=14:OX=74:OY=-21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=464:-429$;" subject="EAID_1FFF54A3_B491_40f9_AB43_E5A825C5F2E2" style="Mode=3;EOID=C2D00891;SOID=1EE9182B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;SX=0;SY=2;EX=-58;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=58:OY=-46:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=949:-390$;" subject="EAID_C2D44282_10C8_422c_82F3_D4CC50B411F4" style="Mode=3;EOID=4F502937;SOID=1EE9182B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-64;SY=-1;EX=-64;EY=-1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=52:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_6A50E4FC_E8DA_47c5_AD39_5BA2A66950B9" style="Mode=3;EOID=1B858DBA;SOID=1EE9182B;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_19AD8C15_4D9D_48f2_A3E1_A997E86942D2" style="Mode=3;EOID=4B04111B;SOID=1EE9182B;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=40;SY=0;EX=40;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=56:CY=14:OX=37:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9F23612C_1865_4c8b_82ED_0BAA7D433501" style="Mode=3;EOID=1B858DBA;SOID=1EE9182B;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=561;SCTR.TOP=-358;SCTR.RIGHT=602;SCTR.BOTTOM=-320;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=10:OY=-11:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=602:-342$602:-320$561:-320$561:-358$590:-358$;" subject="EAID_2FF93267_E672_481d_B370_202D9A0110E0" style="Mode=3;EOID=1EE9182B;SOID=1EE9182B;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EX=0;EY=-7;SX=0;SY=-7;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=76:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_626183B8_93AC_4300_B227_85988E5F2016" style="Mode=3;EOID=3B4DF54F;SOID=1B858DBA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=4;SY=6;EX=4;EY=6;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D0F25E0B_E148_41e7_8C52_BAE14F5149F6" style="Mode=3;EOID=C2D00891;SOID=1B858DBA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=0;EY=-13;SX=-1;SY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=56:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_A4228FCF_2B3C_44e6_BD17_379180274988" style="Mode=3;EOID=1B858DBA;SOID=4F502937;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=3;SY=0;EX=0;EY=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1482:-209$;" subject="EAID_4657FAEB_1A34_4ef7_947D_E6C47AAC7527" style="Mode=3;EOID=F1441E44;SOID=C681E638;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+				</elements>
+			</diagram>
+			<diagram xmi:id="EAID_94074245_1A03_44a0_83B7_7B182F8F5B41">
+				<model package="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" localID="527" owner="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" tpos="5"/>
+				<properties name="submission eo sheltered" type="Logical"/>
+				<project author="andreea" version="1.0" created="2024-02-16 06:42:19" modified="2024-03-12 16:08:26"/>
+				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=A32869B6;"/>
+				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
+				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
+				<extendedProperties/>
+				<elements>
+					<element geometry="Left=17;Top=42;Right=141;Bottom=112;" subject="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" seqno="1" style="NSL=0;DUID=9EF317AE;"/>
+					<element geometry="Left=688;Top=181;Right=778;Bottom=241;" subject="EAID_31165801_5B33_4e47_B39A_04F149020988" seqno="2" style="DUID=D17C4820;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=595;Top=34;Right=870;Bottom=119;" subject="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D" seqno="3" style="DUID=B5D46238;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=319;Top=42;Right=551;Bottom=112;" subject="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" seqno="4" style="DUID=11EEA035;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=362;Top=189;Right=507;Bottom=233;" subject="EAID_432BFDAD_99CD_40ab_A159_824F0F6571E2" seqno="5" style="DUID=AD1BBB21;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=13;Top=181;Right=145;Bottom=240;" subject="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" seqno="6" style="DUID=DEED4E7C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=-10:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_18CF5F1B_45DD_4b29_9E28_8D741E0840F3" style="Mode=3;EOID=11EEA035;SOID=9EF317AE;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=39:CY=14:OX=27:OY=-18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D84D8FB5_6889_47af_B88A_A418F4281BF1" style="Mode=3;EOID=D17C4820;SOID=B5D46238;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_ACA750D2_84FF_4e07_B735_322F9131A442" style="Mode=3;EOID=B5D46238;SOID=11EEA035;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_E51D25BC_E9FB_423c_BFBF_00E3B99864B4" style="Mode=3;EOID=11EEA035;SOID=AD1BBB21;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=80;SCTR.TOP=-182;SCTR.RIGHT=111;SCTR.BOTTOM=-152;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=111:-181$111:-152$80:-152$80:-181$;" subject="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273" style="Mode=3;EOID=DEED4E7C;SOID=DEED4E7C;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=72:OY=20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B" style="Mode=3;EOID=9EF317AE;SOID=DEED4E7C;Color=-1;LWidth=0;Hidden=0;"/>
+				</elements>
+			</diagram>
+			<diagram xmi:id="EAID_71E43A2B_6D3D_4d9e_91FD_0F721EA0B021">
+				<model package="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" localID="528" owner="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" tpos="7"/>
+				<properties name="submission eo pre-qualification system" type="Logical"/>
+				<project author="andreea" version="1.0" created="2024-02-16 06:42:50" modified="2024-03-12 16:19:16"/>
+				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=2E168156;"/>
+				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
+				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
+				<extendedProperties/>
+				<elements>
+					<element geometry="Left=29;Top=79;Right=268;Bottom=149;" subject="EAID_02D4B752_188D_46ee_AF52_F2AAFF7E2E77" seqno="1" style="DUID=4B1E4340;"/>
+					<element geometry="Left=860;Top=205;Right=1067;Bottom=293;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="2" style="DUID=65B925D1;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=486;Top=346;Right=739;Bottom=470;" subject="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" seqno="3" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=B3CC1BAD;"/>
+					<element geometry="Left=527;Top=218;Right=698;Bottom=280;" subject="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" seqno="4" style="NSL=0;DUID=2605C912;"/>
+					<element geometry="Left=860;Top=92;Right=950;Bottom=135;" subject="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1" seqno="5" style="NSL=0;DUID=734CDEDA;"/>
+					<element geometry="Left=493;Top=78;Right=732;Bottom=150;" subject="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" seqno="6" style="NSL=0;DUID=ABE1F8A6;"/>
+					<element geometry="Left=210;Top=220;Right=386;Bottom=278;" subject="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" seqno="7" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=7414B6BE;"/>
+					<element geometry="Left=197;Top=388;Right=337;Bottom=428;" subject="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" seqno="8" style="DUID=4410436D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="SX=0;SY=-18;EX=57;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=53:OY=14:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1020:-426$;" subject="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB" style="Mode=3;EOID=65B925D1;SOID=B3CC1BAD;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=22;EX=-16;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=95:CY=14:OX=46:OY=25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=947:-386$;" subject="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6" style="Mode=3;EOID=65B925D1;SOID=B3CC1BAD;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_2F19249F_490A_42c9_B131_6D083DB9839A" style="Mode=3;EOID=2605C912;SOID=B3CC1BAD;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=-1;SY=7;EX=0;EY=7;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=195:CY=14:OX=108:OY=25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_8B71787B_152C_48e6_B55B_A94D38ED4C2F" style="Mode=3;EOID=2605C912;SOID=B3CC1BAD;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=114;SY=-5;EX=61;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D01BEE04_A51F_434f_9F2B_CD75C658FF42" style="Mode=3;EOID=ABE1F8A6;SOID=B3CC1BAD;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=738;SCTR.TOP=-372;SCTR.RIGHT=769;SCTR.BOTTOM=-356;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=739:-372$769:-372$769:-356$739:-356$;" subject="EAID_2FF93267_E672_481d_B370_202D9A0110E0" style="Mode=3;EOID=B3CC1BAD;SOID=B3CC1BAD;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=2;EX=0;EY=-1;SX=0;SY=-1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=-4:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7F56C70D_D0B9_4ad4_9CB4_9A6821D5E3E1" style="Mode=3;EOID=65B925D1;SOID=2605C912;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=4;SY=1;EX=4;EY=-1;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=93:CY=14:OX=19:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1864913C_FE85_48db_829F_004DFE769A97" style="Mode=2;EOID=7414B6BE;SOID=2605C912;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=-2;EX=0;EY=-2;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=-1:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_97176015_1FBF_4d9c_9A77_C246A6F21E71" style="Mode=2;EOID=734CDEDA;SOID=ABE1F8A6;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=-1;EY=-16;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_04EC0265_2665_47d4_AEDA_E49049545B3B" style="Mode=3;EOID=2605C912;SOID=ABE1F8A6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=336;SCTR.TOP=-413;SCTR.RIGHT=367;SCTR.BOTTOM=-398;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=337:-413$367:-413$367:-398$337:-398$;" subject="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273" style="Mode=3;EOID=4410436D;SOID=4410436D;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=134:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F" style="Mode=3;EOID=B3CC1BAD;SOID=4410436D;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=200:CY=14:OX=-7:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_CA57E831_F2FE_4a87_9BA9_5CF8B7A9D5AB" style="Mode=3;EOID=ABE1F8A6;SOID=4B1E4340;Color=-1;LWidth=0;Hidden=0;"/>
+				</elements>
+			</diagram>
+			<diagram xmi:id="EAID_F3B9C2EE_40B3_4257_AFB2_39EE389FC525">
+				<model package="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" localID="530" owner="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" tpos="6"/>
+				<properties name="submission eo group" type="Logical"/>
+				<project author="andreea" version="1.0" created="2024-02-16 07:02:49" modified="2024-03-12 16:09:23"/>
+				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=D7E09F2B;"/>
+				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
+				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
+				<extendedProperties/>
+				<elements>
+					<element geometry="Left=9;Top=277;Right=99;Bottom=312;" subject="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32" seqno="1" style="DUID=2680FDBB;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=306;Top=277;Right=396;Bottom=312;" subject="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51" seqno="2" style="DUID=062B2D00;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=108;Top=277;Right=198;Bottom=312;" subject="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" seqno="3" style="DUID=CC54E83B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=207;Top=277;Right=297;Bottom=312;" subject="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" seqno="4" style="DUID=8BA75646;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=958;Top=89;Right=1165;Bottom=177;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="5" style="DUID=F20C0509;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=710;Top=382;Right=899;Bottom=433;" subject="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" seqno="6" style="DUID=91BF6BAB;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=678;Top=213;Right=931;Bottom=314;" subject="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" seqno="7" style="DUID=814BA23B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=722;Top=98;Right=886;Bottom=168;" subject="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" seqno="8" style="DUID=B309AF7A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=417;Top=98;Right=588;Bottom=168;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" seqno="9" style="DUID=B2135753;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=157;Top=98;Right=247;Bottom=168;" subject="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" seqno="10" style="DUID=3406B990;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=417;Top=221;Right=536;Bottom=305;" subject="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" seqno="11" style="DUID=54B804E6;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="SX=0;SY=-15;EX=48;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=50:OY=32:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1109:-278$;" subject="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB" style="Mode=3;EOID=F20C0509;SOID=814BA23B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=376;SCTR.TOP=-240;SCTR.RIGHT=436;SCTR.BOTTOM=-194;$LLB=;LLT=;LMT=;LMB=;LRT=CX=158:CY=27:OX=76:OY=-22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=436:-221$436:-194$376:-194$376:-240$417:-240$;" subject="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273" style="Mode=3;EOID=54B804E6;SOID=54B804E6;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4657FAEB_1A34_4ef7_947D_E6C47AAC7527" style="Mode=3;EOID=B2135753;SOID=3406B990;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=61:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6" style="Mode=3;EOID=B309AF7A;SOID=B2135753;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_319F106B_6066_4ba7_B084_12D7110FE9E0" style="Mode=3;EOID=F20C0509;SOID=B309AF7A;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_19AD8C15_4D9D_48f2_A3E1_A997E86942D2" style="Mode=3;EOID=B309AF7A;SOID=814BA23B;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=4;SY=0;EX=-100;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=134:CY=14:OX=-2:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F" style="Mode=3;EOID=814BA23B;SOID=54B804E6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=16;EX=-22;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=95:CY=14:OX=42:OY=19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1039:-247$;" subject="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6" style="Mode=3;EOID=F20C0509;SOID=814BA23B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_28774B07_2278_44a1_B47E_F671B4F00F63" style="Mode=3;EOID=3406B990;SOID=2680FDBB;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-2;SY=0;EX=-2;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=51:CY=14:OX=32:OY=32:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F3F440DD_AB87_4730_A6DF_915A5FB0B3DB" style="Mode=3;EOID=814BA23B;SOID=91BF6BAB;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=63;SY=2;EX=63;EY=2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=73:CY=14:OX=47:OY=19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0AA8BD10_946A_403c_B906_6DB183F74D9F" style="Mode=3;EOID=814BA23B;SOID=91BF6BAB;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-58;SY=-4;EX=-58;EY=-4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_881F7772_9A6C_4e5a_BB86_A2E25524B058" style="Mode=3;EOID=814BA23B;SOID=91BF6BAB;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A27A53B2_A6D1_4fdd_A43E_D33DC6607852" style="Mode=3;EOID=3406B990;SOID=8BA75646;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_199C3BDF_913A_42e4_A409_64CB2CE61248" style="Mode=3;EOID=3406B990;SOID=CC54E83B;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_5729A98B_A925_4816_AEF4_9EBDE5851B98" style="Mode=3;EOID=3406B990;SOID=062B2D00;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=719;SCTR.TOP=-222;SCTR.RIGHT=756;SCTR.BOTTOM=-190;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=68:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=756:-213$756:-190$719:-190$719:-213$;" subject="EAID_2FF93267_E672_481d_B370_202D9A0110E0" style="Mode=3;EOID=814BA23B;SOID=814BA23B;Color=-1;LWidth=0;Hidden=0;"/>
+				</elements>
+			</diagram>
+			<diagram xmi:id="EAID_7390C0BE_0F05_4823_ABE3_07757EF6B2CF">
+				<model package="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" localID="532" owner="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" tpos="8"/>
+				<properties name="submission eo reduction" type="Logical"/>
+				<project author="andreea" version="1.0" created="2024-02-20 11:14:07" modified="2024-03-12 16:35:55"/>
+				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=53FF5D6D;"/>
+				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
+				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
+				<extendedProperties/>
+				<elements>
+					<element geometry="Left=676;Top=115;Right=847;Bottom=177;" subject="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" seqno="1" style="DUID=7FCD0B5A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=593;Top=257;Right=846;Bottom=381;" subject="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" seqno="2" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=4EA007D2;"/>
+					<element geometry="Left=262;Top=118;Right=501;Bottom=173;" subject="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" seqno="3" style="NSL=0;DUID=E89FDA2F;"/>
+					<element geometry="Left=310;Top=297;Right=453;Bottom=341;" subject="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" seqno="4" style="DUID=6D195C80;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="SX=4;SY=0;EX=3;EY=-17;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=177:CY=14:OX=95:OY=31:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_2F19249F_490A_42c9_B131_6D083DB9839A" style="Mode=3;EOID=7FCD0B5A;SOID=4EA007D2;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-77;SY=0;EX=-76;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8B71787B_152C_48e6_B55B_A94D38ED4C2F" style="Mode=3;EOID=7FCD0B5A;SOID=4EA007D2;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=114;SY=-5;EX=61;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D01BEE04_A51F_434f_9F2B_CD75C658FF42" style="Mode=3;EOID=E89FDA2F;SOID=4EA007D2;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=845;SCTR.TOP=-283;SCTR.RIGHT=876;SCTR.BOTTOM=-267;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=846:-283$876:-283$876:-267$846:-267$;" subject="EAID_2FF93267_E672_481d_B370_202D9A0110E0" style="Mode=3;EOID=4EA007D2;SOID=4EA007D2;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_04EC0265_2665_47d4_AEDA_E49049545B3B" style="Mode=3;EOID=7FCD0B5A;SOID=E89FDA2F;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=271;SCTR.TOP=-322;SCTR.RIGHT=323;SCTR.BOTTOM=-264;$LLB=;LLT=;LMT=;LMB=;LRT=CX=174:CY=14:OX=47:OY=-26:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=323:-297$323:-264$271:-264$271:-322$310:-322$;" subject="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273" style="Mode=3;EOID=6D195C80;SOID=6D195C80;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=134:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F" style="Mode=3;EOID=4EA007D2;SOID=6D195C80;Color=-1;LWidth=0;Hidden=0;"/>
+				</elements>
+			</diagram>
+			<diagram xmi:id="EAID_A6FFBF40_ABD7_4fa9_9509_ADCA4A6A99C0">
+				<model package="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" localID="533" owner="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" tpos="9"/>
+				<properties name="submission eo sme" type="Logical"/>
+				<project author="andreea" version="1.0" created="2024-02-20 11:17:19" modified="2024-03-12 16:42:13"/>
+				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=046D0D01;"/>
+				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
+				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
+				<extendedProperties/>
+				<elements>
+					<element geometry="Left=546;Top=57;Right=753;Bottom=145;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="1" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=702C9472;"/>
+					<element geometry="Left=651;Top=334;Right=856;Bottom=396;" subject="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" seqno="2" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=AA2F5555;"/>
+					<element geometry="Left=433;Top=407;Right=700;Bottom=495;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="3" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=75A2CF22;"/>
+					<element geometry="Left=488;Top=212;Right=827;Bottom=263;" subject="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" seqno="4" style="DUID=E83D0ACF;NSL=0;"/>
+					<element geometry="Left=150;Top=447;Right=291;Bottom=482;" subject="EAID_52205A3C_8FF4_4195_8C11_F71753C30F8E" seqno="5" style="DUID=B1990977;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=126;Top=340;Right=315;Bottom=391;" subject="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C" seqno="6" style="DUID=0A83997D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=94;Top=181;Right=347;Bottom=294;" subject="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" seqno="7" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=7E3A61F6;"/>
+					<element geometry="Left=151;Top=79;Right=291;Bottom=123;" subject="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" seqno="8" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=2F978CA9;"/>
+					<element geometry="SX=-14;SY=-13;EX=42;EY=2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=250:CY=14:OX=130:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_23CC2B92_731F_4428_B333_8582A36D1244" style="Mode=3;EOID=702C9472;SOID=E83D0ACF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-104;SY=3;EX=-27;EY=3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=200:CY=14:OX=103:OY=-40:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9BF032E2_6893_45df_95FE_A08E92EA8618" style="Mode=3;EOID=75A2CF22;SOID=E83D0ACF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=130;SY=0;EX=0;EY=-1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=201:CY=14:OX=101:OY=-22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_87C6E00F_DAEB_4e79_8340_AC2FC83206DA" style="Mode=3;EOID=AA2F5555;SOID=E83D0ACF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=154;SY=-1;EX=1;EY=-3;EDGE=4;SCME=0;SCTR=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=127:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B6D90197_EC7F_4a01_8047_2DAC846D9C03" style="Mode=3;EOID=7E3A61F6;SOID=E83D0ACF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A2F10537_FAE7_4ff3_A3EE_819F014FE1AC" style="Mode=3;EOID=7E3A61F6;SOID=0A83997D;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=49:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0A05E1A7_A032_44d5_8A47_A62DAC97C6A3" style="Mode=3;EOID=B1990977;SOID=0A83997D;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB" style="Mode=3;EOID=702C9472;SOID=7E3A61F6;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=1;SY=1;EX=1;EY=1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6" style="Mode=3;EOID=702C9472;SOID=7E3A61F6;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=346;SCTR.TOP=-207;SCTR.RIGHT=377;SCTR.BOTTOM=-191;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=347:-207$377:-207$377:-191$347:-191$;" subject="EAID_2FF93267_E672_481d_B370_202D9A0110E0" style="Mode=3;EOID=7E3A61F6;SOID=7E3A61F6;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=290;SCTR.TOP=-104;SCTR.RIGHT=321;SCTR.BOTTOM=-89;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=291:-104$321:-104$321:-89$291:-89$;" subject="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273" style="Mode=3;EOID=2F978CA9;SOID=2F978CA9;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=134:CY=14:OX=74:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F" style="Mode=3;EOID=7E3A61F6;SOID=2F978CA9;Color=-1;LWidth=0;Hidden=0;"/>
+				</elements>
+			</diagram>
+			<diagram xmi:id="EAID_D57C0343_5A78_480c_A411_138E27851C00">
+				<model package="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" localID="538" owner="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" tpos="2"/>
+				<properties name="submission and access" type="Logical"/>
+				<project author="andreea" version="1.0" created="2024-03-08 13:02:38" modified="2024-03-08 13:07:26"/>
+				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=2C8F2BA1;"/>
+				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
+				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
+				<extendedProperties/>
+				<elements>
+					<element geometry="Left=164;Top=224;Right=254;Bottom=294;" subject="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" seqno="1" style="DUID=A3C9FB84;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=382;Top=106;Right=553;Bottom=176;" subject="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" seqno="2" style="DUID=5F65AC6F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=944;Top=252;Right=1096;Bottom=287;" subject="EAID_30DD6891_71FE_4f87_832B_477790550BBC" seqno="3" style="DUID=5F638959;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=642;Top=234;Right=917;Bottom=304;" subject="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D" seqno="4" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=4EBB105D;"/>
+					<element geometry="Left=352;Top=234;Right=584;Bottom=304;" subject="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" seqno="5" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=2D9975B7;"/>
+					<element geometry="Left=410;Top=366;Right=526;Bottom=418;" subject="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" seqno="6" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=541CC30B;"/>
+					<element geometry="Left=151;Top=358;Right=267;Bottom=428;" subject="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" seqno="7" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=BE5C1562;"/>
+					<element geometry="Left=694;Top=105;Right=865;Bottom=175;" subject="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" seqno="8" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=B793487A;"/>
+					<element geometry="SX=-1;SY=0;EX=-2;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=110:CY=14:OX=73:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=208:-88$1018:-88$;" subject="EAID_5715AB6B_F88D_4b3e_857E_2AD843DEF3DE" style="Mode=3;EOID=5F638959;SOID=A3C9FB84;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-55;SY=0;EX=0;EY=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=965:-139$;" subject="EAID_6492D4E3_9631_45d4_9596_5EC3247529A2" style="Mode=3;EOID=B793487A;SOID=5F638959;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C289FCF6_9241_4f06_BF53_F99082792332" style="Mode=3;EOID=B793487A;SOID=4EBB105D;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_ACA750D2_84FF_4e07_B735_322F9131A442" style="Mode=3;EOID=4EBB105D;SOID=2D9975B7;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=80:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_18CF5F1B_45DD_4b29_9E28_8D741E0840F3" style="Mode=3;EOID=2D9975B7;SOID=541CC30B;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=113:CY=14:OX=55:OY=17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_ACF95470_AB2B_4b7d_BCCF_3E7847170DBD" style="Mode=3;EOID=A3C9FB84;SOID=BE5C1562;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=4;SCTR.LEFT=105;SCTR.TOP=-459;SCTR.RIGHT=155;SCTR.BOTTOM=-412;$LLB=;LLT=;LMT=;LMB=;LRT=CX=158:CY=27:OX=63:OY=6:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=151:-412$105:-412$105:-459$155:-459$155:-428$;" subject="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273" style="Mode=3;EOID=BE5C1562;SOID=BE5C1562;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=-1;EX=1;EY=-1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=1:OY=-5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B" style="Mode=3;EOID=541CC30B;SOID=BE5C1562;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=4;SCTR.LEFT=671;SCTR.TOP=-203;SCTR.RIGHT=717;SCTR.BOTTOM=-162;$LLB=;LLT=;LMT=;LMB=;LRT=CX=114:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=694:-162$671:-162$671:-203$717:-203$717:-175$;" subject="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F" style="Mode=3;EOID=B793487A;SOID=B793487A;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=77:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4CC3B6CA_493A_4ff6_BB1B_A5C475115AB1" style="Mode=3;EOID=5F65AC6F;SOID=B793487A;Color=-1;LWidth=0;Hidden=0;"/>
+				</elements>
+			</diagram>
+			<diagram xmi:id="EAID_CD28F0FD_0C9A_4da8_A603_10B89BAA6A1C">
+				<model package="EAPK_B08268CA_8A31_45bb_861A_FFC1F323A7AF" localID="537" owner="EAPK_B08268CA_8A31_45bb_861A_FFC1F323A7AF" tpos="0"/>
+				<properties name="datatype" type="Logical"/>
+				<project author="lps" version="1.0" created="2022-04-29 20:18:40" modified="2022-11-01 11:16:55"/>
+				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=1;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=791;DocSize.cy=1134;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=836F9BD1;"/>
+				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
+				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
+				<extendedProperties/>
+				<elements>
+					<element geometry="Left=54;Top=41;Right=144;Bottom=79;" subject="EAID_41974725_E867_4940_946E_A67ADB8761A5" seqno="1" style="DUID=99D7F2BB;"/>
+					<element geometry="Left=54;Top=134;Right=144;Bottom=172;" subject="EAID_1DAA2177_8FD2_4acc_9598_EDC5473782ED" seqno="2" style="DUID=3F94E44C;"/>
+					<element geometry="Left=162;Top=134;Right=252;Bottom=172;" subject="EAID_1664A675_DB09_4b0b_9372_D91610518291" seqno="3" style="DUID=139B41D5;"/>
+					<element geometry="Left=162;Top=246;Right=252;Bottom=284;" subject="EAID_D8DFC001_8E9C_43cc_8B42_23986E82DA4A" seqno="4" style="DUID=33BA54B7;"/>
+					<element geometry="Left=54;Top=246;Right=144;Bottom=284;" subject="EAID_614F9209_E81A_4113_B53B_FECF7887AB0C" seqno="5" style="DUID=696ADCEC;"/>
+					<element geometry="Left=162;Top=42;Right=252;Bottom=80;" subject="EAID_05217498_C9A9_4647_B949_0363CFF85E87" seqno="6" style="DUID=63EAE3C3;"/>
+					<element geometry="Left=54;Top=334;Right=144;Bottom=372;" subject="EAID_9C8D9941_B96C_4ca6_AC2B_1DABF5BF140B" seqno="7" style="DUID=F4C2F08E;"/>
+				</elements>
+			</diagram>
+		</diagrams>
+	</xmi:Extension>
+</xmi:XMI>
diff --git a/implementation/eNotice/model2owl-config/config-parameters.xsl b/implementation/eNotice/model2owl-config/config-parameters.xsl
index e4b20098..9918c1e7 100644
--- a/implementation/eNotice/model2owl-config/config-parameters.xsl
+++ b/implementation/eNotice/model2owl-config/config-parameters.xsl
@@ -122,11 +122,11 @@
     <!--    owl:incompatibleWith -->
     <xsl:variable name="incompatibleWith" select="'3.1.0'"/>
     <!--    owl:versionInfo -->
-    <xsl:variable name="versionInfo" select="'4.1.0'"/>
+    <xsl:variable name="versionInfo" select="'4.2.0'"/>
     <!--    bibo:status-->
     <xsl:variable name="ontologyStatus" select="'Semantic Specification Release'"/>
     <!--    owl:priorVersion -->
-    <xsl:variable name="priorVersion" select="'4.0.2'"/>
+    <xsl:variable name="priorVersion" select="'4.1.0'"/>
     <!--    vann:preferredNamespaceUri -->
     <xsl:variable name="preferredNamespaceUri" select="'http://data.europa.eu/a4g/ontology#'"/>
     <!--    vann:preferredNamespacePrefix -->
diff --git a/implementation/eNotice/model2owl-config/namespaces.xml b/implementation/eNotice/model2owl-config/namespaces.xml
index cfd1d7e9..f247d01e 100644
--- a/implementation/eNotice/model2owl-config/namespaces.xml
+++ b/implementation/eNotice/model2owl-config/namespaces.xml
@@ -21,6 +21,7 @@
     <prefix name="epo-ful" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-acc" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-sub" value="http://data.europa.eu/a4g/ontology#"/>
+    <prefix name="epo-inv" value="http://data.europa.eu/a4g/ontology#"/>
 
     <prefix name="nuts" value="http://data.europa.eu/nuts/"/>
     <prefix name="espd" value="https://github.com/ESPD/ESPD-EDM/"/>
diff --git a/implementation/eNotice/xmi_conceptual_model/eNotice.xml b/implementation/eNotice/xmi_conceptual_model/eNotice.xml
index f63215c0..a01a0680 100644
--- a/implementation/eNotice/xmi_conceptual_model/eNotice.xml
+++ b/implementation/eNotice/xmi_conceptual_model/eNotice.xml
@@ -8,7 +8,7 @@
 					<generalization xmi:type="uml:Generalization" xmi:id="EAID_9D6F7030_A875_4dc4_BAB4_3226C0E6F8F0" general="EAID_ED2786D7_609D_43e8_A94C_47B4744E796D"/>
 				</packagedElement>
 				<packagedElement xmi:type="uml:Class" xmi:id="EAID_ED2786D7_609D_43e8_A94C_47B4744E796D" name="ProxyConnector"/>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" name="diagrams">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" name="diagrams">
 					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_BD2AF816_6D7A_4cf6_AD18_B2FA72E0240B" body="for ReviewBody">
 						<annotatedElement xmi:idref="EAID_D19EA23B_3707_4f38_8E54_F2D9BE08A114"/>
 					</ownedComment>
@@ -24,14 +24,54 @@
 					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_5AE64A69_B9E1_4007_8268_679A87B91611" body="Design Contest Result Notice&#xA;PIN only&#xA;PIN CFC&#xA;PIN RTL">
 						<annotatedElement xmi:idref="EAID_C07688A9_AAC8_4f60_A2CC_FA90C006C282"/>
 					</ownedComment>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_08C84AC0_E262_46e1_9EC6_644AFF8D9561" name="ProxyConnector">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_C56014E3_B90C_4023_BFE9_EFC9B42720F4" general="EAID_17272E7E_FAA6_4f11_BBB3_457706068099"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_17272E7E_FAA6_4f11_BBB3_457706068099" name="ProxyConnector"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_39DBC436_506A_46a4_9670_9A00EC98EC62" name="ProxyConnector">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_87A13B98_6E29_4694_AA8F_DE5A3705B3A2" general="EAID_8944D0F2_D657_4ce9_B2E9_DEBFBA9394DE"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_3CA58BCF_C8DB_4609_9044_CFAA473152BE" name="ProxyConnector">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_8B06B92A_4560_49c7_9EFF_FF8FC578D4D1" general="EAID_D51DF83F_EDA1_4cfa_94A2_34A940C86AB6"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_44910AF1_0738_4bac_B8E3_2BC8677D2EC1" name="ProxyConnector"/>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_47C8E7DE_AC4A_4d3a_B612_6364BFB42020" name="ProxyConnector"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_4A97DCFA_BAC8_4f54_BADE_E2E47352BDD6" name="ProxyConnector"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_5046F705_8CB4_4b61_9F99_4575710393BB" name="ProxyConnector"/>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_6288458C_4439_46bc_A898_C99A5E4A62D6" name="ProxyConnector"/>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_6B960963_83B6_4496_956C_AC7B8E5E9891" name="ProxyConnector">
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_F68B7543_9FB7_4a53_A12D_3B9DB56D9AD2" general="EAID_47C8E7DE_AC4A_4d3a_B612_6364BFB42020"/>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_70B80546_7629_40c6_9316_F91D7B17B474" name="ProxyConnector">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_73A6FC03_1825_4ec1_A784_BF1C55F72910" general="EAID_E8E280AD_7469_4b14_ABEA_60317F90ACC4"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_74DCC56E_7AA8_41a1_80A0_62B66243936F" name="ProxyConnector"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_8944D0F2_D657_4ce9_B2E9_DEBFBA9394DE" name="ProxyConnector"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_9680588B_831E_4f03_8AD7_7E2899D2520E" name="ProxyConnector"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_A08BABBB_DF17_46af_8086_EFFD7222CAFF" name="ProxyConnector">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_4033C88B_B08F_4630_93FD_457E67FB5F58" general="EAID_D08F9431_D68C_497b_BC8C_B22259E469A9"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_A854A4CB_76B3_4887_9781_EB2D19B4D00D" name="ProxyConnector">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_D85B5D9D_A0A9_4ed4_B03A_DD6F59C0BCAC" general="EAID_74DCC56E_7AA8_41a1_80A0_62B66243936F"/>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_AC8CC935_389B_479b_B0EA_B6FB8B5C8EB6" name="ProxyConnector">
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_72F9467C_3D0D_4b12_8FA6_A01D070F8819" general="EAID_6288458C_4439_46bc_A898_C99A5E4A62D6"/>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_D08F9431_D68C_497b_BC8C_B22259E469A9" name="ProxyConnector"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_D51DF83F_EDA1_4cfa_94A2_34A940C86AB6" name="ProxyConnector"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_D5AE1A66_594D_488f_AFDF_6C8C5D111A0F" name="ProxyConnector">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_71F00BB4_9962_4462_99B5_9349107595CF" general="EAID_9680588B_831E_4f03_8AD7_7E2899D2520E"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_E47E3B9A_672A_4b82_BA0F_A1B9C0D14B8E" name="ProxyConnector">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_90E37548_02F8_4227_8C75_04FFB21501B2" general="EAID_4A97DCFA_BAC8_4f54_BADE_E2E47352BDD6"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_E65922A8_EFDF_48e3_B6C2_16B9FF224BE8" name="ProxyConnector">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_A70D66E1_34C3_4d44_949F_426C768D6C8B" general="EAID_5046F705_8CB4_4b61_9F99_4575710393BB"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_E6FB12CB_F678_4ec8_98CD_608C5E762EE9" name="ProxyConnector">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_CFE865BE_F277_4169_ABC1_9D68D997C916" general="EAID_44910AF1_0738_4bac_B8E3_2BC8677D2EC1"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_E8E280AD_7469_4b14_ABEA_60317F90ACC4" name="ProxyConnector"/>
 					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_55622713_57C0_4aec_8ABA_05CE52DE1DE1" name="premarket consultation notice"/>
 					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_2004EEE4_4246_4617_A3E8_7708D7302027" name="planning notices"/>
 					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_5CECF7F0_525A_4b25_9FF6_A2777C94113F" name="competition notices"/>
@@ -506,7 +546,7 @@
 						</ownedEnd>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03" name="epo-not:PreMarketConsultationNotice">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_5217DA2B_F336_4793_85E1_6829959E93BB" general="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_A1DC6D24_EABE_467c_80DC_91F8A4D3F0DE" general="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_C0F50A97_3E33_43bb_8F4A_B5B2C763463B" supplier="EAID_53C53D83_424B_4038_AF6F_5B9C6F71226D" client="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03"/>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_C04A3529_BA24_4b09_BA1E_34917AA6433D" name="epo-not:QSNotice">
@@ -640,7 +680,7 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_CADF59F8_2032_4865_AB31_750D9CCE1E95" supplier="EAID_E783D355_F9AE_40e5_AEC0_4873E54CC637" client="EAID_19F4A072_85E4_452f_92A7_5CB32D4CB70B"/>
 				</packagedElement>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_4598E8FA_C77D_403a_8325_C8AB063FA836" name="controlled vocabularies">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_7DDD5D61_100A_4406_AB81_8ADBCB0DD163" name="controlled vocabularies">
 					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_FC6F39EE_8F56_4cac_BD56_FB56D97C19AA" name="notice types">
 						<ownedComment xmi:type="uml:Comment" xmi:id="EAID_B50FC1E6_A186_408d_B663_5F148418A687" body="this is a buyer profile, not a PIN.">
 							<annotatedElement xmi:idref="EAID_0D6BFEEC_649E_4c20_8CD2_0801F85D499E"/>
@@ -683,6 +723,10 @@
 						<packagedElement xmi:type="uml:Realization" xmi:id="EAID_47C1ECEB_898B_456c_9FC2_2463E88B2CE6" supplier="EAID_C07688A9_AAC8_4f60_A2CC_FA90C006C282" client="EAID_53C53D83_424B_4038_AF6F_5B9C6F71226D"/>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_823ACA8D_1707_4059_8C14_B89FD6B5DAD2" name="legal basis">
+						<packagedElement xmi:type="uml:InstanceSpecification" xmi:id="EAID_C0E81714_CC78_4bd5_B8F5_31F967E74257" name="Regulation 1370" classifier="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66"/>
+						<packagedElement xmi:type="uml:Realization" xmi:id="EAID_3452502E_9900_4175_9794_D484025607E7" supplier="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" client="EAID_C0E81714_CC78_4bd5_B8F5_31F967E74257"/>
+						<packagedElement xmi:type="uml:InstanceSpecification" xmi:id="EAID_64AA7AC6_F248_4162_BC6F_4434B8DC0F67" name="Regulation 1046" classifier="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66"/>
+						<packagedElement xmi:type="uml:Realization" xmi:id="EAID_4F2CCAB3_E0D4_434a_869E_D874CC918E17" supplier="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" client="EAID_64AA7AC6_F248_4162_BC6F_4434B8DC0F67"/>
 						<packagedElement xmi:type="uml:InstanceSpecification" xmi:id="EAID_6C334A58_89F2_4d3e_98F6_902667A49E71" name="(EU) 2019/1780" classifier="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66"/>
 						<packagedElement xmi:type="uml:Realization" xmi:id="EAID_D3C680D4_3CB0_40f5_9D98_ED0E9C28B950" supplier="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" client="EAID_6C334A58_89F2_4d3e_98F6_902667A49E71"/>
 						<packagedElement xmi:type="uml:InstanceSpecification" xmi:id="EAID_D6079364_9DE2_45de_9BAC_BE9D74F34B72" name="(EU) 2015/1986" classifier="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66"/>
@@ -699,15 +743,19 @@
 				</packagedElement>
 			</packagedElement>
 			<packagedElement xmi:type="uml:Package" xmi:id="EAPK_CD52EB08_1B60_47ee_B9F2_7D5904FA89A1" name="eFormsNotices">
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_8B2689E9_AC38_4c4e_880C_C7FC553D1616" name="diagrams">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_F9A451BC_D24F_4ed4_8497_24F21DD2B6C3" name="diagrams">
 					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_6970E353_92B6_44dc_8D54_27EE50616607" name="planning subtype notices"/>
 					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_B67F8633_2079_4127_BD4D_86B7F8DBC6AA" name="competition subtype notices"/>
 					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_FB5DC6CC_1C70_4f3c_946C_F4B0A08D9192" name="DAP subtype notices"/>
 					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_B775C397_9DD7_4b60_8DF5_BD1A1119F341" name="result subtype notices"/>
 					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_C7DD7F9D_C549_4bd0_AC8A_D079586C69E5" name="contract modification subtype notices"/>
-					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_F92ADA51_C0C0_408e_A6E8_EA20B8C21EAD" name="completion subtype notices"/>
+					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_F92ADA51_C0C0_408e_A6E8_EA20B8C21EAD" name="completion subtype notices">
+						<ownedComment xmi:type="uml:Comment" xmi:id="EAID_F72A2F1B_E855_4fd5_85C1_44FFF7302FAA" body="what form type?&#xA;">
+							<annotatedElement xmi:idref="EAID_137272D3_D36E_4bc8_BB25_DB95F670222F"/>
+						</ownedComment>
+					</packagedElement>
 				</packagedElement>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" name="classes">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" name="classes">
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" name="epo-not:eFormsNotice"/>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_D4E69FBD_0972_491c_89CA_686B0CAFECBF" supplier="EAID_6C334A58_89F2_4d3e_98F6_902667A49E71" client="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_8A9B11CE_AE42_4569_AC97_B7125F25083F" name="epo-not:Notice1">
@@ -950,8 +998,50 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_BD4D35AF_F4C0_470f_B185_99AC7779C464" supplier="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" client="EAID_378A0219_58F3_4bbb_A19B_0E19C7D6814B"/>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_E24F0453_58DF_4fce_8815_666C9CD92900" supplier="EAID_89668AB6_A244_441e_B851_9289BD4E15F3" client="EAID_378A0219_58F3_4bbb_A19B_0E19C7D6814B"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_B6AAD0B0_AC78_46dd_A2BB_15ABCBF61F8B" name="epo-not:NoticeCEI">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_40F0FF83_FA54_4eb1_93E2_2C730C732867" general="EAID_A055DBBD_DFB0_481c_8A60_5F8E32E52187"/>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_6589DF3C_F8AF_4060_9294_0DA799BDC3D9" general="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_39D76FBC_915F_4506_BBA5_1BAA08D19F04" supplier="EAID_64AA7AC6_F248_4162_BC6F_4434B8DC0F67" client="EAID_B6AAD0B0_AC78_46dd_A2BB_15ABCBF61F8B"/>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_70B69CB3_7E46_46fb_A6C2_A6B376E78B1B" supplier="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" client="EAID_B6AAD0B0_AC78_46dd_A2BB_15ABCBF61F8B"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_F0DE3A34_0F67_47af_914A_82A0C222723C" name="epo-not:NoticeE1">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_251F0F6E_D0B5_4304_8962_DC4613C4041F" general="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03"/>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_CE524DE2_7EA2_4088_82A8_10147B85EC4A" general="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_23426D44_9964_443a_A184_0605456C2FEF" supplier="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" client="EAID_F0DE3A34_0F67_47af_914A_82A0C222723C"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_20A35C8C_4895_4aef_AE94_63C59C948D5D" name="epo-not:NoticeE2">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_093A00FE_8C02_46c0_BF3D_F4067DB0161C" general="EAID_A31D0982_B460_4636_82B7_C2AF2C92D0B7"/>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_10DA1E5E_EB3E_4f82_AB74_84EC9AB0AF8D" general="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_F7FF5756_985F_42b8_B881_CE0D3C6C7822" supplier="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" client="EAID_20A35C8C_4895_4aef_AE94_63C59C948D5D"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_12A00248_5E3C_489e_88B4_ABEF21E72261" name="epo-not:NoticeE3">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_25F1119B_B9A1_4e00_81DE_AB87104E2971" general="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_E4877D84_62DD_4b49_93E9_B9CDDC757DFE" general="EAID_5DE4BBA5_24F3_4e6e_823C_BFF3401A979F"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_7226E575_9BF3_4599_A33E_E62EFF274606" supplier="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" client="EAID_12A00248_5E3C_489e_88B4_ABEF21E72261"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_1A622AA7_D176_418b_84D4_6FB3AAC4A4F9" name="epo-not:NoticeE4">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_CD899FA2_16BF_440c_9BBF_0C20785CB74C" general="EAID_83474E52_0601_44c6_9D61_AD99797CBD13"/>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_D150D8BA_9E5C_46d7_88B7_B524DAE70854" general="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_8E5E0D60_1F11_4dc5_8F6F_6DAB4A8EF634" supplier="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5" client="EAID_1A622AA7_D176_418b_84D4_6FB3AAC4A4F9"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_137272D3_D36E_4bc8_BB25_DB95F670222F" name="epo-not:NoticeE5">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_08F5FCE9_9B75_4d80_AD87_6CDE7E017303" general="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524"/>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_AF8B2993_D45B_4d65_BCC9_641769FA2898" general="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_4B4AA994_6B56_421a_80D0_CE346536A2B9" name="epo-not:NoticeT01">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_C0AEC9E0_776E_47ad_B97E_C65FBB995AB7" general="EAID_7B308DB7_0AC5_45c9_8E6F_0D46097D2C9C"/>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_DDE54F6E_927C_4aa6_A9DE_D600878A0184" general="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_09317411_46CE_4072_BBAE_0E80F1DB23E4" supplier="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" client="EAID_4B4AA994_6B56_421a_80D0_CE346536A2B9"/>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_22448738_74AC_444e_AA46_30FE9C0CC404" supplier="EAID_C0E81714_CC78_4bd5_B8F5_31F967E74257" client="EAID_4B4AA994_6B56_421a_80D0_CE346536A2B9"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_B93F6450_B2DC_42d5_AB43_7ACC411B4F0F" name="epo-not:NoticeT02">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_8CD40BAD_1B19_4e5e_B3AC_E2C7CB4138B9" general="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_FF4E869D_E24B_4c77_9DA7_6869F03D59F3" general="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_01E7319D_7EE6_4b79_94C5_251FABA00729" supplier="EAID_C0E81714_CC78_4bd5_B8F5_31F967E74257" client="EAID_B93F6450_B2DC_42d5_AB43_7ACC411B4F0F"/>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_092B4BA8_26FC_40e9_B172_6F9C6045CFC9" supplier="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5" client="EAID_B93F6450_B2DC_42d5_AB43_7ACC411B4F0F"/>
 				</packagedElement>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_6129E5F4_1A87_4a7e_A49A_C299842662DE" name="controlled vocabularies">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_49AEE875_C0E9_48f4_807C_9A6D07EE70EB" name="controlled vocabularies">
 					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_F410A1D5_B857_4503_97DC_821E366EF608" name="eFormTypes">
 						<packagedElement xmi:type="uml:InstanceSpecification" xmi:id="EAID_615A685A_1B92_4dc4_BE13_02E5C83D1818" name="bri" classifier="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A"/>
 						<packagedElement xmi:type="uml:Realization" xmi:id="EAID_02CADF28_5E22_4c8c_ADEE_564AF6B23E84" supplier="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A" client="EAID_615A685A_1B92_4dc4_BE13_02E5C83D1818"/>
@@ -971,7 +1061,7 @@
 				</packagedElement>
 			</packagedElement>
 			<packagedElement xmi:type="uml:Package" xmi:id="EAPK_F7A28F29_B6B3_4ef5_B254_66971D0FDA1E" name="standardFormsNotices">
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_C8716BFF_C5FE_40c2_BF04_C2A97B06669D" name="diagrams">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_CB52574B_A99F_4805_91CB_5CF174945B4A" name="diagrams">
 					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_3CD96646_E93F_42b0_8C0C_A8EF063DC2D6" name="phaseOrganisation">
 						<ownedComment xmi:type="uml:Comment" xmi:id="EAID_ECB2CC93_0FAE_45fc_B8D3_E6BA4946D39A" body="where does this belong to?">
 							<annotatedElement xmi:idref="EAID_48E53179_7827_491f_A9A6_3150EE7A7284"/>
@@ -1001,7 +1091,7 @@
 						</packagedElement>
 					</packagedElement>
 				</packagedElement>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" name="classes">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" name="classes">
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_72275865_220D_4dc8_A878_5A05130DFF7C" name="epo-not:CANDefence-D81">
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_0A5318A8_808E_4ca5_8605_8CE3386C06BC" general="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2"/>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_EA25EAD6_AC53_4e34_A984_44B1789DAF70" general="EAID_5321A697_558C_4b3b_B049_4B01BA23BD53"/>
@@ -1221,7 +1311,7 @@
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_0DD763A2_D22F_4609_BE8F_1815AE7B4717" supplier="EAID_89668AB6_A244_441e_B851_9289BD4E15F3" client="EAID_3AD7C381_B519_40f0_B5AA_C5F5A46D503B"/>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_2C830995_1331_447e_BEC0_058AE5AB029B" supplier="EAID_7D5BCE3D_38CA_4360_8881_49BE6ED74426" client="EAID_3AD7C381_B519_40f0_B5AA_C5F5A46D503B"/>
 				</packagedElement>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_44FA1B9F_512D_4707_A498_D5A3C1BB479E" name="controlled vocabularies">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_C5F44697_4600_4fa0_86E3_0E2AB9267396" name="controlled vocabularies">
 					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_713AE691_88C4_408b_8D74_DE4AA0F299D0" name="standardFormTypes">
 						<packagedElement xmi:type="uml:InstanceSpecification" xmi:id="EAID_D6B9514E_C670_4269_9E28_0CA22866AB4F" name="Form1" classifier="EAID_4BD860EF_5AF8_4fb4_B0D2_5C7B95031994"/>
 						<packagedElement xmi:type="uml:Realization" xmi:id="EAID_1F428C2B_108C_468f_AB66_5B561653996A" supplier="EAID_4BD860EF_5AF8_4fb4_B0D2_5C7B95031994" client="EAID_D6B9514E_C670_4269_9E28_0CA22866AB4F"/>
@@ -1281,7 +1371,7 @@
 				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_BF47973A_E5D9_497f_8797_C51B753C92CA" name="xsd:integer"/>
 			</packagedElement>
 		</packagedElement>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_6785F76B_98DE_4cc5_9184_059956F5BBE9" isFrame="false" modelElement="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_6785F76B_98DE_4cc5_9184_059956F5BBE9" isFrame="false" modelElement="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_6785F76B_98DE_4cc5_AE42_0583F7417A79" modelElement="EAID_17662AEF_1321_446a_AE42_0583F7417A79">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_98DE_4cc5_AE42_0583F7417A79" text="epo-not:CompetitionNotice"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_98DE_4cc5_AE42_0583F7417A79" x="542" y="601" width="171" height="44"/>
@@ -1349,7 +1439,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_6785F76B_98DE_4cc5_A1C3_A0E883EA3F03" modelElement="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_98DE_4cc5_A1C3_A0E883EA3F03" text="epo-not:PreMarketConsultationNotice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_98DE_4cc5_A1C3_A0E883EA3F03" x="104" y="601" width="170" height="44"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_98DE_4cc5_A1C3_A0E883EA3F03" x="154" y="601" width="170" height="44"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6785F76B_98DE_4cc5_A025_488C1781D353" source="EAID_D847D616_70DB_473a_A2A4_6665F938474C" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_B825D1CD_744B_411b_A025_488C1781D353">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_98DE_4cc5_A025_488C1781D353" x="845" y="601"/>
@@ -1363,10 +1453,10 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_98DE_4cc5_9AAE_48C9E1FDC23C" x="1454" y="335"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_98DE_4cc5_9AAE_48C9E1FDC23C" x="1252" y="335"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6785F76B_98DE_4cc5_85E1_6829959E93BB" source="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_5217DA2B_F336_4793_85E1_6829959E93BB">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_98DE_4cc5_85E1_6829959E93BB" x="193" y="601"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_98DE_4cc5_85E1_6829959E93BB" x="193" y="468"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_98DE_4cc5_85E1_6829959E93BB" x="799" y="468"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6785F76B_98DE_4cc5_80DC_91F8A4D3F0DE" source="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_A1DC6D24_EABE_467c_80DC_91F8A4D3F0DE">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_98DE_4cc5_80DC_91F8A4D3F0DE" x="249" y="601"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_98DE_4cc5_80DC_91F8A4D3F0DE" x="249" y="472"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_98DE_4cc5_80DC_91F8A4D3F0DE" x="799" y="472"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6785F76B_98DE_4cc5_99CE_63F041A42F06" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_3AA2C83C_532C_460c_99CE_63F041A42F06">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_98DE_4cc5_99CE_63F041A42F06" text="+adms:identifier" modelElement="EAID_dstA2C83C_532C_460c_99CE_63F041A42F06">
@@ -1500,7 +1590,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_98DE_4cc5_A2F1_707153826314" x="799" y="494"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_DA3F165E_E1C4_443d_B43F_8EBB9AD26F8C" isFrame="false" modelElement="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_DA3F165E_E1C4_443d_B43F_8EBB9AD26F8C" isFrame="false" modelElement="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_DA3F165E_E1C4_443d_B8A4_6F969F59938C" modelElement="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_E1C4_443d_B8A4_6F969F59938C" text="epo:Notice"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_E1C4_443d_B8A4_6F969F59938C" x="369" y="52" width="245" height="163"/>
@@ -1518,7 +1608,7 @@
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_E1C4_443d_A53A_502157F5F45A" x="796" y="263" width="171" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_DA3F165E_E1C4_443d_AA2B_BE7308712695" modelElement="EAID_7BE947BB_A71B_4e7a_AA2B_BE7308712695">
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_E1C4_443d_AA2B_BE7308712695" x="434" y="395" width="115" height="110"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_E1C4_443d_AA2B_BE7308712695" x="434" y="370" width="115" height="110"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_DA3F165E_E1C4_443d_9717_8E5FF181CF7E" modelElement="EAID_A7E3EEA1_BBD5_409a_9717_8E5FF181CF7E">
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_E1C4_443d_9717_8E5FF181CF7E" x="824" y="103" width="115" height="87"/>
@@ -1540,7 +1630,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E1C4_443d_AD2A_EA61AB152656" x="881" y="263"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DA3F165E_E1C4_443d_84D3_E0EDCB7DC006" source="EAID_7BE947BB_A71B_4e7a_AA2B_BE7308712695" target="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" modelElement="EAID_E00978F6_EFF6_47d8_84D3_E0EDCB7DC006">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E1C4_443d_84D3_E0EDCB7DC006" x="491" y="395"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E1C4_443d_84D3_E0EDCB7DC006" x="491" y="370"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E1C4_443d_84D3_E0EDCB7DC006" x="491" y="333"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DA3F165E_E1C4_443d_89C8_D3FC52D7CF0C" source="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" target="EAID_3780AA50_D898_4068_B300_47B46651CA0A" modelElement="EAID_2D4516BD_7CD7_4f69_89C8_D3FC52D7CF0C">
@@ -1635,7 +1725,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E1C4_443d_83A7_6E582F53DA90" x="967" y="298"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_B3CE5A4A_3421_4d83_835E_1908DA76EA1C" isFrame="false" modelElement="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_B3CE5A4A_3421_4d83_835E_1908DA76EA1C" isFrame="false" modelElement="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B3CE5A4A_3421_4d83_AE42_0583F7417A79" modelElement="EAID_17662AEF_1321_446a_AE42_0583F7417A79">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3421_4d83_AE42_0583F7417A79" text="epo-not:CompetitionNotice"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3421_4d83_AE42_0583F7417A79" x="436" y="253" width="171" height="70"/>
@@ -1654,12 +1744,36 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B3CE5A4A_3421_4d83_BF42_2A6E50CAF4E6" modelElement="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3421_4d83_BF42_2A6E50CAF4E6" text="epo:LotGroup"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3421_4d83_BF42_2A6E50CAF4E6" x="836" y="551" width="171" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3421_4d83_BF42_2A6E50CAF4E6" x="836" y="551" width="179" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B3CE5A4A_3421_4d83_80B0_0C345D6703F4" modelElement="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3421_4d83_80B0_0C345D6703F4" text="epo:Procedure"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3421_4d83_80B0_0C345D6703F4" x="783" y="242" width="278" height="111"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_B3CE5A4A_3421_4d83_B6C2_16B9FF224BE8" modelElement="EAID_E65922A8_EFDF_48e3_B6C2_16B9FF224BE8">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3421_4d83_B6C2_16B9FF224BE8" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3421_4d83_B6C2_16B9FF224BE8" x="702" y="281" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_B3CE5A4A_3421_4d83_9F99_4575710393BB" modelElement="EAID_5046F705_8CB4_4b61_9F99_4575710393BB">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3421_4d83_9F99_4575710393BB" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3421_4d83_9F99_4575710393BB" x="702" y="113" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_B3CE5A4A_3421_4d83_9EC6_644AFF8D9561" modelElement="EAID_08C84AC0_E262_46e1_9EC6_644AFF8D9561">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3421_4d83_9EC6_644AFF8D9561" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3421_4d83_9EC6_644AFF8D9561" x="737" y="435" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_B3CE5A4A_3421_4d83_BBB3_457706068099" modelElement="EAID_17272E7E_FAA6_4f11_BBB3_457706068099">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3421_4d83_BBB3_457706068099" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3421_4d83_BBB3_457706068099" x="738" y="70" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B3CE5A4A_3421_4d83_BFE9_EFC9B42720F4" source="EAID_08C84AC0_E262_46e1_9EC6_644AFF8D9561" target="EAID_17272E7E_FAA6_4f11_BBB3_457706068099" modelElement="EAID_C56014E3_B90C_4023_BFE9_EFC9B42720F4">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3421_4d83_BFE9_EFC9B42720F4" x="744" y="442"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3421_4d83_BFE9_EFC9B42720F4" x="745" y="77"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B3CE5A4A_3421_4d83_949F_426C768D6C8B" source="EAID_E65922A8_EFDF_48e3_B6C2_16B9FF224BE8" target="EAID_5046F705_8CB4_4b61_9F99_4575710393BB" modelElement="EAID_A70D66E1_34C3_4d44_949F_426C768D6C8B">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3421_4d83_949F_426C768D6C8B" x="709" y="288"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3421_4d83_949F_426C768D6C8B" x="709" y="120"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B3CE5A4A_3421_4d83_9195_C96F98BD3349" source="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3421_4d83_9195_C96F98BD3349" text="+epo:hasProcurementScopeDividedIntoLot" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3421_4d83_9195_C96F98BD3349" x="840" y="372" width="171" height="14"/>
@@ -1677,7 +1791,7 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3421_4d83_BFE6_593632EDB11F" text="1..*" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3421_4d83_BFE6_593632EDB11F" x="933" y="481" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3421_4d83_BFE6_593632EDB11F" x="921" y="551"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3421_4d83_BFE6_593632EDB11F" x="924" y="551"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3421_4d83_BFE6_593632EDB11F" x="921" y="476"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B3CE5A4A_3421_4d83_A411_E8DA312BC449" source="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" target="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" modelElement="EAID_F955E894_651A_4a8b_A411_E8DA312BC449">
@@ -1764,7 +1878,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3421_4d83_AA92_BB00BFD1DB22" x="310" y="286"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_9E08D249_06F2_4b3b_9417_CC0CE30D81A7" isFrame="false" modelElement="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_9E08D249_06F2_4b3b_9417_CC0CE30D81A7" isFrame="false" modelElement="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9E08D249_06F2_4b3b_B8A4_6F969F59938C" modelElement="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_06F2_4b3b_B8A4_6F969F59938C" text="epo:Notice"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_06F2_4b3b_B8A4_6F969F59938C" x="30" y="64" width="245" height="163"/>
@@ -1783,7 +1897,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9E08D249_06F2_4b3b_BF42_2A6E50CAF4E6" modelElement="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_06F2_4b3b_BF42_2A6E50CAF4E6" text="epo:LotGroup"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_06F2_4b3b_BF42_2A6E50CAF4E6" x="878" y="483" width="171" height="62"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_06F2_4b3b_BF42_2A6E50CAF4E6" x="878" y="483" width="179" height="75"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9E08D249_06F2_4b3b_80CC_7E68CBDEDED2" modelElement="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_06F2_4b3b_80CC_7E68CBDEDED2" text="epo:LotGroupAwardInformation"/>
@@ -1805,16 +1919,31 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_06F2_4b3b_8372_75A07B6AB066" text="epo:Contract"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_06F2_4b3b_8372_75A07B6AB066" x="363" y="627" width="216" height="85"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9E08D249_06F2_4b3b_8FCF_CE8415CE3F22" source="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" target="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" modelElement="EAID_F053A3B1_64BB_454a_8FCF_CE8415CE3F22">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_06F2_4b3b_8FCF_CE8415CE3F22" text="+epo:announcesNoticeAwardInformation" modelElement="EAID_dst53A3B1_64BB_454a_8FCF_CE8415CE3F22">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_06F2_4b3b_8FCF_CE8415CE3F22" x="204" y="474" width="165" height="14"/>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_9E08D249_06F2_4b3b_BA0F_A1B9C0D14B8E" modelElement="EAID_E47E3B9A_672A_4b82_BA0F_A1B9C0D14B8E">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_06F2_4b3b_BA0F_A1B9C0D14B8E" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_06F2_4b3b_BA0F_A1B9C0D14B8E" x="594" y="152" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_9E08D249_06F2_4b3b_BADE_E2E47352BDD6" modelElement="EAID_4A97DCFA_BAC8_4f54_BADE_E2E47352BDD6">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_06F2_4b3b_BADE_E2E47352BDD6" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_06F2_4b3b_BADE_E2E47352BDD6" x="594" y="106" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_9E08D249_06F2_4b3b_AFDF_6C8C5D111A0F" modelElement="EAID_D5AE1A66_594D_488f_AFDF_6C8C5D111A0F">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_06F2_4b3b_AFDF_6C8C5D111A0F" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_06F2_4b3b_AFDF_6C8C5D111A0F" x="670" y="374" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_9E08D249_06F2_4b3b_8AD7_7E2899D2520E" modelElement="EAID_9680588B_831E_4f03_8AD7_7E2899D2520E">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_06F2_4b3b_8AD7_7E2899D2520E" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_06F2_4b3b_8AD7_7E2899D2520E" x="671" y="65" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9E08D249_06F2_4b3b_9E57_C032F2801A7A" source="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" target="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" modelElement="EAID_5465A41A_7AD8_4020_9E57_C032F2801A7A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_06F2_4b3b_9E57_C032F2801A7A" text="+epo:announcesAwardDecision" modelElement="EAID_dst65A41A_7AD8_4020_9E57_C032F2801A7A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_06F2_4b3b_9E57_C032F2801A7A" x="665" y="272" width="126" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_06F2_4b3b_8FCF_CE8415CE3F22" text="0..1" modelElement="EAID_dst53A3B1_64BB_454a_8FCF_CE8415CE3F22">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_06F2_4b3b_8FCF_CE8415CE3F22" x="204" y="497" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_06F2_4b3b_9E57_C032F2801A7A" text="0..*" modelElement="EAID_dst65A41A_7AD8_4020_9E57_C032F2801A7A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_06F2_4b3b_9E57_C032F2801A7A" x="774" y="295" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_06F2_4b3b_8FCF_CE8415CE3F22" x="411" y="322"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_06F2_4b3b_8FCF_CE8415CE3F22" x="411" y="492"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_06F2_4b3b_8FCF_CE8415CE3F22" x="201" y="492"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_06F2_4b3b_9E57_C032F2801A7A" x="603" y="290"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_06F2_4b3b_9E57_C032F2801A7A" x="793" y="290"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9E08D249_06F2_4b3b_B3C3_6654ABB348DF" source="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_06F2_4b3b_B3C3_6654ABB348DF" text="+epo:refersToLot" modelElement="EAID_dstB9978D_8D66_48ab_B3C3_6654ABB348DF">
@@ -1884,6 +2013,16 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_06F2_4b3b_8681_C210E308328D" x="582" y="381"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_06F2_4b3b_8681_C210E308328D" x="912" y="381"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9E08D249_06F2_4b3b_B4AA_B8C9088E4284" source="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" target="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" modelElement="EAID_91CB9CAD_CC6F_4c97_B4AA_B8C9088E4284">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_06F2_4b3b_B4AA_B8C9088E4284" text="+epo-not:announcesRole" modelElement="EAID_dstCB9CAD_CC6F_4c97_B4AA_B8C9088E4284">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_06F2_4b3b_B4AA_B8C9088E4284" x="227" y="246" width="100" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_06F2_4b3b_B4AA_B8C9088E4284" text="0..*" modelElement="EAID_dstCB9CAD_CC6F_4c97_B4AA_B8C9088E4284">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_06F2_4b3b_B4AA_B8C9088E4284" x="227" y="269" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_06F2_4b3b_B4AA_B8C9088E4284" x="363" y="264"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_06F2_4b3b_B4AA_B8C9088E4284" x="224" y="264"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9E08D249_06F2_4b3b_8F66_FA023FA190E7" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_06F2_4b3b_8F66_FA023FA190E7" text="+epo:hasLotReference" modelElement="EAID_dstCFA3D8_50E1_40f7_8F66_FA023FA190E7">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_06F2_4b3b_8F66_FA023FA190E7" x="1037" y="391" width="90" height="14"/>
@@ -1896,38 +2035,20 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_06F2_4b3b_8F66_FA023FA190E7" x="1111" y="406"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_06F2_4b3b_8F66_FA023FA190E7" x="1011" y="406"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9E08D249_06F2_4b3b_86FF_2CE55FF62AB6" source="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" target="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" modelElement="EAID_FA76DFA8_9FC1_4db0_86FF_2CE55FF62AB6">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_06F2_4b3b_86FF_2CE55FF62AB6" text="+epo:announcesLotGroupAwardInformation" modelElement="EAID_dst76DFA8_9FC1_4db0_86FF_2CE55FF62AB6">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_06F2_4b3b_86FF_2CE55FF62AB6" x="681" y="584" width="176" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_06F2_4b3b_86FF_2CE55FF62AB6" text="0..*" modelElement="EAID_dst76DFA8_9FC1_4db0_86FF_2CE55FF62AB6">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_06F2_4b3b_86FF_2CE55FF62AB6" x="867" y="609" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_06F2_4b3b_86FF_2CE55FF62AB6" x="510" y="322"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_06F2_4b3b_86FF_2CE55FF62AB6" x="510" y="604"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_06F2_4b3b_86FF_2CE55FF62AB6" x="886" y="604"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9E08D249_06F2_4b3b_9195_C96F98BD3349" source="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_06F2_4b3b_9195_C96F98BD3349" text="+epo:hasProcurementScopeDividedIntoLot" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_06F2_4b3b_9195_C96F98BD3349" x="1034" y="323" width="171" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9E08D249_06F2_4b3b_8FCF_CE8415CE3F22" source="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" target="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" modelElement="EAID_F053A3B1_64BB_454a_8FCF_CE8415CE3F22">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_06F2_4b3b_8FCF_CE8415CE3F22" text="+epo:announcesNoticeAwardInformation" modelElement="EAID_dst53A3B1_64BB_454a_8FCF_CE8415CE3F22">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_06F2_4b3b_8FCF_CE8415CE3F22" x="204" y="474" width="165" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_06F2_4b3b_9195_C96F98BD3349" text="1..*" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_06F2_4b3b_9195_C96F98BD3349" x="1014" y="349" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_06F2_4b3b_8FCF_CE8415CE3F22" text="0..1" modelElement="EAID_dst53A3B1_64BB_454a_8FCF_CE8415CE3F22">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_06F2_4b3b_8FCF_CE8415CE3F22" x="204" y="497" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_06F2_4b3b_9195_C96F98BD3349" x="1102" y="150"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_06F2_4b3b_9195_C96F98BD3349" x="1119" y="150"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_06F2_4b3b_9195_C96F98BD3349" x="1119" y="344"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_06F2_4b3b_9195_C96F98BD3349" x="1011" y="344"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_06F2_4b3b_8FCF_CE8415CE3F22" x="411" y="322"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_06F2_4b3b_8FCF_CE8415CE3F22" x="411" y="492"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_06F2_4b3b_8FCF_CE8415CE3F22" x="201" y="492"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9E08D249_06F2_4b3b_9E57_C032F2801A7A" source="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" target="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" modelElement="EAID_5465A41A_7AD8_4020_9E57_C032F2801A7A">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_06F2_4b3b_9E57_C032F2801A7A" text="+epo:announcesAwardDecision" modelElement="EAID_dst65A41A_7AD8_4020_9E57_C032F2801A7A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_06F2_4b3b_9E57_C032F2801A7A" x="665" y="272" width="126" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_06F2_4b3b_9E57_C032F2801A7A" text="0..*" modelElement="EAID_dst65A41A_7AD8_4020_9E57_C032F2801A7A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_06F2_4b3b_9E57_C032F2801A7A" x="774" y="295" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_06F2_4b3b_9E57_C032F2801A7A" x="603" y="290"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_06F2_4b3b_9E57_C032F2801A7A" x="793" y="290"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9E08D249_06F2_4b3b_99B5_9349107595CF" source="EAID_D5AE1A66_594D_488f_AFDF_6C8C5D111A0F" target="EAID_9680588B_831E_4f03_8AD7_7E2899D2520E" modelElement="EAID_71F00BB4_9962_4462_99B5_9349107595CF">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_06F2_4b3b_99B5_9349107595CF" x="677" y="381"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_06F2_4b3b_99B5_9349107595CF" x="678" y="72"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9E08D249_06F2_4b3b_8826_322D82AB6DB0" source="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" target="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" modelElement="EAID_BCCB407C_08A7_467b_8826_322D82AB6DB0">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_06F2_4b3b_8826_322D82AB6DB0" text="+epo:refersToLotGroup" modelElement="EAID_dstCB407C_08A7_467b_8826_322D82AB6DB0">
@@ -1957,23 +2078,23 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9E08D249_06F2_4b3b_BFE6_593632EDB11F" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_20732599_332F_4f0e_BFE6_593632EDB11F">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_06F2_4b3b_BFE6_593632EDB11F" text="+epo:setsGroupingContextForLot" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_06F2_4b3b_BFE6_593632EDB11F" x="892" y="453" width="131" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_06F2_4b3b_BFE6_593632EDB11F" x="894" y="453" width="131" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_06F2_4b3b_BFE6_593632EDB11F" text="1..*" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_06F2_4b3b_BFE6_593632EDB11F" x="973" y="435" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_06F2_4b3b_BFE6_593632EDB11F" x="975" y="435" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_06F2_4b3b_BFE6_593632EDB11F" x="962" y="483"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_06F2_4b3b_BFE6_593632EDB11F" x="961" y="430"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_06F2_4b3b_BFE6_593632EDB11F" x="965" y="483"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_06F2_4b3b_BFE6_593632EDB11F" x="963" y="430"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9E08D249_06F2_4b3b_93CA_CC7ACC63568D" source="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" target="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" modelElement="EAID_4B36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_06F2_4b3b_93CA_CC7ACC63568D" text="+epo:describesLotGroup" modelElement="EAID_dst36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_06F2_4b3b_93CA_CC7ACC63568D" x="913" y="565" width="97" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_06F2_4b3b_93CA_CC7ACC63568D" x="915" y="578" width="97" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_06F2_4b3b_93CA_CC7ACC63568D" text="1" modelElement="EAID_dst36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_06F2_4b3b_93CA_CC7ACC63568D" x="975" y="550" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_06F2_4b3b_93CA_CC7ACC63568D" x="977" y="563" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_06F2_4b3b_93CA_CC7ACC63568D" x="963" y="585"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_06F2_4b3b_93CA_CC7ACC63568D" x="963" y="545"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_06F2_4b3b_93CA_CC7ACC63568D" x="964" y="585"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_06F2_4b3b_93CA_CC7ACC63568D" x="965" y="558"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9E08D249_06F2_4b3b_AE68_D4CA3CC6E260" source="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" target="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" modelElement="EAID_59564C5C_30DE_429b_AE68_D4CA3CC6E260">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_06F2_4b3b_AE68_D4CA3CC6E260" text="+epo:describesResultNotice" modelElement="EAID_dst564C5C_30DE_429b_AE68_D4CA3CC6E260">
@@ -1986,18 +2107,35 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_06F2_4b3b_AE68_D4CA3CC6E260" x="373" y="459"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_06F2_4b3b_AE68_D4CA3CC6E260" x="373" y="322"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9E08D249_06F2_4b3b_B4AA_B8C9088E4284" source="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" target="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" modelElement="EAID_91CB9CAD_CC6F_4c97_B4AA_B8C9088E4284">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_06F2_4b3b_B4AA_B8C9088E4284" text="+epo-not:announcesRole" modelElement="EAID_dstCB9CAD_CC6F_4c97_B4AA_B8C9088E4284">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_06F2_4b3b_B4AA_B8C9088E4284" x="227" y="246" width="100" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9E08D249_06F2_4b3b_9195_C96F98BD3349" source="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_06F2_4b3b_9195_C96F98BD3349" text="+epo:hasProcurementScopeDividedIntoLot" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_06F2_4b3b_9195_C96F98BD3349" x="1034" y="323" width="171" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_06F2_4b3b_B4AA_B8C9088E4284" text="0..*" modelElement="EAID_dstCB9CAD_CC6F_4c97_B4AA_B8C9088E4284">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_06F2_4b3b_B4AA_B8C9088E4284" x="227" y="269" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_06F2_4b3b_9195_C96F98BD3349" text="1..*" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_06F2_4b3b_9195_C96F98BD3349" x="1014" y="349" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_06F2_4b3b_B4AA_B8C9088E4284" x="363" y="264"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_06F2_4b3b_B4AA_B8C9088E4284" x="224" y="264"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_06F2_4b3b_9195_C96F98BD3349" x="1102" y="150"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_06F2_4b3b_9195_C96F98BD3349" x="1119" y="150"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_06F2_4b3b_9195_C96F98BD3349" x="1119" y="344"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_06F2_4b3b_9195_C96F98BD3349" x="1011" y="344"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9E08D249_06F2_4b3b_8C75_04FFB21501B2" source="EAID_E47E3B9A_672A_4b82_BA0F_A1B9C0D14B8E" target="EAID_4A97DCFA_BAC8_4f54_BADE_E2E47352BDD6" modelElement="EAID_90E37548_02F8_4227_8C75_04FFB21501B2">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_06F2_4b3b_8C75_04FFB21501B2" x="601" y="159"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_06F2_4b3b_8C75_04FFB21501B2" x="601" y="113"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9E08D249_06F2_4b3b_86FF_2CE55FF62AB6" source="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" target="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" modelElement="EAID_FA76DFA8_9FC1_4db0_86FF_2CE55FF62AB6">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_06F2_4b3b_86FF_2CE55FF62AB6" text="+epo:announcesLotGroupAwardInformation" modelElement="EAID_dst76DFA8_9FC1_4db0_86FF_2CE55FF62AB6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_06F2_4b3b_86FF_2CE55FF62AB6" x="681" y="584" width="176" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_06F2_4b3b_86FF_2CE55FF62AB6" text="0..*" modelElement="EAID_dst76DFA8_9FC1_4db0_86FF_2CE55FF62AB6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_06F2_4b3b_86FF_2CE55FF62AB6" x="867" y="609" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_06F2_4b3b_86FF_2CE55FF62AB6" x="510" y="322"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_06F2_4b3b_86FF_2CE55FF62AB6" x="510" y="604"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_06F2_4b3b_86FF_2CE55FF62AB6" x="886" y="604"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_FC576D8E_37E3_455d_A552_FC29948F779D" isFrame="false" modelElement="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_FC576D8E_37E3_455d_A552_FC29948F779D" isFrame="false" modelElement="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_FC576D8E_37E3_455d_B8A4_6F969F59938C" modelElement="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_37E3_455d_B8A4_6F969F59938C" text="epo:Notice"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_37E3_455d_B8A4_6F969F59938C" x="34" y="88" width="245" height="163"/>
@@ -2020,7 +2158,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_FC576D8E_37E3_455d_BF42_2A6E50CAF4E6" modelElement="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_37E3_455d_BF42_2A6E50CAF4E6" text="epo:LotGroup"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_37E3_455d_BF42_2A6E50CAF4E6" x="833" y="572" width="171" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_37E3_455d_BF42_2A6E50CAF4E6" x="833" y="572" width="179" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_FC576D8E_37E3_455d_80CC_7E68CBDEDED2" modelElement="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_37E3_455d_80CC_7E68CBDEDED2" text="epo:LotGroupAwardInformation"/>
@@ -2038,16 +2176,32 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_37E3_455d_8372_75A07B6AB066" text="epo:Contract"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_37E3_455d_8372_75A07B6AB066" x="254" y="692" width="216" height="85"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FC576D8E_37E3_455d_87A9_6A9BA62CD554" source="EAID_D847D616_70DB_473a_A2A4_6665F938474C" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_389050E1_4285_45aa_87A9_6A9BA62CD554">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_37E3_455d_87A9_6A9BA62CD554" text="+epo:announcesLot" modelElement="EAID_dst9050E1_4285_45aa_87A9_6A9BA62CD554">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_37E3_455d_87A9_6A9BA62CD554" x="788" y="449" width="79" height="14"/>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_FC576D8E_37E3_455d_98CD_608C5E762EE9" modelElement="EAID_E6FB12CB_F678_4ec8_98CD_608C5E762EE9">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_37E3_455d_98CD_608C5E762EE9" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_37E3_455d_98CD_608C5E762EE9" x="609" y="293" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_FC576D8E_37E3_455d_B8E3_2BC8677D2EC1" modelElement="EAID_44910AF1_0738_4bac_B8E3_2BC8677D2EC1">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_37E3_455d_B8E3_2BC8677D2EC1" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_37E3_455d_B8E3_2BC8677D2EC1" x="610" y="133" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_FC576D8E_37E3_455d_8086_EFFD7222CAFF" modelElement="EAID_A08BABBB_DF17_46af_8086_EFFD7222CAFF">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_37E3_455d_8086_EFFD7222CAFF" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_37E3_455d_8086_EFFD7222CAFF" x="557" y="460" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_FC576D8E_37E3_455d_BC8C_B22259E469A9" modelElement="EAID_D08F9431_D68C_497b_BC8C_B22259E469A9">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_37E3_455d_BC8C_B22259E469A9" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_37E3_455d_BC8C_B22259E469A9" x="558" y="101" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FC576D8E_37E3_455d_9959_5EE6A49DDD1B" source="EAID_D847D616_70DB_473a_A2A4_6665F938474C" target="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" modelElement="EAID_C6F18DD0_9007_48f0_9959_5EE6A49DDD1B">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_37E3_455d_9959_5EE6A49DDD1B" text="+epo:announcesLotGroup" modelElement="EAID_dstF18DD0_9007_48f0_9959_5EE6A49DDD1B">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_37E3_455d_9959_5EE6A49DDD1B" x="728" y="570" width="103" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_37E3_455d_87A9_6A9BA62CD554" text="1..*" modelElement="EAID_dst9050E1_4285_45aa_87A9_6A9BA62CD554">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_37E3_455d_87A9_6A9BA62CD554" x="850" y="472" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_37E3_455d_9959_5EE6A49DDD1B" text="0..*" modelElement="EAID_dstF18DD0_9007_48f0_9959_5EE6A49DDD1B">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_37E3_455d_9959_5EE6A49DDD1B" x="814" y="593" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_37E3_455d_87A9_6A9BA62CD554" x="520" y="322"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_37E3_455d_87A9_6A9BA62CD554" x="520" y="467"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_37E3_455d_87A9_6A9BA62CD554" x="869" y="467"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_37E3_455d_9959_5EE6A49DDD1B" x="496" y="322"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_37E3_455d_9959_5EE6A49DDD1B" x="496" y="588"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_37E3_455d_9959_5EE6A49DDD1B" x="833" y="588"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FC576D8E_37E3_455d_82CF_5486AAD496C1" source="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" target="EAID_D847D616_70DB_473a_A2A4_6665F938474C" modelElement="EAID_38F70CB6_EA38_4786_82CF_5486AAD496C1">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_37E3_455d_82CF_5486AAD496C1" text="+epo:describesDirectAwardPrenotificationNotice" modelElement="EAID_dstF70CB6_EA38_4786_82CF_5486AAD496C1">
@@ -2121,6 +2275,16 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_37E3_455d_929F_478C3A0B8424" x="350" y="459"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_37E3_455d_929F_478C3A0B8424" x="179" y="459"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FC576D8E_37E3_455d_819E_D05D699E0983" source="EAID_D847D616_70DB_473a_A2A4_6665F938474C" target="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" modelElement="EAID_B1307E49_0838_4569_819E_D05D699E0983">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_37E3_455d_819E_D05D699E0983" text="+epo:announcesProcedure" modelElement="EAID_dst307E49_0838_4569_819E_D05D699E0983">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_37E3_455d_819E_D05D699E0983" x="669" y="282" width="107" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_37E3_455d_819E_D05D699E0983" text="1" modelElement="EAID_dst307E49_0838_4569_819E_D05D699E0983">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_37E3_455d_819E_D05D699E0983" x="770" y="305" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_37E3_455d_819E_D05D699E0983" x="541" y="300"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_37E3_455d_819E_D05D699E0983" x="778" y="300"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FC576D8E_37E3_455d_93CA_CC7ACC63568D" source="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" target="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" modelElement="EAID_4B36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_37E3_455d_93CA_CC7ACC63568D" text="+epo:describesLotGroup" modelElement="EAID_dst36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_37E3_455d_93CA_CC7ACC63568D" x="713" y="608" width="97" height="14"/>
@@ -2132,31 +2296,20 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_37E3_455d_93CA_CC7ACC63568D" x="735" y="627"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_37E3_455d_93CA_CC7ACC63568D" x="833" y="627"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FC576D8E_37E3_455d_A025_488C1781D353" source="EAID_D847D616_70DB_473a_A2A4_6665F938474C" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_B825D1CD_744B_411b_A025_488C1781D353">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_37E3_455d_A025_488C1781D353" x="412" y="278"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_37E3_455d_A025_488C1781D353" x="412" y="163"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_37E3_455d_A025_488C1781D353" x="279" y="163"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FC576D8E_37E3_455d_BFE6_593632EDB11F" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_20732599_332F_4f0e_BFE6_593632EDB11F">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_37E3_455d_BFE6_593632EDB11F" text="+epo:setsGroupingContextForLot" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_37E3_455d_BFE6_593632EDB11F" x="849" y="546" width="131" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FC576D8E_37E3_455d_87A9_6A9BA62CD554" source="EAID_D847D616_70DB_473a_A2A4_6665F938474C" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_389050E1_4285_45aa_87A9_6A9BA62CD554">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_37E3_455d_87A9_6A9BA62CD554" text="+epo:announcesLot" modelElement="EAID_dst9050E1_4285_45aa_87A9_6A9BA62CD554">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_37E3_455d_87A9_6A9BA62CD554" x="788" y="449" width="79" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_37E3_455d_BFE6_593632EDB11F" text="1..*" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_37E3_455d_BFE6_593632EDB11F" x="930" y="521" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_37E3_455d_87A9_6A9BA62CD554" text="1..*" modelElement="EAID_dst9050E1_4285_45aa_87A9_6A9BA62CD554">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_37E3_455d_87A9_6A9BA62CD554" x="850" y="472" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_37E3_455d_BFE6_593632EDB11F" x="918" y="572"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_37E3_455d_BFE6_593632EDB11F" x="918" y="516"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_37E3_455d_87A9_6A9BA62CD554" x="520" y="322"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_37E3_455d_87A9_6A9BA62CD554" x="520" y="467"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_37E3_455d_87A9_6A9BA62CD554" x="869" y="467"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FC576D8E_37E3_455d_9959_5EE6A49DDD1B" source="EAID_D847D616_70DB_473a_A2A4_6665F938474C" target="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" modelElement="EAID_C6F18DD0_9007_48f0_9959_5EE6A49DDD1B">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_37E3_455d_9959_5EE6A49DDD1B" text="+epo:announcesLotGroup" modelElement="EAID_dstF18DD0_9007_48f0_9959_5EE6A49DDD1B">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_37E3_455d_9959_5EE6A49DDD1B" x="728" y="570" width="103" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_37E3_455d_9959_5EE6A49DDD1B" text="0..*" modelElement="EAID_dstF18DD0_9007_48f0_9959_5EE6A49DDD1B">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_37E3_455d_9959_5EE6A49DDD1B" x="814" y="593" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_37E3_455d_9959_5EE6A49DDD1B" x="496" y="322"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_37E3_455d_9959_5EE6A49DDD1B" x="496" y="588"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_37E3_455d_9959_5EE6A49DDD1B" x="833" y="588"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FC576D8E_37E3_455d_93FD_457E67FB5F58" source="EAID_A08BABBB_DF17_46af_8086_EFFD7222CAFF" target="EAID_D08F9431_D68C_497b_BC8C_B22259E469A9" modelElement="EAID_4033C88B_B08F_4630_93FD_457E67FB5F58">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_37E3_455d_93FD_457E67FB5F58" x="564" y="467"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_37E3_455d_93FD_457E67FB5F58" x="565" y="108"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FC576D8E_37E3_455d_8D22_F25373156526" source="EAID_D847D616_70DB_473a_A2A4_6665F938474C" target="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" modelElement="EAID_0A7EDA02_3460_4960_8D22_F25373156526">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_37E3_455d_8D22_F25373156526" text="+epo:announcesLotGroupAwardInformation" modelElement="EAID_dst7EDA02_3460_4960_8D22_F25373156526">
@@ -2210,18 +2363,27 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_37E3_455d_9195_C96F98BD3349" x="917" y="356"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_37E3_455d_9195_C96F98BD3349" x="917" y="422"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FC576D8E_37E3_455d_819E_D05D699E0983" source="EAID_D847D616_70DB_473a_A2A4_6665F938474C" target="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" modelElement="EAID_B1307E49_0838_4569_819E_D05D699E0983">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_37E3_455d_819E_D05D699E0983" text="+epo:announcesProcedure" modelElement="EAID_dst307E49_0838_4569_819E_D05D699E0983">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_37E3_455d_819E_D05D699E0983" x="669" y="282" width="107" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FC576D8E_37E3_455d_BFE6_593632EDB11F" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_20732599_332F_4f0e_BFE6_593632EDB11F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_37E3_455d_BFE6_593632EDB11F" text="+epo:setsGroupingContextForLot" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_37E3_455d_BFE6_593632EDB11F" x="850" y="546" width="131" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_37E3_455d_819E_D05D699E0983" text="1" modelElement="EAID_dst307E49_0838_4569_819E_D05D699E0983">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_37E3_455d_819E_D05D699E0983" x="770" y="305" width="6" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_37E3_455d_BFE6_593632EDB11F" text="1..*" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_37E3_455d_BFE6_593632EDB11F" x="931" y="521" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_37E3_455d_819E_D05D699E0983" x="541" y="300"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_37E3_455d_819E_D05D699E0983" x="778" y="300"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_37E3_455d_BFE6_593632EDB11F" x="920" y="572"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_37E3_455d_BFE6_593632EDB11F" x="919" y="516"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FC576D8E_37E3_455d_ABC1_9D68D997C916" source="EAID_E6FB12CB_F678_4ec8_98CD_608C5E762EE9" target="EAID_44910AF1_0738_4bac_B8E3_2BC8677D2EC1" modelElement="EAID_CFE865BE_F277_4169_ABC1_9D68D997C916">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_37E3_455d_ABC1_9D68D997C916" x="616" y="300"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_37E3_455d_ABC1_9D68D997C916" x="617" y="140"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FC576D8E_37E3_455d_A025_488C1781D353" source="EAID_D847D616_70DB_473a_A2A4_6665F938474C" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_B825D1CD_744B_411b_A025_488C1781D353">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_37E3_455d_A025_488C1781D353" x="412" y="278"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_37E3_455d_A025_488C1781D353" x="412" y="163"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_37E3_455d_A025_488C1781D353" x="279" y="163"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_2A14808D_69AA_430c_86C2_CDA04BE8C4F4" isFrame="false" modelElement="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_2A14808D_69AA_430c_86C2_CDA04BE8C4F4" isFrame="false" modelElement="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2A14808D_69AA_430c_B8A4_6F969F59938C" modelElement="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_69AA_430c_B8A4_6F969F59938C" text="epo:Notice"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_B8A4_6F969F59938C" x="382" y="175" width="245" height="163"/>
@@ -2279,15 +2441,32 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_69AA_430c_8F05_5126320D2A7F" text="epo-con:ContractAmendment"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_8F05_5126320D2A7F" x="419" y="734" width="133" height="53"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_9536_906052B9AABC" source="EAID_71373AFD_6871_4946_B921_97A716439257" target="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" modelElement="EAID_67CCA39E_1E30_4142_9536_906052B9AABC">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_69AA_430c_9536_906052B9AABC" text="+epo:announcesRole" modelElement="EAID_dstCCA39E_1E30_4142_9536_906052B9AABC">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_9536_906052B9AABC" x="593" y="412" width="84" height="14"/>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_2A14808D_69AA_430c_9670_9A00EC98EC62" modelElement="EAID_39DBC436_506A_46a4_9670_9A00EC98EC62">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_69AA_430c_9670_9A00EC98EC62" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_9670_9A00EC98EC62" x="900" y="263" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_2A14808D_69AA_430c_B2E9_DEBFBA9394DE" modelElement="EAID_8944D0F2_D657_4ce9_B2E9_DEBFBA9394DE">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_69AA_430c_B2E9_DEBFBA9394DE" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_B2E9_DEBFBA9394DE" x="900" y="111" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_2A14808D_69AA_430c_9044_CFAA473152BE" modelElement="EAID_3CA58BCF_C8DB_4609_9044_CFAA473152BE">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_69AA_430c_9044_CFAA473152BE" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_9044_CFAA473152BE" x="991" y="431" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_2A14808D_69AA_430c_94A2_34A940C86AB6" modelElement="EAID_D51DF83F_EDA1_4cfa_94A2_34A940C86AB6">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_69AA_430c_94A2_34A940C86AB6" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_94A2_34A940C86AB6" x="991" y="78" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_BDF4_F589B6CAC7A1" source="EAID_71373AFD_6871_4946_B921_97A716439257" target="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" modelElement="EAID_9C96E83D_792B_44cd_BDF4_F589B6CAC7A1">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_69AA_430c_BDF4_F589B6CAC7A1" text="+epo:refersToNoticeAwardInformation" modelElement="EAID_dst96E83D_792B_44cd_BDF4_F589B6CAC7A1">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_BDF4_F589B6CAC7A1" x="535" y="539" width="155" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_69AA_430c_9536_906052B9AABC" text="0..*" modelElement="EAID_dstCCA39E_1E30_4142_9536_906052B9AABC">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_9536_906052B9AABC" x="593" y="435" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_69AA_430c_BDF4_F589B6CAC7A1" text="0..1" modelElement="EAID_dst96E83D_792B_44cd_BDF4_F589B6CAC7A1">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_BDF4_F589B6CAC7A1" x="535" y="562" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_9536_906052B9AABC" x="698" y="430"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_9536_906052B9AABC" x="590" y="430"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_BDF4_F589B6CAC7A1" x="705" y="452"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_BDF4_F589B6CAC7A1" x="705" y="557"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_BDF4_F589B6CAC7A1" x="532" y="557"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_8461_8385AB23B103" source="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7" target="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F" modelElement="EAID_005EFF4E_D969_4688_8461_8385AB23B103">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_69AA_430c_8461_8385AB23B103" text="+epo:concernsContractAmendment" modelElement="EAID_dst5EFF4E_D969_4688_8461_8385AB23B103">
@@ -2326,8 +2505,8 @@
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_B3C3_6654ABB348DF" x="1267" y="420" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_B3C3_6654ABB348DF" x="587" y="175"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_B3C3_6654ABB348DF" x="587" y="109"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_B3C3_6654ABB348DF" x="1461" y="109"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_B3C3_6654ABB348DF" x="587" y="85"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_B3C3_6654ABB348DF" x="1461" y="85"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_69AA_430c_B3C3_6654ABB348DF" x="1461" y="415"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_69AA_430c_B3C3_6654ABB348DF" x="1264" y="415"/>
 			</ownedElement>
@@ -2380,6 +2559,17 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_B079_4FE5372221E4" x="485" y="647"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_69AA_430c_B079_4FE5372221E4" x="485" y="734"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_AA2D_59AF706E79E6" source="EAID_71373AFD_6871_4946_B921_97A716439257" target="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" modelElement="EAID_AEF23C3F_F74B_434a_AA2D_59AF706E79E6">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_69AA_430c_AA2D_59AF706E79E6" text="+epo:refersToProcedure" modelElement="EAID_dstF23C3F_F74B_434a_AA2D_59AF706E79E6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_AA2D_59AF706E79E6" x="949" y="248" width="97" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_69AA_430c_AA2D_59AF706E79E6" text="1" modelElement="EAID_dstF23C3F_F74B_434a_AA2D_59AF706E79E6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_AA2D_59AF706E79E6" x="1067" y="275" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_AA2D_59AF706E79E6" x="843" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_AA2D_59AF706E79E6" x="843" y="270"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_AA2D_59AF706E79E6" x="1075" y="270"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_B319_1174DD83D564" source="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_774EE008_B895_41f1_B319_1174DD83D564">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_69AA_430c_B319_1174DD83D564" text="+epo:relatesToEFormSectionIdentifier" modelElement="EAID_dst4EE008_B895_41f1_B319_1174DD83D564">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_B319_1174DD83D564" x="152" y="789" width="152" height="14"/>
@@ -2390,32 +2580,19 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_B319_1174DD83D564" x="227" y="832"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_B319_1174DD83D564" x="227" y="762"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_8080_CCC8C1824CB7" source="EAID_71373AFD_6871_4946_B921_97A716439257" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_05C9AA43_1AE1_4dbd_8080_CCC8C1824CB7">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_8080_CCC8C1824CB7" x="710" y="408"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_8080_CCC8C1824CB7" x="710" y="299"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_8080_CCC8C1824CB7" x="627" y="299"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_93CA_CC7ACC63568D" source="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" target="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" modelElement="EAID_4B36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_69AA_430c_93CA_CC7ACC63568D" text="+epo:describesLotGroup" modelElement="EAID_dst36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_93CA_CC7ACC63568D" x="1167" y="652" width="97" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_9536_906052B9AABC" source="EAID_71373AFD_6871_4946_B921_97A716439257" target="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" modelElement="EAID_67CCA39E_1E30_4142_9536_906052B9AABC">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_69AA_430c_9536_906052B9AABC" text="+epo:announcesRole" modelElement="EAID_dstCCA39E_1E30_4142_9536_906052B9AABC">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_9536_906052B9AABC" x="593" y="412" width="84" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_69AA_430c_93CA_CC7ACC63568D" text="1" modelElement="EAID_dst36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_93CA_CC7ACC63568D" x="1231" y="635" width="6" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_69AA_430c_9536_906052B9AABC" text="0..*" modelElement="EAID_dstCCA39E_1E30_4142_9536_906052B9AABC">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_9536_906052B9AABC" x="593" y="435" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_93CA_CC7ACC63568D" x="1129" y="686"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_93CA_CC7ACC63568D" x="1219" y="686"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_93CA_CC7ACC63568D" x="1219" y="630"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_9536_906052B9AABC" x="698" y="430"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_9536_906052B9AABC" x="590" y="430"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_BDF4_F589B6CAC7A1" source="EAID_71373AFD_6871_4946_B921_97A716439257" target="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" modelElement="EAID_9C96E83D_792B_44cd_BDF4_F589B6CAC7A1">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_69AA_430c_BDF4_F589B6CAC7A1" text="+epo:refersToNoticeAwardInformation" modelElement="EAID_dst96E83D_792B_44cd_BDF4_F589B6CAC7A1">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_BDF4_F589B6CAC7A1" x="535" y="539" width="155" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_69AA_430c_BDF4_F589B6CAC7A1" text="0..1" modelElement="EAID_dst96E83D_792B_44cd_BDF4_F589B6CAC7A1">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_BDF4_F589B6CAC7A1" x="535" y="562" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_BDF4_F589B6CAC7A1" x="705" y="452"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_BDF4_F589B6CAC7A1" x="705" y="557"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_BDF4_F589B6CAC7A1" x="532" y="557"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_9EFF_FF8FC578D4D1" source="EAID_3CA58BCF_C8DB_4609_9044_CFAA473152BE" target="EAID_D51DF83F_EDA1_4cfa_94A2_34A940C86AB6" modelElement="EAID_8B06B92A_4560_49c7_9EFF_FF8FC578D4D1">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_9EFF_FF8FC578D4D1" x="998" y="438"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_9EFF_FF8FC578D4D1" x="998" y="85"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_8C96_D5EA3AE635E9" source="EAID_71373AFD_6871_4946_B921_97A716439257" target="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" modelElement="EAID_17DACA2B_8A10_4516_8C96_D5EA3AE635E9">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_69AA_430c_8C96_D5EA3AE635E9" text="+epo:refersToLotGroup" modelElement="EAID_dstDACA2B_8A10_4516_8C96_D5EA3AE635E9">
@@ -2514,19 +2691,28 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_8467_9DDA71E8D534" x="302" y="620"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_8467_9DDA71E8D534" x="302" y="674"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_AA2D_59AF706E79E6" source="EAID_71373AFD_6871_4946_B921_97A716439257" target="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" modelElement="EAID_AEF23C3F_F74B_434a_AA2D_59AF706E79E6">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_69AA_430c_AA2D_59AF706E79E6" text="+epo:refersToProcedure" modelElement="EAID_dstF23C3F_F74B_434a_AA2D_59AF706E79E6">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_AA2D_59AF706E79E6" x="949" y="248" width="97" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_69AA_430c_AA2D_59AF706E79E6" text="1" modelElement="EAID_dstF23C3F_F74B_434a_AA2D_59AF706E79E6">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_AA2D_59AF706E79E6" x="1067" y="275" width="6" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_93CA_CC7ACC63568D" source="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" target="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" modelElement="EAID_4B36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_69AA_430c_93CA_CC7ACC63568D" text="+epo:describesLotGroup" modelElement="EAID_dst36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_93CA_CC7ACC63568D" x="1167" y="652" width="97" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_AA2D_59AF706E79E6" x="843" y="408"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_AA2D_59AF706E79E6" x="843" y="270"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_AA2D_59AF706E79E6" x="1075" y="270"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_69AA_430c_93CA_CC7ACC63568D" text="1" modelElement="EAID_dst36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_93CA_CC7ACC63568D" x="1231" y="635" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_93CA_CC7ACC63568D" x="1129" y="686"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_93CA_CC7ACC63568D" x="1219" y="686"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_93CA_CC7ACC63568D" x="1219" y="630"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_AA8F_DE5A3705B3A2" source="EAID_39DBC436_506A_46a4_9670_9A00EC98EC62" target="EAID_8944D0F2_D657_4ce9_B2E9_DEBFBA9394DE" modelElement="EAID_87A13B98_6E29_4694_AA8F_DE5A3705B3A2">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_AA8F_DE5A3705B3A2" x="907" y="270"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_AA8F_DE5A3705B3A2" x="907" y="118"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_8080_CCC8C1824CB7" source="EAID_71373AFD_6871_4946_B921_97A716439257" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_05C9AA43_1AE1_4dbd_8080_CCC8C1824CB7">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_8080_CCC8C1824CB7" x="710" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_8080_CCC8C1824CB7" x="710" y="299"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_8080_CCC8C1824CB7" x="627" y="299"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_A0AB8EC3_27DC_4836_9DDA_8F8D6021B5BF" isFrame="false" modelElement="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_A0AB8EC3_27DC_4836_9DDA_8F8D6021B5BF" isFrame="false" modelElement="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A0AB8EC3_27DC_4836_B8A4_6F969F59938C" modelElement="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_27DC_4836_B8A4_6F969F59938C" text="epo:Notice"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_27DC_4836_B8A4_6F969F59938C" x="166" y="118" width="245" height="163"/>
@@ -2582,16 +2768,32 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_27DC_4836_B59A_3107FF9B30BC" text="epo:ReviewRequest"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_27DC_4836_B59A_3107FF9B30BC" x="234" y="806" width="238" height="101"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0AB8EC3_27DC_4836_A7C0_67100DC0E58E" source="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" target="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" modelElement="EAID_9C6B2F1A_EF51_458e_A7C0_67100DC0E58E">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DC_4836_A7C0_67100DC0E58E" text="+epo:refersToLotGroupAwardInformation" modelElement="EAID_dst6B2F1A_EF51_458e_A7C0_67100DC0E58E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DC_4836_A7C0_67100DC0E58E" x="704" y="663" width="166" height="14"/>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_A0AB8EC3_27DC_4836_9781_EB2D19B4D00D" modelElement="EAID_A854A4CB_76B3_4887_9781_EB2D19B4D00D">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_27DC_4836_9781_EB2D19B4D00D" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_27DC_4836_9781_EB2D19B4D00D" x="668" y="327" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_A0AB8EC3_27DC_4836_80A0_62B66243936F" modelElement="EAID_74DCC56E_7AA8_41a1_80A0_62B66243936F">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_27DC_4836_80A0_62B66243936F" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_27DC_4836_80A0_62B66243936F" x="669" y="166" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_A0AB8EC3_27DC_4836_9316_F91D7B17B474" modelElement="EAID_70B80546_7629_40c6_9316_F91D7B17B474">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_27DC_4836_9316_F91D7B17B474" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_27DC_4836_9316_F91D7B17B474" x="723" y="466" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_A0AB8EC3_27DC_4836_ABEA_60317F90ACC4" modelElement="EAID_E8E280AD_7469_4b14_ABEA_60317F90ACC4">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_27DC_4836_ABEA_60317F90ACC4" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_27DC_4836_ABEA_60317F90ACC4" x="722" y="136" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0AB8EC3_27DC_4836_A8BE_2A965642DCD3" source="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" target="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" modelElement="EAID_BBBA098A_C04A_4c7d_A8BE_2A965642DCD3">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DC_4836_A8BE_2A965642DCD3" text="+epo:refersToNoticeAwardInformation" modelElement="EAID_dstBA098A_C04A_4c7d_A8BE_2A965642DCD3">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DC_4836_A8BE_2A965642DCD3" x="317" y="497" width="155" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DC_4836_A7C0_67100DC0E58E" text="0..*" modelElement="EAID_dst6B2F1A_EF51_458e_A7C0_67100DC0E58E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DC_4836_A7C0_67100DC0E58E" x="853" y="686" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DC_4836_A8BE_2A965642DCD3" text="0..1" modelElement="EAID_dstBA098A_C04A_4c7d_A8BE_2A965642DCD3">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DC_4836_A8BE_2A965642DCD3" x="317" y="520" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DC_4836_A7C0_67100DC0E58E" x="583" y="357"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DC_4836_A7C0_67100DC0E58E" x="583" y="681"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DC_4836_A7C0_67100DC0E58E" x="872" y="681"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DC_4836_A8BE_2A965642DCD3" x="507" y="357"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DC_4836_A8BE_2A965642DCD3" x="507" y="515"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DC_4836_A8BE_2A965642DCD3" x="314" y="515"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0AB8EC3_27DC_4836_BFE6_593632EDB11F" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_20732599_332F_4f0e_BFE6_593632EDB11F">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DC_4836_BFE6_593632EDB11F" text="+epo:setsGroupingContextForLot" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
@@ -2637,8 +2839,8 @@
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DC_4836_A411_E8DA312BC449" x="1093" y="331" width="6" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DC_4836_A411_E8DA312BC449" x="411" y="173"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DC_4836_A411_E8DA312BC449" x="1149" y="173"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DC_4836_A411_E8DA312BC449" x="1149" y="326"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DC_4836_A411_E8DA312BC449" x="1148" y="173"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DC_4836_A411_E8DA312BC449" x="1148" y="326"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_27DC_4836_A411_E8DA312BC449" x="1090" y="326"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0AB8EC3_27DC_4836_B1E5_07E432421C63" source="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_95EED5E2_B9B4_4812_B1E5_07E432421C63">
@@ -2659,13 +2861,13 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0AB8EC3_27DC_4836_9F7B_6C2B6C33321B" source="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" target="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" modelElement="EAID_F5AC099A_F1E0_4926_9F7B_6C2B6C33321B">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DC_4836_9F7B_6C2B6C33321B" text="+epo:refersToProcedure" modelElement="EAID_dstAC099A_F1E0_4926_9F7B_6C2B6C33321B">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DC_4836_9F7B_6C2B6C33321B" x="713" y="317" width="97" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DC_4836_9F7B_6C2B6C33321B" x="713" y="316" width="97" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DC_4836_9F7B_6C2B6C33321B" text="1" modelElement="EAID_dstAC099A_F1E0_4926_9F7B_6C2B6C33321B">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DC_4836_9F7B_6C2B6C33321B" x="804" y="340" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DC_4836_9F7B_6C2B6C33321B" x="804" y="339" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DC_4836_9F7B_6C2B6C33321B" x="643" y="335"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DC_4836_9F7B_6C2B6C33321B" x="812" y="335"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DC_4836_9F7B_6C2B6C33321B" x="643" y="334"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DC_4836_9F7B_6C2B6C33321B" x="812" y="334"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0AB8EC3_27DC_4836_A93E_27A2FA651CF4" source="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" target="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" modelElement="EAID_2EC2BFAF_50AE_496d_A93E_27A2FA651CF4">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DC_4836_A93E_27A2FA651CF4" text="+epo:refersToAwardDecision" modelElement="EAID_dstC2BFAF_50AE_496d_A93E_27A2FA651CF4">
@@ -2678,6 +2880,17 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DC_4836_A93E_27A2FA651CF4" x="601" y="238"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DC_4836_A93E_27A2FA651CF4" x="815" y="238"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0AB8EC3_27DC_4836_9F80_EC054ABA2E24" source="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_3656734D_7238_4738_9F80_EC054ABA2E24">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DC_4836_9F80_EC054ABA2E24" text="+epo:refersToLot" modelElement="EAID_dst56734D_7238_4738_9F80_EC054ABA2E24">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DC_4836_9F80_EC054ABA2E24" x="831" y="455" width="69" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DC_4836_9F80_EC054ABA2E24" text="1..*" modelElement="EAID_dst56734D_7238_4738_9F80_EC054ABA2E24">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DC_4836_9F80_EC054ABA2E24" x="883" y="478" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DC_4836_9F80_EC054ABA2E24" x="616" y="357"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DC_4836_9F80_EC054ABA2E24" x="616" y="473"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DC_4836_9F80_EC054ABA2E24" x="902" y="473"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0AB8EC3_27DC_4836_8F66_FA023FA190E7" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DC_4836_8F66_FA023FA190E7" text="+epo:hasLotReference" modelElement="EAID_dstCFA3D8_50E1_40f7_8F66_FA023FA190E7">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DC_4836_8F66_FA023FA190E7" x="1027" y="473" width="90" height="14"/>
@@ -2690,31 +2903,20 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DC_4836_8F66_FA023FA190E7" x="1089" y="488"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_27DC_4836_8F66_FA023FA190E7" x="1001" y="488"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0AB8EC3_27DC_4836_A901_D1A6B9C4D5A7" source="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" target="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" modelElement="EAID_DB36A935_6B61_49a0_A901_D1A6B9C4D5A7">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DC_4836_A901_D1A6B9C4D5A7" text="+epo:refersToLotGroup" modelElement="EAID_dst36A935_6B61_49a0_A901_D1A6B9C4D5A7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DC_4836_A901_D1A6B9C4D5A7" x="770" y="558" width="93" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0AB8EC3_27DC_4836_A7C0_67100DC0E58E" source="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" target="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" modelElement="EAID_9C6B2F1A_EF51_458e_A7C0_67100DC0E58E">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DC_4836_A7C0_67100DC0E58E" text="+epo:refersToLotGroupAwardInformation" modelElement="EAID_dst6B2F1A_EF51_458e_A7C0_67100DC0E58E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DC_4836_A7C0_67100DC0E58E" x="704" y="663" width="166" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DC_4836_A901_D1A6B9C4D5A7" text="0..*" modelElement="EAID_dst36A935_6B61_49a0_A901_D1A6B9C4D5A7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DC_4836_A901_D1A6B9C4D5A7" x="846" y="581" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DC_4836_A7C0_67100DC0E58E" text="0..*" modelElement="EAID_dst6B2F1A_EF51_458e_A7C0_67100DC0E58E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DC_4836_A7C0_67100DC0E58E" x="853" y="686" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DC_4836_A901_D1A6B9C4D5A7" x="601" y="357"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DC_4836_A901_D1A6B9C4D5A7" x="601" y="576"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DC_4836_A901_D1A6B9C4D5A7" x="865" y="576"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0AB8EC3_27DC_4836_B8A1_C090490D5878" source="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" target="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" modelElement="EAID_2C3C6FFD_7F77_424c_B8A1_C090490D5878">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DC_4836_B8A1_C090490D5878" x="311" y="806"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DC_4836_B8A1_C090490D5878" x="311" y="775"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DC_4836_A7C0_67100DC0E58E" x="583" y="357"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DC_4836_A7C0_67100DC0E58E" x="583" y="681"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DC_4836_A7C0_67100DC0E58E" x="872" y="681"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0AB8EC3_27DC_4836_A8BE_2A965642DCD3" source="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" target="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" modelElement="EAID_BBBA098A_C04A_4c7d_A8BE_2A965642DCD3">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DC_4836_A8BE_2A965642DCD3" text="+epo:refersToNoticeAwardInformation" modelElement="EAID_dstBA098A_C04A_4c7d_A8BE_2A965642DCD3">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DC_4836_A8BE_2A965642DCD3" x="317" y="497" width="155" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DC_4836_A8BE_2A965642DCD3" text="0..1" modelElement="EAID_dstBA098A_C04A_4c7d_A8BE_2A965642DCD3">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DC_4836_A8BE_2A965642DCD3" x="317" y="520" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DC_4836_A8BE_2A965642DCD3" x="507" y="357"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DC_4836_A8BE_2A965642DCD3" x="507" y="515"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DC_4836_A8BE_2A965642DCD3" x="314" y="515"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0AB8EC3_27DC_4836_A784_BF1C55F72910" source="EAID_70B80546_7629_40c6_9316_F91D7B17B474" target="EAID_E8E280AD_7469_4b14_ABEA_60317F90ACC4" modelElement="EAID_73A6FC03_1825_4ec1_A784_BF1C55F72910">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DC_4836_A784_BF1C55F72910" x="730" y="473"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DC_4836_A784_BF1C55F72910" x="729" y="143"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0AB8EC3_27DC_4836_9B40_0A74A0E00195" source="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" target="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" modelElement="EAID_B82C6E19_FB7C_453e_9B40_0A74A0E00195">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DC_4836_9B40_0A74A0E00195" text="+epo:refersToRole" modelElement="EAID_dst2C6E19_FB7C_453e_9B40_0A74A0E00195">
@@ -2771,30 +2973,118 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DC_4836_AA0C_F4AAB1D0346B" x="170" y="806"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DC_4836_AA0C_F4AAB1D0346B" x="170" y="775"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0AB8EC3_27DC_4836_9F80_EC054ABA2E24" source="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_3656734D_7238_4738_9F80_EC054ABA2E24">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DC_4836_9F80_EC054ABA2E24" text="+epo:refersToLot" modelElement="EAID_dst56734D_7238_4738_9F80_EC054ABA2E24">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DC_4836_9F80_EC054ABA2E24" x="831" y="455" width="69" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0AB8EC3_27DC_4836_B8A1_C090490D5878" source="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" target="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" modelElement="EAID_2C3C6FFD_7F77_424c_B8A1_C090490D5878">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DC_4836_B8A1_C090490D5878" x="311" y="806"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DC_4836_B8A1_C090490D5878" x="311" y="775"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0AB8EC3_27DC_4836_B03A_DD6F59C0BCAC" source="EAID_A854A4CB_76B3_4887_9781_EB2D19B4D00D" target="EAID_74DCC56E_7AA8_41a1_80A0_62B66243936F" modelElement="EAID_D85B5D9D_A0A9_4ed4_B03A_DD6F59C0BCAC">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DC_4836_B03A_DD6F59C0BCAC" x="675" y="334"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DC_4836_B03A_DD6F59C0BCAC" x="676" y="173"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0AB8EC3_27DC_4836_A901_D1A6B9C4D5A7" source="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" target="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" modelElement="EAID_DB36A935_6B61_49a0_A901_D1A6B9C4D5A7">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DC_4836_A901_D1A6B9C4D5A7" text="+epo:refersToLotGroup" modelElement="EAID_dst36A935_6B61_49a0_A901_D1A6B9C4D5A7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DC_4836_A901_D1A6B9C4D5A7" x="770" y="558" width="93" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DC_4836_9F80_EC054ABA2E24" text="1..*" modelElement="EAID_dst56734D_7238_4738_9F80_EC054ABA2E24">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DC_4836_9F80_EC054ABA2E24" x="883" y="478" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DC_4836_A901_D1A6B9C4D5A7" text="0..*" modelElement="EAID_dst36A935_6B61_49a0_A901_D1A6B9C4D5A7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DC_4836_A901_D1A6B9C4D5A7" x="846" y="581" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DC_4836_9F80_EC054ABA2E24" x="616" y="357"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DC_4836_9F80_EC054ABA2E24" x="616" y="473"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DC_4836_9F80_EC054ABA2E24" x="902" y="473"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DC_4836_A901_D1A6B9C4D5A7" x="601" y="357"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DC_4836_A901_D1A6B9C4D5A7" x="601" y="576"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DC_4836_A901_D1A6B9C4D5A7" x="865" y="576"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_1A0A7BB3_E871_4bc1_84D9_3203BA683A58" isFrame="false" modelElement="EAPK_55622713_57C0_4aec_8ABA_05CE52DE1DE1">
 			<ownedElement xmi:type="umldi:UMLCompartmentableShape" xmi:id="EAID_1A0A7BB3_E871_4bc1_AF6F_5B9C6F71226D" modelElement="EAID_53C53D83_424B_4038_AF6F_5B9C6F71226D">
 				<ownedElement xmi:type="umldi:UMLTypedElementLabel" xmi:id="EAID_NL000000_E871_4bc1_AF6F_5B9C6F71226D" text="pmc"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_E871_4bc1_AF6F_5B9C6F71226D" x="361" y="229" width="100" height="55"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_E871_4bc1_AF6F_5B9C6F71226D" x="106" y="293" width="100" height="55"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1A0A7BB3_E871_4bc1_A1C3_A0E883EA3F03" modelElement="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_E871_4bc1_A1C3_A0E883EA3F03" text="epo-not:PreMarketConsultationNotice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_E871_4bc1_A1C3_A0E883EA3F03" x="326" y="95" width="168" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_E871_4bc1_A1C3_A0E883EA3F03" x="330" y="293" width="168" height="55"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1A0A7BB3_E871_4bc1_A935_11584ADDCE8B" modelElement="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_E871_4bc1_A935_11584ADDCE8B" text="epo-not:PlanningNotice"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_E871_4bc1_A935_11584ADDCE8B" x="350" y="207" width="128" height="41"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1A0A7BB3_E871_4bc1_B8A4_6F969F59938C" modelElement="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_E871_4bc1_B8A4_6F969F59938C" text="epo:Notice"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_E871_4bc1_B8A4_6F969F59938C" x="292" y="22" width="245" height="137"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1A0A7BB3_E871_4bc1_A283_99A69DAB2E4A" modelElement="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_E871_4bc1_A283_99A69DAB2E4A" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_E871_4bc1_A283_99A69DAB2E4A" text="at-voc:form-type"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_E871_4bc1_A283_99A69DAB2E4A" x="659" y="61" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1A0A7BB3_E871_4bc1_A2CC_FA90C006C282" modelElement="EAID_C07688A9_AAC8_4f60_A2CC_FA90C006C282">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_E871_4bc1_A2CC_FA90C006C282" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_E871_4bc1_A2CC_FA90C006C282" text="at-voc:notice-type"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_E871_4bc1_A2CC_FA90C006C282" x="111" y="61" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1A0A7BB3_E871_4bc1_914A_82A0C222723C" modelElement="EAID_F0DE3A34_0F67_47af_914A_82A0C222723C">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_E871_4bc1_914A_82A0C222723C" text="epo-not:NoticeE1"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_E871_4bc1_914A_82A0C222723C" x="359" y="394" width="111" height="48"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLCompartmentableShape" xmi:id="EAID_1A0A7BB3_E871_4bc1_B51B_A85934282E9E" modelElement="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E">
+				<ownedElement xmi:type="umldi:UMLTypedElementLabel" xmi:id="EAID_NL000000_E871_4bc1_B51B_A85934282E9E" text="planning"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_E871_4bc1_B51B_A85934282E9E" x="659" y="394" width="90" height="50"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_1A0A7BB3_E871_4bc1_AA83_B82252A1F6D6" modelElement="EAID_8633DF60_DBCB_4ca7_AA83_B82252A1F6D6">
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_E871_4bc1_AA83_B82252A1F6D6" x="821" y="49" width="115" height="84"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1A0A7BB3_E871_4bc1_9AAE_48C9E1FDC23C" source="EAID_8633DF60_DBCB_4ca7_AA83_B82252A1F6D6" target="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A" modelElement="EAID_6070C1A3_A5F5_4b53_9AAE_48C9E1FDC23C">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E871_4bc1_9AAE_48C9E1FDC23C" x="821" y="91"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E871_4bc1_9AAE_48C9E1FDC23C" x="749" y="91"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1A0A7BB3_E871_4bc1_9615_1F0D6407D00D" source="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" target="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A" modelElement="EAID_765FB2B0_AE50_45c4_9615_1F0D6407D00D">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E871_4bc1_9615_1F0D6407D00D" x="704" y="394"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E871_4bc1_9615_1F0D6407D00D" x="704" y="121"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1A0A7BB3_E871_4bc1_A184_0605456C2FEF" source="EAID_F0DE3A34_0F67_47af_914A_82A0C222723C" target="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" modelElement="EAID_23426D44_9964_443a_A184_0605456C2FEF">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E871_4bc1_A184_0605456C2FEF" x="470" y="418"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E871_4bc1_A184_0605456C2FEF" x="659" y="418"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1A0A7BB3_E871_4bc1_8962_DC4613C4041F" source="EAID_F0DE3A34_0F67_47af_914A_82A0C222723C" target="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03" modelElement="EAID_251F0F6E_D0B5_4304_8962_DC4613C4041F">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E871_4bc1_8962_DC4613C4041F" x="414" y="394"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E871_4bc1_8962_DC4613C4041F" x="414" y="348"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1A0A7BB3_E871_4bc1_BD98_F885B35FD24B" source="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" target="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A" modelElement="EAID_F337974A_F4B7_4be6_BD98_F885B35FD24B">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E871_4bc1_BD98_F885B35FD24B" x="537" y="90"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E871_4bc1_BD98_F885B35FD24B" x="659" y="90"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1A0A7BB3_E871_4bc1_A0B5_482CD2D1D30D" source="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" target="EAID_C07688A9_AAC8_4f60_A2CC_FA90C006C282" modelElement="EAID_6AA5ADDC_B303_41f6_A0B5_482CD2D1D30D">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E871_4bc1_A0B5_482CD2D1D30D" x="292" y="90"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E871_4bc1_A0B5_482CD2D1D30D" x="201" y="90"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1A0A7BB3_E871_4bc1_BE52_91F3F7270840" source="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_7EE70932_F57C_4861_BE52_91F3F7270840">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_E871_4bc1_BE52_91F3F7270840" text="+epo:refersToNotice 0..1" modelElement="EAID_dstE70932_F57C_4861_BE52_91F3F7270840">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_E871_4bc1_BE52_91F3F7270840" x="420" y="4" width="100" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_E871_4bc1_BE52_91F3F7270840" text="0..1" modelElement="EAID_dstE70932_F57C_4861_BE52_91F3F7270840">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_E871_4bc1_BE52_91F3F7270840" x="535" y="17" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E871_4bc1_BE52_91F3F7270840" x="537" y="35"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E871_4bc1_BE52_91F3F7270840" x="537" y="35"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_E871_4bc1_BE52_91F3F7270840" x="574" y="35"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_E871_4bc1_BE52_91F3F7270840" x="574" y="6"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_E871_4bc1_BE52_91F3F7270840" x="527" y="6"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_E871_4bc1_BE52_91F3F7270840" x="527" y="22"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_E871_4bc1_BE52_91F3F7270840" x="527" y="22"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1A0A7BB3_E871_4bc1_A2F1_707153826314" source="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_9B54EEA9_42F0_4e42_A2F1_707153826314">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E871_4bc1_A2F1_707153826314" x="414" y="207"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E871_4bc1_A2F1_707153826314" x="414" y="159"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1A0A7BB3_E871_4bc1_80DC_91F8A4D3F0DE" source="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_A1DC6D24_EABE_467c_80DC_91F8A4D3F0DE">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E871_4bc1_80DC_91F8A4D3F0DE" x="490" y="293"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E871_4bc1_80DC_91F8A4D3F0DE" x="490" y="159"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1A0A7BB3_E871_4bc1_8F4A_B5B2C763463B" source="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03" target="EAID_53C53D83_424B_4038_AF6F_5B9C6F71226D" modelElement="EAID_C0F50A97_3E33_43bb_8F4A_B5B2C763463B">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E871_4bc1_8F4A_B5B2C763463B" x="410" y="165"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E871_4bc1_8F4A_B5B2C763463B" x="410" y="229"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E871_4bc1_8F4A_B5B2C763463B" x="330" y="320"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E871_4bc1_8F4A_B5B2C763463B" x="206" y="320"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1A0A7BB3_E871_4bc1_9FC2_2463E88B2CE6" source="EAID_53C53D83_424B_4038_AF6F_5B9C6F71226D" target="EAID_C07688A9_AAC8_4f60_A2CC_FA90C006C282" modelElement="EAID_47C1ECEB_898B_456c_9FC2_2463E88B2CE6">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E871_4bc1_9FC2_2463E88B2CE6" x="157" y="293"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E871_4bc1_9FC2_2463E88B2CE6" x="157" y="121"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_1376593A_F78D_4947_97B8_405E8E14E9D8" isFrame="false" modelElement="EAPK_2004EEE4_4246_4617_A3E8_7708D7302027">
@@ -2827,24 +3117,24 @@
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F78D_4947_A935_11584ADDCE8B" x="299" y="126" width="390" height="52"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1376593A_F78D_4947_8C16_9F9F412AC05A" source="EAID_7B308DB7_0AC5_45c9_8E6F_0D46097D2C9C" target="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" modelElement="EAID_A15F798A_231D_429f_8C16_9F9F412AC05A">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F78D_4947_8C16_9F9F412AC05A" x="621" y="246"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F78D_4947_8C16_9F9F412AC05A" x="621" y="178"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F78D_4947_8C16_9F9F412AC05A" x="652" y="246"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F78D_4947_8C16_9F9F412AC05A" x="652" y="178"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1376593A_F78D_4947_9E07_2DA712B0C3E2" source="EAID_7B308DB7_0AC5_45c9_8E6F_0D46097D2C9C" target="EAID_0C95DCDD_128C_4045_8B05_B8D28E22ABB2" modelElement="EAID_CBED0009_2B25_4c2b_9E07_2DA712B0C3E2">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F78D_4947_9E07_2DA712B0C3E2" x="644" y="281"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F78D_4947_9E07_2DA712B0C3E2" x="644" y="334"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1376593A_F78D_4947_88B6_1E31A0860DF8" source="EAID_9A9E6106_6655_4d55_9343_6884F40C1496" target="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" modelElement="EAID_DED553E4_8E73_4d32_88B6_1E31A0860DF8">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F78D_4947_88B6_1E31A0860DF8" x="357" y="246"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F78D_4947_88B6_1E31A0860DF8" x="357" y="178"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F78D_4947_88B6_1E31A0860DF8" x="346" y="246"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F78D_4947_88B6_1E31A0860DF8" x="346" y="178"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1376593A_F78D_4947_B426_10C1FBCD992D" source="EAID_9A9E6106_6655_4d55_9343_6884F40C1496" target="EAID_0D6BFEEC_649E_4c20_8CD2_0801F85D499E" modelElement="EAID_F56EAE61_D5DE_4db5_B426_10C1FBCD992D">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F78D_4947_B426_10C1FBCD992D" x="344" y="281"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F78D_4947_B426_10C1FBCD992D" x="344" y="334"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1376593A_F78D_4947_AB06_244F1F3F1AC2" source="EAID_A31D0982_B460_4636_82B7_C2AF2C92D0B7" target="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" modelElement="EAID_AF1D7C6F_AE8A_4b59_AB06_244F1F3F1AC2">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F78D_4947_AB06_244F1F3F1AC2" x="504" y="246"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F78D_4947_AB06_244F1F3F1AC2" x="504" y="178"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F78D_4947_AB06_244F1F3F1AC2" x="492" y="246"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F78D_4947_AB06_244F1F3F1AC2" x="492" y="178"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1376593A_F78D_4947_823C_F5D9AA3AB829" source="EAID_A31D0982_B460_4636_82B7_C2AF2C92D0B7" target="EAID_A28E85B5_919D_438c_AD5D_BCC5C9355C2F" modelElement="EAID_13EDE5F0_D982_41fc_823C_F5D9AA3AB829">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F78D_4947_823C_F5D9AA3AB829" x="494" y="281"/>
@@ -3246,12 +3536,12 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLCompartmentableShape" xmi:id="EAID_A0F9C5CF_C3FB_4597_AD29_7F3F7BD7460A" modelElement="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A">
 				<ownedElement xmi:type="umldi:UMLTypedElementLabel" xmi:id="EAID_NL000000_C3FB_4597_AD29_7F3F7BD7460A" text="Directive 25"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C3FB_4597_AD29_7F3F7BD7460A" x="393" y="189" width="100" height="55"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C3FB_4597_AD29_7F3F7BD7460A" x="535" y="294" width="100" height="55"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A0F9C5CF_C3FB_4597_AB49_BF3DDBFF4E66" modelElement="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_C3FB_4597_AB49_BF3DDBFF4E66" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C3FB_4597_AB49_BF3DDBFF4E66" text="at-voc:legal-basis"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C3FB_4597_AB49_BF3DDBFF4E66" x="315" y="98" width="115" height="62"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C3FB_4597_AB49_BF3DDBFF4E66" x="312" y="99" width="115" height="62"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLCompartmentableShape" xmi:id="EAID_A0F9C5CF_C3FB_4597_B851_9289BD4E15F3" modelElement="EAID_89668AB6_A244_441e_B851_9289BD4E15F3">
 				<ownedElement xmi:type="umldi:UMLTypedElementLabel" xmi:id="EAID_NL000000_C3FB_4597_B851_9289BD4E15F3" text="Directive 81"/>
@@ -3267,34 +3557,50 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLCompartmentableShape" xmi:id="EAID_A0F9C5CF_C3FB_4597_B90C_EF55511242C8" modelElement="EAID_F89732E3_0046_41b6_B90C_EF55511242C8">
 				<ownedElement xmi:type="umldi:UMLTypedElementLabel" xmi:id="EAID_NL000000_C3FB_4597_B90C_EF55511242C8" text="Directive 24"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C3FB_4597_B90C_EF55511242C8" x="250" y="189" width="100" height="55"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C3FB_4597_B90C_EF55511242C8" x="108" y="294" width="100" height="55"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLCompartmentableShape" xmi:id="EAID_A0F9C5CF_C3FB_4597_BC6F_4434B8DC0F67" modelElement="EAID_64AA7AC6_F248_4162_BC6F_4434B8DC0F67">
+				<ownedElement xmi:type="umldi:UMLTypedElementLabel" xmi:id="EAID_NL000000_C3FB_4597_BC6F_4434B8DC0F67" text="Regulation 1046"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C3FB_4597_BC6F_4434B8DC0F67" x="400" y="294" width="100" height="55"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLCompartmentableShape" xmi:id="EAID_A0F9C5CF_C3FB_4597_B8F5_31F967E74257" modelElement="EAID_C0E81714_CC78_4bd5_B8F5_31F967E74257">
+				<ownedElement xmi:type="umldi:UMLTypedElementLabel" xmi:id="EAID_NL000000_C3FB_4597_B8F5_31F967E74257" text="Regulation 1370"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C3FB_4597_B8F5_31F967E74257" x="254" y="294" width="100" height="55"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0F9C5CF_C3FB_4597_9794_D484025607E7" source="EAID_C0E81714_CC78_4bd5_B8F5_31F967E74257" target="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" modelElement="EAID_3452502E_9900_4175_9794_D484025607E7">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C3FB_4597_9794_D484025607E7" x="313" y="294"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C3FB_4597_9794_D484025607E7" x="358" y="161"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0F9C5CF_C3FB_4597_869E_D874CC918E17" source="EAID_64AA7AC6_F248_4162_BC6F_4434B8DC0F67" target="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" modelElement="EAID_4F2CCAB3_E0D4_434a_869E_D874CC918E17">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C3FB_4597_869E_D874CC918E17" x="439" y="294"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C3FB_4597_869E_D874CC918E17" x="386" y="161"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0F9C5CF_C3FB_4597_ADE7_07C48E1E600D" source="EAID_89668AB6_A244_441e_B851_9289BD4E15F3" target="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" modelElement="EAID_062347E1_F78F_43d5_ADE7_07C48E1E600D">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C3FB_4597_ADE7_07C48E1E600D" x="535" y="195"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C3FB_4597_ADE7_07C48E1E600D" x="430" y="152"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C3FB_4597_ADE7_07C48E1E600D" x="535" y="196"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C3FB_4597_ADE7_07C48E1E600D" x="427" y="153"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0F9C5CF_C3FB_4597_9144_41548E3A43AB" source="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" target="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" modelElement="EAID_8E647BBA_AE2A_4ca3_9144_41548E3A43AB">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C3FB_4597_9144_41548E3A43AB" x="420" y="189"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C3FB_4597_9144_41548E3A43AB" x="397" y="160"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C3FB_4597_9144_41548E3A43AB" x="554" y="294"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C3FB_4597_9144_41548E3A43AB" x="404" y="161"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0F9C5CF_C3FB_4597_880A_9FAE9B53D8B9" source="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" target="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" modelElement="EAID_3AC3215E_68C1_470f_880A_9FAE9B53D8B9">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C3FB_4597_880A_9FAE9B53D8B9" x="322" y="189"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C3FB_4597_880A_9FAE9B53D8B9" x="346" y="160"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C3FB_4597_880A_9FAE9B53D8B9" x="187" y="294"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C3FB_4597_880A_9FAE9B53D8B9" x="334" y="161"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0F9C5CF_C3FB_4597_9741_4111A518F567" source="EAID_8E4FF705_88E9_4b3e_A98F_ACC159CC13C2" target="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" modelElement="EAID_E4F802B6_E371_4b25_9741_4111A518F567">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C3FB_4597_9741_4111A518F567" x="208" y="195"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C3FB_4597_9741_4111A518F567" x="315" y="152"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C3FB_4597_9741_4111A518F567" x="312" y="153"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0F9C5CF_C3FB_4597_9D98_ED0E9C28B950" source="EAID_6C334A58_89F2_4d3e_98F6_902667A49E71" target="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" modelElement="EAID_D3C680D4_3CB0_40f5_9D98_ED0E9C28B950">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C3FB_4597_9D98_ED0E9C28B950" x="535" y="129"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C3FB_4597_9D98_ED0E9C28B950" x="430" y="129"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C3FB_4597_9D98_ED0E9C28B950" x="427" y="129"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0F9C5CF_C3FB_4597_99FE_413E8655E126" source="EAID_D6079364_9DE2_45de_9BAC_BE9D74F34B72" target="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" modelElement="EAID_E2227EB0_964E_4ca5_99FE_413E8655E126">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C3FB_4597_99FE_413E8655E126" x="208" y="129"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C3FB_4597_99FE_413E8655E126" x="315" y="129"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C3FB_4597_99FE_413E8655E126" x="312" y="129"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_5CEC90D5_CCA5_4575_80BB_5748E6187F9E" isFrame="false" modelElement="EAPK_8B2689E9_AC38_4c4e_880C_C7FC553D1616">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_5CEC90D5_CCA5_4575_80BB_5748E6187F9E" isFrame="false" modelElement="EAPK_F9A451BC_D24F_4ed4_8497_24F21DD2B6C3">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5CEC90D5_CCA5_4575_AD31_1089680BFBDF" modelElement="EAID_0A917C15_D52D_40b0_AD31_1089680BFBDF">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_CCA5_4575_AD31_1089680BFBDF" text="epo-not:Notice8"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_CCA5_4575_AD31_1089680BFBDF" x="898" y="245" width="116" height="70"/>
@@ -3463,9 +3769,57 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_CCA5_4575_9464_2B2F2DA07EF0" text="epo-not:Notice10"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_CCA5_4575_9464_2B2F2DA07EF0" x="19" y="374" width="131" height="65"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_8BB7_25602ED587F8" source="EAID_0A917C15_D52D_40b0_AD31_1089680BFBDF" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_5D61F39C_18B6_46ae_8BB7_25602ED587F8">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_8BB7_25602ED587F8" x="898" y="266"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_8BB7_25602ED587F8" x="639" y="203"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5CEC90D5_CCA5_4575_914A_82A0C222723C" modelElement="EAID_F0DE3A34_0F67_47af_914A_82A0C222723C">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_CCA5_4575_914A_82A0C222723C" text="epo-not:NoticeE1"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_CCA5_4575_914A_82A0C222723C" x="625" y="818" width="155" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5CEC90D5_CCA5_4575_A2BB_15ABCBF61F8B" modelElement="EAID_B6AAD0B0_AC78_46dd_A2BB_15ABCBF61F8B">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_CCA5_4575_A2BB_15ABCBF61F8B" text="epo-not:NoticeCEI"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_CCA5_4575_A2BB_15ABCBF61F8B" x="1130" y="926" width="131" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5CEC90D5_CCA5_4575_88B4_ABEF21E72261" modelElement="EAID_12A00248_5E3C_489e_88B4_ABEF21E72261">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_CCA5_4575_88B4_ABEF21E72261" text="epo-not:NoticeE3"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_CCA5_4575_88B4_ABEF21E72261" x="978" y="818" width="110" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5CEC90D5_CCA5_4575_84D4_6FB3AAC4A4F9" modelElement="EAID_1A622AA7_D176_418b_84D4_6FB3AAC4A4F9">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_CCA5_4575_84D4_6FB3AAC4A4F9" text="epo-not:NoticeE4"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_CCA5_4575_84D4_6FB3AAC4A4F9" x="1138" y="818" width="116" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5CEC90D5_CCA5_4575_AB43_7ACC411B4F0F" modelElement="EAID_B93F6450_B2DC_42d5_AB43_7ACC411B4F0F">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_CCA5_4575_AB43_7ACC411B4F0F" text="epo-not:NoticeT02"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_CCA5_4575_AB43_7ACC411B4F0F" x="982" y="926" width="103" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5CEC90D5_CCA5_4575_BB25_DB95F670222F" modelElement="EAID_137272D3_D36E_4bc8_BB25_DB95F670222F">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_CCA5_4575_BB25_DB95F670222F" text="epo-not:NoticeE5"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_CCA5_4575_BB25_DB95F670222F" x="649" y="926" width="108" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5CEC90D5_CCA5_4575_AE94_63C59C948D5D" modelElement="EAID_20A35C8C_4895_4aef_AE94_63C59C948D5D">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_CCA5_4575_AE94_63C59C948D5D" text="epo-not:NoticeE2"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_CCA5_4575_AE94_63C59C948D5D" x="826" y="818" width="95" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5CEC90D5_CCA5_4575_80D0_CE346536A2B9" modelElement="EAID_4B4AA994_6B56_421a_80D0_CE346536A2B9">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_CCA5_4575_80D0_CE346536A2B9" text="epo-not:NoticeT01"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_CCA5_4575_80D0_CE346536A2B9" x="816" y="926" width="116" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_AA82_DB17674831F6" source="EAID_F5BD72AB_5FF0_48bc_9464_2B2F2DA07EF0" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_7ABAC75A_602C_4c25_AA82_DB17674831F6">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_AA82_DB17674831F6" x="150" y="377"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_AA82_DB17674831F6" x="535" y="213"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_9069_661C90DA98AA" source="EAID_53A92E92_9CAF_4d77_A25C_5BE7FADB130C" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_6B3143BA_4F2F_4588_9069_661C90DA98AA">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_9069_661C90DA98AA" x="1131" y="115"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_9069_661C90DA98AA" x="639" y="183"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_A037_B9430918E947" source="EAID_459BFB03_27E6_42e5_814A_F4CDA161B12A" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_304C7D59_B4A0_4e72_A037_B9430918E947">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_A037_B9430918E947" x="1131" y="238"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_A037_B9430918E947" x="639" y="195"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_8497_C6A0E6A1DF10" source="EAID_95A5493E_AB63_497a_B38E_96B488D39429" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_5F7A4A22_8891_4306_8497_C6A0E6A1DF10">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_8497_C6A0E6A1DF10" x="1077" y="324"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_8497_C6A0E6A1DF10" x="639" y="205"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_993B_5E066A10CCF9" source="EAID_3FC83BCD_6B25_4180_B697_6D64E2AF9220" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_F0888087_8EC5_44da_993B_5E066A10CCF9">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_993B_5E066A10CCF9" x="1014" y="404"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_993B_5E066A10CCF9" x="639" y="217"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_8C06_C88509A7ADAE" source="EAID_60BE7698_3371_4fef_94A7_1536255B4CDF" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_A1F15800_0C40_46da_8C06_C88509A7ADAE">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_8C06_C88509A7ADAE" x="889" y="422"/>
@@ -3487,25 +3841,25 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_900E_43985FC6F4D3" x="447" y="478"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_900E_43985FC6F4D3" x="565" y="235"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_B824_CA7FBF189C7D" source="EAID_E3E1C02A_989B_432d_9EDC_EB166766150C" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_287B91EE_C9D0_4b5a_B824_CA7FBF189C7D">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_B824_CA7FBF189C7D" x="323" y="468"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_B824_CA7FBF189C7D" x="545" y="235"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_9B7B_4607821ACD3D" source="EAID_61E6D7F3_02F4_4fe3_9A81_0609FB33A070" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_60240524_13B2_46c0_9B7B_4607821ACD3D">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_9B7B_4607821ACD3D" x="115" y="663"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_9B7B_4607821ACD3D" x="543" y="235"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_B119_259EE8D70E63" source="EAID_7C815E00_5AB7_4221_9673_417A43FCEAF3" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_88411C51_17C6_4b79_B119_259EE8D70E63">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_B119_259EE8D70E63" x="193" y="458"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_B119_259EE8D70E63" x="535" y="226"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_9B7B_4607821ACD3D" source="EAID_61E6D7F3_02F4_4fe3_9A81_0609FB33A070" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_60240524_13B2_46c0_9B7B_4607821ACD3D">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_9B7B_4607821ACD3D" x="115" y="663"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_9B7B_4607821ACD3D" x="543" y="235"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_ACDA_D8B62A04195A" source="EAID_BFA7907E_8FB6_49ba_B11E_EBCC5F1EDA23" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_8D822444_2ABC_4032_ACDA_D8B62A04195A">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_ACDA_D8B62A04195A" x="365" y="598"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_ACDA_D8B62A04195A" x="563" y="235"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_B422_A7E2EF4D9832" source="EAID_378A0219_58F3_4bbb_A19B_0E19C7D6814B" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_2CB2CFE5_7A21_4a1d_B422_A7E2EF4D9832">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_B422_A7E2EF4D9832" x="961" y="191"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_B422_A7E2EF4D9832" x="639" y="191"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_A037_B9430918E947" source="EAID_459BFB03_27E6_42e5_814A_F4CDA161B12A" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_304C7D59_B4A0_4e72_A037_B9430918E947">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_A037_B9430918E947" x="1131" y="238"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_A037_B9430918E947" x="639" y="195"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_8BB7_25602ED587F8" source="EAID_0A917C15_D52D_40b0_AD31_1089680BFBDF" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_5D61F39C_18B6_46ae_8BB7_25602ED587F8">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_8BB7_25602ED587F8" x="898" y="266"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_8BB7_25602ED587F8" x="639" y="203"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_90FE_E09A19EA8365" source="EAID_85A3677C_D922_4169_BDDC_6D4FA8F74EE4" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_726794CC_9E6F_4ef1_90FE_E09A19EA8365">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_90FE_E09A19EA8365" x="762" y="304"/>
@@ -3539,13 +3893,45 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_89CA_686B0CAFECBF" x="587" y="148"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_89CA_686B0CAFECBF" x="587" y="93"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_AA82_DB17674831F6" source="EAID_F5BD72AB_5FF0_48bc_9464_2B2F2DA07EF0" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_7ABAC75A_602C_4c25_AA82_DB17674831F6">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_AA82_DB17674831F6" x="150" y="377"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_AA82_DB17674831F6" x="535" y="213"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_B824_CA7FBF189C7D" source="EAID_E3E1C02A_989B_432d_9EDC_EB166766150C" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_287B91EE_C9D0_4b5a_B824_CA7FBF189C7D">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_B824_CA7FBF189C7D" x="323" y="468"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_B824_CA7FBF189C7D" x="545" y="235"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_9AF5_104892C66F82" source="EAID_92794986_A7F2_435b_97E1_C04AC81E72AA" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_CD75AD4C_9D67_425c_9AF5_104892C66F82">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_9AF5_104892C66F82" x="1072" y="528"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_9AF5_104892C66F82" x="639" y="227"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_8A61_A6C3C9EF8A1D" source="EAID_BDB13855_F3DD_4561_A018_D5E4E2B01404" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_93FD0771_35EB_41f8_8A61_A6C3C9EF8A1D">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_8A61_A6C3C9EF8A1D" x="856" y="719"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_8A61_A6C3C9EF8A1D" x="609" y="235"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_AB74_84EC9AB0AF8D" source="EAID_20A35C8C_4895_4aef_AE94_63C59C948D5D" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_10DA1E5E_EB3E_4f82_AB74_84EC9AB0AF8D">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_AB74_84EC9AB0AF8D" x="857" y="818"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_AB74_84EC9AB0AF8D" x="606" y="235"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_BCC9_641769FA2898" source="EAID_137272D3_D36E_4bc8_BB25_DB95F670222F" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_AF8B2993_D45B_4d65_BCC9_641769FA2898">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_BCC9_641769FA2898" x="697" y="926"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_BCC9_641769FA2898" x="593" y="235"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_B3AC_E2C7CB4138B9" source="EAID_B93F6450_B2DC_42d5_AB43_7ACC411B4F0F" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_8CD40BAD_1B19_4e5e_B3AC_E2C7CB4138B9">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_B3AC_E2C7CB4138B9" x="1012" y="926"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_B3AC_E2C7CB4138B9" x="612" y="235"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_88B7_B524DAE70854" source="EAID_1A622AA7_D176_418b_84D4_6FB3AAC4A4F9" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_D150D8BA_9E5C_46d7_88B7_B524DAE70854">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_88B7_B524DAE70854" x="1163" y="818"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_88B7_B524DAE70854" x="627" y="235"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_81DE_AB87104E2971" source="EAID_12A00248_5E3C_489e_88B4_ABEF21E72261" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_25F1119B_B9A1_4e00_81DE_AB87104E2971">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_81DE_AB87104E2971" x="1009" y="818"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_81DE_AB87104E2971" x="616" y="235"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_9294_0DA799BDC3D9" source="EAID_B6AAD0B0_AC78_46dd_A2BB_15ABCBF61F8B" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_6589DF3C_F8AF_4060_9294_0DA799BDC3D9">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_9294_0DA799BDC3D9" x="1167" y="926"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_9294_0DA799BDC3D9" x="621" y="235"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_82A8_10147B85EC4A" source="EAID_F0DE3A34_0F67_47af_914A_82A0C222723C" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_CE524DE2_7EA2_4088_82A8_10147B85EC4A">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_82A8_10147B85EC4A" x="695" y="818"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_82A8_10147B85EC4A" x="594" y="235"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_B276_3E5F1210A7CC" source="EAID_4280D6D9_1C83_445d_B9BA_C83F761767C3" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_2B3454E9_DDE4_4458_B276_3E5F1210A7CC">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_B276_3E5F1210A7CC" x="520" y="820"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_B276_3E5F1210A7CC" x="582" y="235"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_8BA3_B0DFD962D332" source="EAID_78885FA2_A0A3_41bb_AB51_461D20C1E74E" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_958ED0F3_DFB5_4b75_8BA3_B0DFD962D332">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_8BA3_B0DFD962D332" x="320" y="820"/>
@@ -3555,17 +3941,17 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_80B3_72438C82C716" x="132" y="820"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_80B3_72438C82C716" x="555" y="235"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_8016_828165F11C86" source="EAID_9534CCE2_2925_49a9_8149_B4372990E2A4" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_CD99C8BD_DC6F_4d30_8016_828165F11C86">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_8016_828165F11C86" x="1156" y="655"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_8016_828165F11C86" x="639" y="233"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_A724_594C5E16EEAA" source="EAID_1D9B79BD_930F_4444_8C1F_45A560037124" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_EC3728E7_47FB_4acd_A724_594C5E16EEAA">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_A724_594C5E16EEAA" x="126" y="533"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_A724_594C5E16EEAA" x="535" y="229"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_B3AA_82C96EDCD5CD" source="EAID_406DCE49_EA4F_4aa6_BD32_93632614BD58" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_D8F5A0A7_8441_4207_B3AA_82C96EDCD5CD">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_B3AA_82C96EDCD5CD" x="1005" y="680"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_B3AA_82C96EDCD5CD" x="624" y="235"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_8A61_A6C3C9EF8A1D" source="EAID_BDB13855_F3DD_4561_A018_D5E4E2B01404" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_93FD0771_35EB_41f8_8A61_A6C3C9EF8A1D">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_8A61_A6C3C9EF8A1D" x="856" y="719"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_8A61_A6C3C9EF8A1D" x="609" y="235"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_B02F_A6F4616B8667" source="EAID_53B59A9E_0F19_4d91_A276_C93E14F56BF8" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_DDFD9DA4_A0FD_4feb_B02F_A6F4616B8667">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_B02F_A6F4616B8667" x="239" y="575"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_B02F_A6F4616B8667" x="547" y="235"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_8C5D_43CDF93181B9" source="EAID_AA33DDB3_015E_422f_9700_767D093EA6DE" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_B08538A4_702A_4149_8C5D_43CDF93181B9">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_8C5D_43CDF93181B9" x="733" y="719"/>
@@ -3579,17 +3965,17 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_81C0_4EA85548792A" x="488" y="713"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_81C0_4EA85548792A" x="578" y="235"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_993B_5E066A10CCF9" source="EAID_3FC83BCD_6B25_4180_B697_6D64E2AF9220" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_F0888087_8EC5_44da_993B_5E066A10CCF9">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_993B_5E066A10CCF9" x="1014" y="404"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_993B_5E066A10CCF9" x="639" y="217"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_A537_FAD85DD7FBD4" source="EAID_275E786B_A6CB_4f7d_8A46_523230F3EEE0" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_4CC6B937_BF6E_4d00_A537_FAD85DD7FBD4">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_A537_FAD85DD7FBD4" x="361" y="713"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_A537_FAD85DD7FBD4" x="568" y="235"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_A6E5_919F4F518F2D" source="EAID_961635DD_1E69_4907_B7A8_D2D05116023F" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_84CB7ABD_1AEF_47ce_A6E5_919F4F518F2D">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_A6E5_919F4F518F2D" x="239" y="713"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_A6E5_919F4F518F2D" x="557" y="235"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_8497_C6A0E6A1DF10" source="EAID_95A5493E_AB63_497a_B38E_96B488D39429" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_5F7A4A22_8891_4306_8497_C6A0E6A1DF10">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_8497_C6A0E6A1DF10" x="1077" y="324"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_8497_C6A0E6A1DF10" x="639" y="205"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_9AF5_104892C66F82" source="EAID_92794986_A7F2_435b_97E1_C04AC81E72AA" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_CD75AD4C_9D67_425c_9AF5_104892C66F82">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_9AF5_104892C66F82" x="1072" y="528"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_9AF5_104892C66F82" x="639" y="227"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_BF99_92791E20F841" source="EAID_D433A9D5_8DF2_427f_AA5C_AF579979A24B" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_EE95B6A9_B1E7_412d_BF99_92791E20F841">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_BF99_92791E20F841" x="892" y="572"/>
@@ -3603,589 +3989,686 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_B0D8_BC329006B679" x="521" y="598"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_B0D8_BC329006B679" x="579" y="235"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_ACDA_D8B62A04195A" source="EAID_BFA7907E_8FB6_49ba_B11E_EBCC5F1EDA23" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_8D822444_2ABC_4032_ACDA_D8B62A04195A">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_ACDA_D8B62A04195A" x="365" y="598"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_ACDA_D8B62A04195A" x="563" y="235"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_B02F_A6F4616B8667" source="EAID_53B59A9E_0F19_4d91_A276_C93E14F56BF8" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_DDFD9DA4_A0FD_4feb_B02F_A6F4616B8667">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_B02F_A6F4616B8667" x="239" y="575"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_B02F_A6F4616B8667" x="547" y="235"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_A724_594C5E16EEAA" source="EAID_1D9B79BD_930F_4444_8C1F_45A560037124" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_EC3728E7_47FB_4acd_A724_594C5E16EEAA">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_A724_594C5E16EEAA" x="126" y="533"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_A724_594C5E16EEAA" x="535" y="229"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_9069_661C90DA98AA" source="EAID_53A92E92_9CAF_4d77_A25C_5BE7FADB130C" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_6B3143BA_4F2F_4588_9069_661C90DA98AA">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_9069_661C90DA98AA" x="1131" y="115"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_9069_661C90DA98AA" x="639" y="183"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_B276_3E5F1210A7CC" source="EAID_4280D6D9_1C83_445d_B9BA_C83F761767C3" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_2B3454E9_DDE4_4458_B276_3E5F1210A7CC">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_B276_3E5F1210A7CC" x="520" y="820"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_B276_3E5F1210A7CC" x="582" y="235"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_A9DE_D600878A0184" source="EAID_4B4AA994_6B56_421a_80D0_CE346536A2B9" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_DDE54F6E_927C_4aa6_A9DE_D600878A0184">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_A9DE_D600878A0184" x="860" y="926"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_A9DE_D600878A0184" x="603" y="235"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_A537_FAD85DD7FBD4" source="EAID_275E786B_A6CB_4f7d_8A46_523230F3EEE0" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_4CC6B937_BF6E_4d00_A537_FAD85DD7FBD4">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_A537_FAD85DD7FBD4" x="361" y="713"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_A537_FAD85DD7FBD4" x="568" y="235"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5CEC90D5_CCA5_4575_8016_828165F11C86" source="EAID_9534CCE2_2925_49a9_8149_B4372990E2A4" target="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" modelElement="EAID_CD99C8BD_DC6F_4d30_8016_828165F11C86">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CCA5_4575_8016_828165F11C86" x="1156" y="655"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CCA5_4575_8016_828165F11C86" x="639" y="233"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_FABAECA6_C004_4da5_A405_DEF53DCEAD55" isFrame="false" modelElement="EAPK_6970E353_92B6_44dc_8D54_27EE50616607">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_FABAECA6_C004_4da5_AD31_1089680BFBDF" modelElement="EAID_0A917C15_D52D_40b0_AD31_1089680BFBDF">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C004_4da5_AD31_1089680BFBDF" text="epo-not:Notice8"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_AD31_1089680BFBDF" x="928" y="415" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_AD31_1089680BFBDF" x="1315" y="613" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_FABAECA6_C004_4da5_BB41_193BFE8F5B8E" modelElement="EAID_0D9421F2_620D_43ab_BB41_193BFE8F5B8E">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C004_4da5_BB41_193BFE8F5B8E" text="epo-not:Notice2"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_BB41_193BFE8F5B8E" x="226" y="415" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_BB41_193BFE8F5B8E" x="448" y="613" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_FABAECA6_C004_4da5_A19B_0E19C7D6814B" modelElement="EAID_378A0219_58F3_4bbb_A19B_0E19C7D6814B">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C004_4da5_A19B_0E19C7D6814B" text="epo-not:Notice9"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_A19B_0E19C7D6814B" x="1045" y="415" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_A19B_0E19C7D6814B" x="1432" y="613" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLCompartmentableShape" xmi:id="EAID_FABAECA6_C004_4da5_B51B_A85934282E9E" modelElement="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E">
 				<ownedElement xmi:type="umldi:UMLTypedElementLabel" xmi:id="EAID_NL000000_C004_4da5_B51B_A85934282E9E" text="planning"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_B51B_A85934282E9E" x="518" y="747" width="207" height="94"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_B51B_A85934282E9E" x="740" y="945" width="207" height="152"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_FABAECA6_C004_4da5_B157_A0A97128A458" modelElement="EAID_64AABC7B_6677_49c0_B157_A0A97128A458">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C004_4da5_B157_A0A97128A458" text="epo-not:Notice6"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_B157_A0A97128A458" x="694" y="415" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_B157_A0A97128A458" x="916" y="613" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLCompartmentableShape" xmi:id="EAID_FABAECA6_C004_4da5_AD29_7F3F7BD7460A" modelElement="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A">
 				<ownedElement xmi:type="umldi:UMLTypedElementLabel" xmi:id="EAID_NL000000_C004_4da5_AD29_7F3F7BD7460A" text="Directive 25"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_AD29_7F3F7BD7460A" x="518" y="579" width="90" height="50"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_AD29_7F3F7BD7460A" x="740" y="777" width="90" height="50"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_FABAECA6_C004_4da5_BBDD_E7E6A2ED7E06" modelElement="EAID_77B7A553_E803_4004_BBDD_E7E6A2ED7E06">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C004_4da5_BBDD_E7E6A2ED7E06" text="epo-not:Notice5"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_BBDD_E7E6A2ED7E06" x="577" y="415" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_BBDD_E7E6A2ED7E06" x="799" y="613" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_FABAECA6_C004_4da5_8E6F_0D46097D2C9C" modelElement="EAID_7B308DB7_0AC5_45c9_8E6F_0D46097D2C9C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C004_4da5_8E6F_0D46097D2C9C" text="epo-not:PINTimeLimitNotice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_8E6F_0D46097D2C9C" x="928" y="275" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_8E6F_0D46097D2C9C" x="1364" y="472" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_FABAECA6_C004_4da5_BDDC_6D4FA8F74EE4" modelElement="EAID_85A3677C_D922_4169_BDDC_6D4FA8F74EE4">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C004_4da5_BDDC_6D4FA8F74EE4" text="epo-not:Notice7"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_BDDC_6D4FA8F74EE4" x="811" y="415" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_BDDC_6D4FA8F74EE4" x="1198" y="613" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLCompartmentableShape" xmi:id="EAID_FABAECA6_C004_4da5_B851_9289BD4E15F3" modelElement="EAID_89668AB6_A244_441e_B851_9289BD4E15F3">
 				<ownedElement xmi:type="umldi:UMLTypedElementLabel" xmi:id="EAID_NL000000_C004_4da5_B851_9289BD4E15F3" text="Directive 81"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_B851_9289BD4E15F3" x="874" y="504" width="90" height="50"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_B851_9289BD4E15F3" x="1261" y="702" width="90" height="50"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_FABAECA6_C004_4da5_AC97_B7125F25083F" modelElement="EAID_8A9B11CE_AE42_4569_AC97_B7125F25083F">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C004_4da5_AC97_B7125F25083F" text="epo-not:Notice1"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_AC97_B7125F25083F" x="109" y="415" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_AC97_B7125F25083F" x="331" y="613" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_FABAECA6_C004_4da5_9343_6884F40C1496" modelElement="EAID_9A9E6106_6655_4d55_9343_6884F40C1496">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C004_4da5_9343_6884F40C1496" text="epo-not:PINProfileNotice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_9343_6884F40C1496" x="226" y="274" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_9343_6884F40C1496" x="448" y="472" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_FABAECA6_C004_4da5_82B7_C2AF2C92D0B7" modelElement="EAID_A31D0982_B460_4636_82B7_C2AF2C92D0B7">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C004_4da5_82B7_C2AF2C92D0B7" text="epo-not:PINOnlyNotice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_82B7_C2AF2C92D0B7" x="577" y="275" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_82B7_C2AF2C92D0B7" x="857" y="472" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_FABAECA6_C004_4da5_A935_11584ADDCE8B" modelElement="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C004_4da5_A935_11584ADDCE8B" text="epo-not:PlanningNotice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_A935_11584ADDCE8B" x="403" y="134" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_A935_11584ADDCE8B" x="625" y="332" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_FABAECA6_C004_4da5_A258_2F777FE65124" modelElement="EAID_BE2F39AF_CFBF_4b97_A258_2F777FE65124">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C004_4da5_A258_2F777FE65124" text="epo-not:Notice3"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_A258_2F777FE65124" x="343" y="415" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_A258_2F777FE65124" x="565" y="613" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_FABAECA6_C004_4da5_A4DB_AFA624268215" modelElement="EAID_F4FA5525_AA4D_46bb_A4DB_AFA624268215">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C004_4da5_A4DB_AFA624268215" text="epo-not:Notice4"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_A4DB_AFA624268215" x="460" y="415" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_A4DB_AFA624268215" x="682" y="613" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLCompartmentableShape" xmi:id="EAID_FABAECA6_C004_4da5_B90C_EF55511242C8" modelElement="EAID_F89732E3_0046_41b6_B90C_EF55511242C8">
 				<ownedElement xmi:type="umldi:UMLTypedElementLabel" xmi:id="EAID_NL000000_C004_4da5_B90C_EF55511242C8" text="Directive 24"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_B90C_EF55511242C8" x="260" y="629" width="90" height="50"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_B90C_EF55511242C8" x="482" y="827" width="90" height="50"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_846D_2858010D4357" source="EAID_0A917C15_D52D_40b0_AD31_1089680BFBDF" target="EAID_7B308DB7_0AC5_45c9_8E6F_0D46097D2C9C" modelElement="EAID_EB529402_EAC3_46fb_846D_2858010D4357">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_846D_2858010D4357" x="973" y="415"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_846D_2858010D4357" x="973" y="345"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_FABAECA6_C004_4da5_A1C3_A0E883EA3F03" modelElement="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C004_4da5_A1C3_A0E883EA3F03" text="epo-not:PreMarketConsultationNotice"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_A1C3_A0E883EA3F03" x="162" y="472" width="169" height="70"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_9B19_5424EE0DD512" source="EAID_BE2F39AF_CFBF_4b97_A258_2F777FE65124" target="EAID_89668AB6_A244_441e_B851_9289BD4E15F3" modelElement="EAID_DF4E84B8_BC53_457a_9B19_5424EE0DD512">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_9B19_5424EE0DD512" x="406" y="450"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_9B19_5424EE0DD512" x="406" y="539"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_9B19_5424EE0DD512" x="874" y="539"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_FABAECA6_C004_4da5_914A_82A0C222723C" modelElement="EAID_F0DE3A34_0F67_47af_914A_82A0C222723C">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C004_4da5_914A_82A0C222723C" text="epo-not:NoticeE1"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_914A_82A0C222723C" x="202" y="613" width="90" height="35"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_AA3B_C4F232F7574F" source="EAID_BE2F39AF_CFBF_4b97_A258_2F777FE65124" target="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" modelElement="EAID_182C7BFF_7991_4a8e_AA3B_C4F232F7574F">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_AA3B_C4F232F7574F" x="383" y="450"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_AA3B_C4F232F7574F" x="383" y="773"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_AA3B_C4F232F7574F" x="518" y="773"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_FABAECA6_C004_4da5_AE94_63C59C948D5D" modelElement="EAID_20A35C8C_4895_4aef_AE94_63C59C948D5D">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C004_4da5_AE94_63C59C948D5D" text="epo-not:NoticeE2"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_AE94_63C59C948D5D" x="1056" y="613" width="90" height="35"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_AC94_51FB591352A8" source="EAID_F4FA5525_AA4D_46bb_A4DB_AFA624268215" target="EAID_A31D0982_B460_4636_82B7_C2AF2C92D0B7" modelElement="EAID_4D75816A_997C_42ba_AC94_51FB591352A8">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_AC94_51FB591352A8" x="521" y="415"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_AC94_51FB591352A8" x="588" y="345"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_FABAECA6_C004_4da5_80D0_CE346536A2B9" modelElement="EAID_4B4AA994_6B56_421a_80D0_CE346536A2B9">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C004_4da5_80D0_CE346536A2B9" text="epo-not:NoticeT01"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_80D0_CE346536A2B9" x="1552" y="613" width="90" height="35"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_B65C_903E3691CA96" source="EAID_F4FA5525_AA4D_46bb_A4DB_AFA624268215" target="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" modelElement="EAID_EA81BC08_9517_4e13_B65C_903E3691CA96">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_B65C_903E3691CA96" x="463" y="450"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_B65C_903E3691CA96" x="463" y="637"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_B65C_903E3691CA96" x="350" y="637"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_FABAECA6_C004_4da5_B8A4_6F969F59938C" modelElement="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C004_4da5_B8A4_6F969F59938C" text="epo:Notice"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_B8A4_6F969F59938C" x="547" y="167" width="245" height="127"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_8C65_7C72BF9EF936" source="EAID_F4FA5525_AA4D_46bb_A4DB_AFA624268215" target="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" modelElement="EAID_D134E775_11C7_4793_8C65_7C72BF9EF936">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_8C65_7C72BF9EF936" x="478" y="450"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_8C65_7C72BF9EF936" x="478" y="755"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_8C65_7C72BF9EF936" x="518" y="755"/>
+			<ownedElement xmi:type="umldi:UMLCompartmentableShape" xmi:id="EAID_FABAECA6_C004_4da5_B8F5_31F967E74257" modelElement="EAID_C0E81714_CC78_4bd5_B8F5_31F967E74257">
+				<ownedElement xmi:type="umldi:UMLTypedElementLabel" xmi:id="EAID_NL000000_C004_4da5_B8F5_31F967E74257" text="Regulation 1370"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C004_4da5_B8F5_31F967E74257" x="1530" y="757" width="90" height="50"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_B24C_6B2EC6A04EE7" source="EAID_77B7A553_E803_4004_BBDD_E7E6A2ED7E06" target="EAID_A31D0982_B460_4636_82B7_C2AF2C92D0B7" modelElement="EAID_81C15491_9561_4a4b_B24C_6B2EC6A04EE7">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_B24C_6B2EC6A04EE7" x="622" y="415"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_B24C_6B2EC6A04EE7" x="622" y="345"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_A652_453D48B0CA7E" source="EAID_64AABC7B_6677_49c0_B157_A0A97128A458" target="EAID_A31D0982_B460_4636_82B7_C2AF2C92D0B7" modelElement="EAID_8DDCEAA8_CB1F_4102_A652_453D48B0CA7E">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_A652_453D48B0CA7E" x="952" y="613"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_A652_453D48B0CA7E" x="918" y="542"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_95CC_76D95D51FD8A" source="EAID_77B7A553_E803_4004_BBDD_E7E6A2ED7E06" target="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" modelElement="EAID_BE01D9C1_FCF1_4ee6_95CC_76D95D51FD8A">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_95CC_76D95D51FD8A" x="587" y="450"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_95CC_76D95D51FD8A" x="587" y="579"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_98DC_87BEB2186702" source="EAID_BE2F39AF_CFBF_4b97_A258_2F777FE65124" target="EAID_9A9E6106_6655_4d55_9343_6884F40C1496" modelElement="EAID_9EF7739E_6DEB_48cc_98DC_87BEB2186702">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_98DC_87BEB2186702" x="593" y="613"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_98DC_87BEB2186702" x="526" y="542"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_89B8_9848E326CEF8" source="EAID_77B7A553_E803_4004_BBDD_E7E6A2ED7E06" target="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" modelElement="EAID_FB2BB349_DFDB_4132_89B8_9848E326CEF8">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_89B8_9848E326CEF8" x="652" y="450"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_89B8_9848E326CEF8" x="652" y="747"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_8A1F_9A3D6F23B10A" source="EAID_0A917C15_D52D_40b0_AD31_1089680BFBDF" target="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" modelElement="EAID_6C23590C_DC5E_499c_8A1F_9A3D6F23B10A">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_8A1F_9A3D6F23B10A" x="1385" y="648"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_8A1F_9A3D6F23B10A" x="1385" y="1037"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_8A1F_9A3D6F23B10A" x="947" y="1037"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_A652_453D48B0CA7E" source="EAID_64AABC7B_6677_49c0_B157_A0A97128A458" target="EAID_A31D0982_B460_4636_82B7_C2AF2C92D0B7" modelElement="EAID_8DDCEAA8_CB1F_4102_A652_453D48B0CA7E">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_A652_453D48B0CA7E" x="722" y="415"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_A652_453D48B0CA7E" x="655" y="345"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_8605_0C705EEC1EF5" source="EAID_0A917C15_D52D_40b0_AD31_1089680BFBDF" target="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" modelElement="EAID_BAEF6C8B_1B54_420b_8605_0C705EEC1EF5">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_8605_0C705EEC1EF5" x="1367" y="648"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_8605_0C705EEC1EF5" x="1367" y="807"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_8605_0C705EEC1EF5" x="830" y="807"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_846D_2858010D4357" source="EAID_0A917C15_D52D_40b0_AD31_1089680BFBDF" target="EAID_7B308DB7_0AC5_45c9_8E6F_0D46097D2C9C" modelElement="EAID_EB529402_EAC3_46fb_846D_2858010D4357">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_846D_2858010D4357" x="1366" y="613"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_846D_2858010D4357" x="1395" y="542"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_8C15_332EAC4B3904" source="EAID_85A3677C_D922_4169_BDDC_6D4FA8F74EE4" target="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" modelElement="EAID_7861D5F9_24A5_4cdc_8C15_332EAC4B3904">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_8C15_332EAC4B3904" x="1252" y="648"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_8C15_332EAC4B3904" x="1252" y="1011"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_8C15_332EAC4B3904" x="947" y="1011"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_B663_E08B34100639" source="EAID_85A3677C_D922_4169_BDDC_6D4FA8F74EE4" target="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" modelElement="EAID_FA04F438_FBFD_4a53_B663_E08B34100639">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_B663_E08B34100639" x="1215" y="648"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_B663_E08B34100639" x="1215" y="866"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_B663_E08B34100639" x="572" y="866"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_B5E3_EDE10941DF91" source="EAID_85A3677C_D922_4169_BDDC_6D4FA8F74EE4" target="EAID_7B308DB7_0AC5_45c9_8E6F_0D46097D2C9C" modelElement="EAID_DE1E6E6D_F92C_4af1_B5E3_EDE10941DF91">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_B5E3_EDE10941DF91" x="1265" y="613"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_B5E3_EDE10941DF91" x="1364" y="540"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_8815_666C9CD92900" source="EAID_378A0219_58F3_4bbb_A19B_0E19C7D6814B" target="EAID_89668AB6_A244_441e_B851_9289BD4E15F3" modelElement="EAID_E24F0453_58DF_4fce_8815_666C9CD92900">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_8815_666C9CD92900" x="1464" y="648"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_8815_666C9CD92900" x="1464" y="729"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_8815_666C9CD92900" x="1351" y="729"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_86C4_34506B53F655" source="EAID_64AABC7B_6677_49c0_B157_A0A97128A458" target="EAID_89668AB6_A244_441e_B851_9289BD4E15F3" modelElement="EAID_26E5CF31_436C_4888_86C4_34506B53F655">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_86C4_34506B53F655" x="721" y="450"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_86C4_34506B53F655" x="721" y="519"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_86C4_34506B53F655" x="874" y="519"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_86C4_34506B53F655" x="943" y="648"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_86C4_34506B53F655" x="943" y="717"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_86C4_34506B53F655" x="1261" y="717"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_B185_99AC7779C464" source="EAID_378A0219_58F3_4bbb_A19B_0E19C7D6814B" target="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" modelElement="EAID_BD4D35AF_F4C0_470f_B185_99AC7779C464">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_B185_99AC7779C464" x="1503" y="648"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_B185_99AC7779C464" x="1503" y="1057"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_B185_99AC7779C464" x="947" y="1057"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_89B8_9848E326CEF8" source="EAID_77B7A553_E803_4004_BBDD_E7E6A2ED7E06" target="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" modelElement="EAID_FB2BB349_DFDB_4132_89B8_9848E326CEF8">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_89B8_9848E326CEF8" x="874" y="648"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_89B8_9848E326CEF8" x="874" y="945"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_95CC_76D95D51FD8A" source="EAID_77B7A553_E803_4004_BBDD_E7E6A2ED7E06" target="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" modelElement="EAID_BE01D9C1_FCF1_4ee6_95CC_76D95D51FD8A">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_95CC_76D95D51FD8A" x="809" y="648"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_95CC_76D95D51FD8A" x="809" y="777"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_B24C_6B2EC6A04EE7" source="EAID_77B7A553_E803_4004_BBDD_E7E6A2ED7E06" target="EAID_A31D0982_B460_4636_82B7_C2AF2C92D0B7" modelElement="EAID_81C15491_9561_4a4b_B24C_6B2EC6A04EE7">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_B24C_6B2EC6A04EE7" x="852" y="613"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_B24C_6B2EC6A04EE7" x="885" y="542"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_8C65_7C72BF9EF936" source="EAID_F4FA5525_AA4D_46bb_A4DB_AFA624268215" target="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" modelElement="EAID_D134E775_11C7_4793_8C65_7C72BF9EF936">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_8C65_7C72BF9EF936" x="700" y="648"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_8C65_7C72BF9EF936" x="700" y="960"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_8C65_7C72BF9EF936" x="740" y="960"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_B65C_903E3691CA96" source="EAID_F4FA5525_AA4D_46bb_A4DB_AFA624268215" target="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" modelElement="EAID_EA81BC08_9517_4e13_B65C_903E3691CA96">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_B65C_903E3691CA96" x="685" y="648"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_B65C_903E3691CA96" x="685" y="835"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_B65C_903E3691CA96" x="572" y="835"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_AC94_51FB591352A8" source="EAID_F4FA5525_AA4D_46bb_A4DB_AFA624268215" target="EAID_A31D0982_B460_4636_82B7_C2AF2C92D0B7" modelElement="EAID_4D75816A_997C_42ba_AC94_51FB591352A8">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_AC94_51FB591352A8" x="751" y="613"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_AC94_51FB591352A8" x="857" y="538"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_AA3B_C4F232F7574F" source="EAID_BE2F39AF_CFBF_4b97_A258_2F777FE65124" target="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" modelElement="EAID_182C7BFF_7991_4a8e_AA3B_C4F232F7574F">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_AA3B_C4F232F7574F" x="605" y="648"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_AA3B_C4F232F7574F" x="605" y="987"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_AA3B_C4F232F7574F" x="740" y="987"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_9B19_5424EE0DD512" source="EAID_BE2F39AF_CFBF_4b97_A258_2F777FE65124" target="EAID_89668AB6_A244_441e_B851_9289BD4E15F3" modelElement="EAID_DF4E84B8_BC53_457a_9B19_5424EE0DD512">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_9B19_5424EE0DD512" x="628" y="648"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_9B19_5424EE0DD512" x="628" y="737"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_9B19_5424EE0DD512" x="1261" y="737"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_A0D3_9DE895E13057" source="EAID_64AABC7B_6677_49c0_B157_A0A97128A458" target="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" modelElement="EAID_4A3E5F63_E2CC_4dde_A0D3_9DE895E13057">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_A0D3_9DE895E13057" x="781" y="450"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_A0D3_9DE895E13057" x="781" y="763"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_A0D3_9DE895E13057" x="725" y="763"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_A0D3_9DE895E13057" x="1003" y="648"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_A0D3_9DE895E13057" x="1003" y="960"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_A0D3_9DE895E13057" x="947" y="960"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_B5E3_EDE10941DF91" source="EAID_85A3677C_D922_4169_BDDC_6D4FA8F74EE4" target="EAID_7B308DB7_0AC5_45c9_8E6F_0D46097D2C9C" modelElement="EAID_DE1E6E6D_F92C_4af1_B5E3_EDE10941DF91">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_B5E3_EDE10941DF91" x="872" y="415"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_B5E3_EDE10941DF91" x="939" y="345"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_9434_FF80603A8059" source="EAID_0D9421F2_620D_43ab_BB41_193BFE8F5B8E" target="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" modelElement="EAID_30880E95_E936_44d6_9434_FF80603A8059">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_9434_FF80603A8059" x="503" y="648"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_9434_FF80603A8059" x="503" y="804"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_9434_FF80603A8059" x="740" y="804"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_98DC_87BEB2186702" source="EAID_BE2F39AF_CFBF_4b97_A258_2F777FE65124" target="EAID_9A9E6106_6655_4d55_9343_6884F40C1496" modelElement="EAID_9EF7739E_6DEB_48cc_98DC_87BEB2186702">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_98DC_87BEB2186702" x="371" y="415"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_98DC_87BEB2186702" x="304" y="344"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_AA46_30FE9C0CC404" source="EAID_4B4AA994_6B56_421a_80D0_CE346536A2B9" target="EAID_C0E81714_CC78_4bd5_B8F5_31F967E74257" modelElement="EAID_22448738_74AC_444e_AA46_30FE9C0CC404">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_AA46_30FE9C0CC404" x="1585" y="648"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_AA46_30FE9C0CC404" x="1585" y="757"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_8C15_332EAC4B3904" source="EAID_85A3677C_D922_4169_BDDC_6D4FA8F74EE4" target="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" modelElement="EAID_7861D5F9_24A5_4cdc_8C15_332EAC4B3904">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_8C15_332EAC4B3904" x="857" y="450"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_8C15_332EAC4B3904" x="857" y="780"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_8C15_332EAC4B3904" x="725" y="780"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_BBAE_0E80F1DB23E4" source="EAID_4B4AA994_6B56_421a_80D0_CE346536A2B9" target="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" modelElement="EAID_09317411_46CE_4072_BBAE_0E80F1DB23E4">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_BBAE_0E80F1DB23E4" x="1631" y="648"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_BBAE_0E80F1DB23E4" x="1631" y="1086"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_BBAE_0E80F1DB23E4" x="947" y="1086"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_A1E8_B94BF00B0FD7" source="EAID_0D9421F2_620D_43ab_BB41_193BFE8F5B8E" target="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" modelElement="EAID_00420D59_9F5A_4c97_A1E8_B94BF00B0FD7">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_A1E8_B94BF00B0FD7" x="237" y="450"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_A1E8_B94BF00B0FD7" x="237" y="798"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_A1E8_B94BF00B0FD7" x="518" y="798"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_B97E_C65FBB995AB7" source="EAID_4B4AA994_6B56_421a_80D0_CE346536A2B9" target="EAID_7B308DB7_0AC5_45c9_8E6F_0D46097D2C9C" modelElement="EAID_C0AEC9E0_776E_47ad_B97E_C65FBB995AB7">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_B97E_C65FBB995AB7" x="1571" y="613"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_B97E_C65FBB995AB7" x="1454" y="536"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_8605_0C705EEC1EF5" source="EAID_0A917C15_D52D_40b0_AD31_1089680BFBDF" target="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" modelElement="EAID_BAEF6C8B_1B54_420b_8605_0C705EEC1EF5">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_8605_0C705EEC1EF5" x="980" y="450"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_8605_0C705EEC1EF5" x="980" y="609"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_8605_0C705EEC1EF5" x="608" y="609"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_B881_CE0D3C6C7822" source="EAID_20A35C8C_4895_4aef_AE94_63C59C948D5D" target="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" modelElement="EAID_F7FF5756_985F_42b8_B881_CE0D3C6C7822">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_B881_CE0D3C6C7822" x="1102" y="648"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_B881_CE0D3C6C7822" x="1102" y="982"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_B881_CE0D3C6C7822" x="947" y="982"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_8A1F_9A3D6F23B10A" source="EAID_0A917C15_D52D_40b0_AD31_1089680BFBDF" target="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" modelElement="EAID_6C23590C_DC5E_499c_8A1F_9A3D6F23B10A">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_8A1F_9A3D6F23B10A" x="998" y="450"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_8A1F_9A3D6F23B10A" x="998" y="805"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_8A1F_9A3D6F23B10A" x="725" y="805"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_BF3D_F4067DB0161C" source="EAID_20A35C8C_4895_4aef_AE94_63C59C948D5D" target="EAID_A31D0982_B460_4636_82B7_C2AF2C92D0B7" modelElement="EAID_093A00FE_8C02_46c0_BF3D_F4067DB0161C">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_BF3D_F4067DB0161C" x="1073" y="613"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_BF3D_F4067DB0161C" x="947" y="534"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_A184_0605456C2FEF" source="EAID_F0DE3A34_0F67_47af_914A_82A0C222723C" target="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" modelElement="EAID_23426D44_9964_443a_A184_0605456C2FEF">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_A184_0605456C2FEF" x="247" y="648"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_A184_0605456C2FEF" x="247" y="1071"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_A184_0605456C2FEF" x="740" y="1071"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_8962_DC4613C4041F" source="EAID_F0DE3A34_0F67_47af_914A_82A0C222723C" target="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03" modelElement="EAID_251F0F6E_D0B5_4304_8962_DC4613C4041F">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_8962_DC4613C4041F" x="246" y="613"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_8962_DC4613C4041F" x="246" y="542"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_8C74_B27EB1903597" source="EAID_378A0219_58F3_4bbb_A19B_0E19C7D6814B" target="EAID_7B308DB7_0AC5_45c9_8E6F_0D46097D2C9C" modelElement="EAID_A2552EE8_A41E_4e28_8C74_B27EB1903597">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_8C74_B27EB1903597" x="1073" y="415"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_8C74_B27EB1903597" x="1006" y="345"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_8C74_B27EB1903597" x="1467" y="613"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_8C74_B27EB1903597" x="1428" y="542"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_8815_666C9CD92900" source="EAID_378A0219_58F3_4bbb_A19B_0E19C7D6814B" target="EAID_89668AB6_A244_441e_B851_9289BD4E15F3" modelElement="EAID_E24F0453_58DF_4fce_8815_666C9CD92900">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_8815_666C9CD92900" x="1077" y="450"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_8815_666C9CD92900" x="1077" y="531"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_8815_666C9CD92900" x="964" y="531"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_A1E8_B94BF00B0FD7" source="EAID_0D9421F2_620D_43ab_BB41_193BFE8F5B8E" target="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" modelElement="EAID_00420D59_9F5A_4c97_A1E8_B94BF00B0FD7">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_A1E8_B94BF00B0FD7" x="459" y="648"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_A1E8_B94BF00B0FD7" x="459" y="1016"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_A1E8_B94BF00B0FD7" x="740" y="1016"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_B185_99AC7779C464" source="EAID_378A0219_58F3_4bbb_A19B_0E19C7D6814B" target="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" modelElement="EAID_BD4D35AF_F4C0_470f_B185_99AC7779C464">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_B185_99AC7779C464" x="1111" y="450"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_B185_99AC7779C464" x="1111" y="832"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_B185_99AC7779C464" x="725" y="832"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_BE52_91F3F7270840" source="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_7EE70932_F57C_4861_BE52_91F3F7270840">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C004_4da5_BE52_91F3F7270840" text="+epo:refersToNotice 0..1" modelElement="EAID_dstE70932_F57C_4861_BE52_91F3F7270840">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C004_4da5_BE52_91F3F7270840" x="662" y="149" width="100" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C004_4da5_BE52_91F3F7270840" text="0..1" modelElement="EAID_dstE70932_F57C_4861_BE52_91F3F7270840">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C004_4da5_BE52_91F3F7270840" x="777" y="162" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_BE52_91F3F7270840" x="792" y="176"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_BE52_91F3F7270840" x="792" y="176"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_BE52_91F3F7270840" x="829" y="176"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_C004_4da5_BE52_91F3F7270840" x="829" y="138"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_C004_4da5_BE52_91F3F7270840" x="769" y="138"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_C004_4da5_BE52_91F3F7270840" x="769" y="167"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_C004_4da5_BE52_91F3F7270840" x="769" y="167"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_88B6_1E31A0860DF8" source="EAID_9A9E6106_6655_4d55_9343_6884F40C1496" target="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" modelElement="EAID_DED553E4_8E73_4d32_88B6_1E31A0860DF8">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_88B6_1E31A0860DF8" x="315" y="274"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_88B6_1E31A0860DF8" x="403" y="204"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_826C_BAAB2EAB7049" source="EAID_0D9421F2_620D_43ab_BB41_193BFE8F5B8E" target="EAID_9A9E6106_6655_4d55_9343_6884F40C1496" modelElement="EAID_6A26342D_C219_4a74_826C_BAAB2EAB7049">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_826C_BAAB2EAB7049" x="493" y="613"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_826C_BAAB2EAB7049" x="493" y="542"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_AB06_244F1F3F1AC2" source="EAID_A31D0982_B460_4636_82B7_C2AF2C92D0B7" target="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" modelElement="EAID_AF1D7C6F_AE8A_4b59_AB06_244F1F3F1AC2">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_AB06_244F1F3F1AC2" x="578" y="275"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_AB06_244F1F3F1AC2" x="491" y="204"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_B5B5_A66923BD84D9" source="EAID_8A9B11CE_AE42_4569_AC97_B7125F25083F" target="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" modelElement="EAID_D6275E44_62A9_4afe_B5B5_A66923BD84D9">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_B5B5_A66923BD84D9" x="348" y="648"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_B5B5_A66923BD84D9" x="348" y="1042"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_B5B5_A66923BD84D9" x="740" y="1042"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_8C16_9F9F412AC05A" source="EAID_7B308DB7_0AC5_45c9_8E6F_0D46097D2C9C" target="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" modelElement="EAID_A15F798A_231D_429f_8C16_9F9F412AC05A">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_8C16_9F9F412AC05A" x="970" y="275"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_8C16_9F9F412AC05A" x="970" y="162"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_8C16_9F9F412AC05A" x="493" y="162"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_B640_44782AAB984C" source="EAID_8A9B11CE_AE42_4569_AC97_B7125F25083F" target="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" modelElement="EAID_7FB6A525_A2DF_472e_B640_44782AAB984C">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_B640_44782AAB984C" x="387" y="648"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_B640_44782AAB984C" x="387" y="850"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_B640_44782AAB984C" x="482" y="850"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_B408_7E03688C16F5" source="EAID_8A9B11CE_AE42_4569_AC97_B7125F25083F" target="EAID_9A9E6106_6655_4d55_9343_6884F40C1496" modelElement="EAID_CAC4CAAF_63BE_4b47_B408_7E03688C16F5">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_B408_7E03688C16F5" x="170" y="415"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_B408_7E03688C16F5" x="237" y="344"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_B408_7E03688C16F5" x="392" y="613"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_B408_7E03688C16F5" x="459" y="542"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_B640_44782AAB984C" source="EAID_8A9B11CE_AE42_4569_AC97_B7125F25083F" target="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" modelElement="EAID_7FB6A525_A2DF_472e_B640_44782AAB984C">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_B640_44782AAB984C" x="165" y="450"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_B640_44782AAB984C" x="165" y="652"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_B640_44782AAB984C" x="260" y="652"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_8C16_9F9F412AC05A" source="EAID_7B308DB7_0AC5_45c9_8E6F_0D46097D2C9C" target="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" modelElement="EAID_A15F798A_231D_429f_8C16_9F9F412AC05A">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_8C16_9F9F412AC05A" x="1406" y="472"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_8C16_9F9F412AC05A" x="1406" y="360"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_8C16_9F9F412AC05A" x="715" y="360"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_B5B5_A66923BD84D9" source="EAID_8A9B11CE_AE42_4569_AC97_B7125F25083F" target="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" modelElement="EAID_D6275E44_62A9_4afe_B5B5_A66923BD84D9">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_B5B5_A66923BD84D9" x="126" y="450"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_B5B5_A66923BD84D9" x="126" y="822"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_B5B5_A66923BD84D9" x="518" y="822"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_AB06_244F1F3F1AC2" source="EAID_A31D0982_B460_4636_82B7_C2AF2C92D0B7" target="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" modelElement="EAID_AF1D7C6F_AE8A_4b59_AB06_244F1F3F1AC2">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_AB06_244F1F3F1AC2" x="857" y="479"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_AB06_244F1F3F1AC2" x="715" y="394"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_826C_BAAB2EAB7049" source="EAID_0D9421F2_620D_43ab_BB41_193BFE8F5B8E" target="EAID_9A9E6106_6655_4d55_9343_6884F40C1496" modelElement="EAID_6A26342D_C219_4a74_826C_BAAB2EAB7049">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_826C_BAAB2EAB7049" x="271" y="415"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_826C_BAAB2EAB7049" x="271" y="344"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_A2F1_707153826314" source="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_9B54EEA9_42F0_4e42_A2F1_707153826314">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_A2F1_707153826314" x="669" y="332"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_A2F1_707153826314" x="669" y="294"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_9434_FF80603A8059" source="EAID_0D9421F2_620D_43ab_BB41_193BFE8F5B8E" target="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" modelElement="EAID_30880E95_E936_44d6_9434_FF80603A8059">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_9434_FF80603A8059" x="281" y="450"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_9434_FF80603A8059" x="281" y="606"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_9434_FF80603A8059" x="518" y="606"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_88B6_1E31A0860DF8" source="EAID_9A9E6106_6655_4d55_9343_6884F40C1496" target="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" modelElement="EAID_DED553E4_8E73_4d32_88B6_1E31A0860DF8">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_88B6_1E31A0860DF8" x="537" y="472"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_88B6_1E31A0860DF8" x="625" y="402"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_B663_E08B34100639" source="EAID_85A3677C_D922_4169_BDDC_6D4FA8F74EE4" target="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" modelElement="EAID_FA04F438_FBFD_4a53_B663_E08B34100639">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_B663_E08B34100639" x="828" y="450"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_B663_E08B34100639" x="828" y="668"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_B663_E08B34100639" x="350" y="668"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FABAECA6_C004_4da5_80DC_91F8A4D3F0DE" source="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_A1DC6D24_EABE_467c_80DC_91F8A4D3F0DE">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C004_4da5_80DC_91F8A4D3F0DE" x="241" y="472"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C004_4da5_80DC_91F8A4D3F0DE" x="241" y="224"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C004_4da5_80DC_91F8A4D3F0DE" x="547" y="224"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_311D2286_4C4E_48f9_9977_FFFC1F14ED9A" isFrame="false" modelElement="EAPK_B67F8633_2079_4127_BD4D_86B7F8DBC6AA">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_311D2286_4C4E_48f9_AE42_0583F7417A79" modelElement="EAID_17662AEF_1321_446a_AE42_0583F7417A79">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4C4E_48f9_AE42_0583F7417A79" text="epo-not:CompetitionNotice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_AE42_0583F7417A79" x="891" y="111" width="104" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_AE42_0583F7417A79" x="1155" y="78" width="104" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_311D2286_4C4E_48f9_8C1F_45A560037124" modelElement="EAID_1D9B79BD_930F_4444_8C1F_45A560037124">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4C4E_48f9_8C1F_45A560037124" text="epo-not:Notice22"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_8C1F_45A560037124" x="1430" y="406" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_8C1F_45A560037124" x="1805" y="373" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_311D2286_4C4E_48f9_A793_4F4CB4AAA00E" modelElement="EAID_2A716878_4D7B_473c_A793_4F4CB4AAA00E">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4C4E_48f9_A793_4F4CB4AAA00E" text="epo-not:Notice13"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_A793_4F4CB4AAA00E" x="377" y="406" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_A793_4F4CB4AAA00E" x="641" y="373" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_311D2286_4C4E_48f9_B03E_875438FD6EAC" modelElement="EAID_33778168_3AF6_4d83_B03E_875438FD6EAC">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4C4E_48f9_B03E_875438FD6EAC" text="epo-not:CNSocialNotice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_B03E_875438FD6EAC" x="1248" y="270" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_B03E_875438FD6EAC" x="1623" y="237" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_311D2286_4C4E_48f9_B697_6D64E2AF9220" modelElement="EAID_3FC83BCD_6B25_4180_B697_6D64E2AF9220">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4C4E_48f9_B697_6D64E2AF9220" text="epo-not:Notice18"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_B697_6D64E2AF9220" x="962" y="406" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_B697_6D64E2AF9220" x="1226" y="373" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_311D2286_4C4E_48f9_814A_F4CDA161B12A" modelElement="EAID_459BFB03_27E6_42e5_814A_F4CDA161B12A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4C4E_48f9_814A_F4CDA161B12A" text="epo-not:Notice20"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_814A_F4CDA161B12A" x="1196" y="406" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_814A_F4CDA161B12A" x="1571" y="373" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_311D2286_4C4E_48f9_9A28_4F03AE4B456A" modelElement="EAID_4E444B8E_FC46_42b6_9A28_4F03AE4B456A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4C4E_48f9_9A28_4F03AE4B456A" text="epo-not:SubcontractNotice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_9A28_4F03AE4B456A" x="1430" y="270" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_9A28_4F03AE4B456A" x="1805" y="237" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_311D2286_4C4E_48f9_A25C_5BE7FADB130C" modelElement="EAID_53A92E92_9CAF_4d77_A25C_5BE7FADB130C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4C4E_48f9_A25C_5BE7FADB130C" text="epo-not:Notice21"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_A25C_5BE7FADB130C" x="1313" y="406" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_A25C_5BE7FADB130C" x="1688" y="373" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_311D2286_4C4E_48f9_A276_C93E14F56BF8" modelElement="EAID_53B59A9E_0F19_4d91_A276_C93E14F56BF8">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4C4E_48f9_A276_C93E14F56BF8" text="epo-not:Notice23"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_A276_C93E14F56BF8" x="1547" y="406" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_A276_C93E14F56BF8" x="1922" y="373" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_311D2286_4C4E_48f9_928F_BD5CC2C2E681" modelElement="EAID_592715F4_D66A_4a87_928F_BD5CC2C2E681">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4C4E_48f9_928F_BD5CC2C2E681" text="epo-not:PIN-CFCSocialNotice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_928F_BD5CC2C2E681" x="377" y="270" width="97" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_928F_BD5CC2C2E681" x="641" y="237" width="97" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_311D2286_4C4E_48f9_823C_BFF3401A979F" modelElement="EAID_5DE4BBA5_24F3_4e6e_823C_BFF3401A979F">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4C4E_48f9_823C_BFF3401A979F" text="epo-not:CNStandardNotice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_823C_BFF3401A979F" x="898" y="270" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_823C_BFF3401A979F" x="1162" y="237" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_311D2286_4C4E_48f9_94A7_1536255B4CDF" modelElement="EAID_60BE7698_3371_4fef_94A7_1536255B4CDF">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4C4E_48f9_94A7_1536255B4CDF" text="epo-not:Notice17"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_94A7_1536255B4CDF" x="845" y="406" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_94A7_1536255B4CDF" x="1109" y="373" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLCompartmentableShape" xmi:id="EAID_311D2286_4C4E_48f9_AD29_7F3F7BD7460A" modelElement="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A">
 				<ownedElement xmi:type="umldi:UMLTypedElementLabel" xmi:id="EAID_NL000000_4C4E_48f9_AD29_7F3F7BD7460A" text="Directive 25"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_AD29_7F3F7BD7460A" x="872" y="577" width="90" height="85"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_AD29_7F3F7BD7460A" x="1136" y="544" width="90" height="85"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLCompartmentableShape" xmi:id="EAID_311D2286_4C4E_48f9_9188_3E6E717CA7EC" modelElement="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC">
 				<ownedElement xmi:type="umldi:UMLTypedElementLabel" xmi:id="EAID_NL000000_4C4E_48f9_9188_3E6E717CA7EC" text="competition"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_9188_3E6E717CA7EC" x="771" y="936" width="170" height="109"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_9188_3E6E717CA7EC" x="1035" y="903" width="170" height="164"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_311D2286_4C4E_48f9_9673_417A43FCEAF3" modelElement="EAID_7C815E00_5AB7_4221_9673_417A43FCEAF3">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4C4E_48f9_9673_417A43FCEAF3" text="epo-not:Notice11"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_9673_417A43FCEAF3" x="143" y="405" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_9673_417A43FCEAF3" x="407" y="372" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_311D2286_4C4E_48f9_A10E_D0CBB81A811D" modelElement="EAID_82F083DA_42A3_4d07_A10E_D0CBB81A811D">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4C4E_48f9_A10E_D0CBB81A811D" text="epo-not:Notice16"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_A10E_D0CBB81A811D" x="728" y="406" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_A10E_D0CBB81A811D" x="992" y="373" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLCompartmentableShape" xmi:id="EAID_311D2286_4C4E_48f9_B851_9289BD4E15F3" modelElement="EAID_89668AB6_A244_441e_B851_9289BD4E15F3">
 				<ownedElement xmi:type="umldi:UMLTypedElementLabel" xmi:id="EAID_NL000000_4C4E_48f9_B851_9289BD4E15F3" text="Directive 81"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_B851_9289BD4E15F3" x="1028" y="755" width="90" height="85"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_B851_9289BD4E15F3" x="1292" y="722" width="90" height="85"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLCompartmentableShape" xmi:id="EAID_311D2286_4C4E_48f9_A98F_ACC159CC13C2" modelElement="EAID_8E4FF705_88E9_4b3e_A98F_ACC159CC13C2">
 				<ownedElement xmi:type="umldi:UMLTypedElementLabel" xmi:id="EAID_NL000000_4C4E_48f9_A98F_ACC159CC13C2" text="Directive 23"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_A98F_ACC159CC13C2" x="494" y="492" width="90" height="85"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_A98F_ACC159CC13C2" x="758" y="459" width="90" height="85"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_311D2286_4C4E_48f9_B38E_96B488D39429" modelElement="EAID_95A5493E_AB63_497a_B38E_96B488D39429">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4C4E_48f9_B38E_96B488D39429" text="epo-not:Notice19"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_B38E_96B488D39429" x="1079" y="406" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_B38E_96B488D39429" x="1343" y="373" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_311D2286_4C4E_48f9_8A60_5F8E32E52187" modelElement="EAID_A055DBBD_DFB0_481c_8A60_5F8E32E52187">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4C4E_48f9_8A60_5F8E32E52187" text="epo-not:PIN-CFCStandardNotice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_8A60_5F8E32E52187" x="89" y="270" width="97" height="91"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_8A60_5F8E32E52187" x="286" y="237" width="97" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_311D2286_4C4E_48f9_B3A8_16E8DC1B426C" modelElement="EAID_B0688B55_49B2_4d49_B3A8_16E8DC1B426C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4C4E_48f9_B3A8_16E8DC1B426C" text="epo-not:Notice14"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_B3A8_16E8DC1B426C" x="494" y="406" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_B3A8_16E8DC1B426C" x="758" y="373" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_311D2286_4C4E_48f9_8C43_283BEAED93F3" modelElement="EAID_B8491411_E302_450a_8C43_283BEAED93F3">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4C4E_48f9_8C43_283BEAED93F3" text="epo-not:Notice15"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_8C43_283BEAED93F3" x="611" y="406" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_8C43_283BEAED93F3" x="875" y="373" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_311D2286_4C4E_48f9_B11E_EBCC5F1EDA23" modelElement="EAID_BFA7907E_8FB6_49ba_B11E_EBCC5F1EDA23">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4C4E_48f9_B11E_EBCC5F1EDA23" text="epo-not:Notice24"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_B11E_EBCC5F1EDA23" x="1664" y="406" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_B11E_EBCC5F1EDA23" x="2039" y="373" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_311D2286_4C4E_48f9_BA1E_34917AA6433D" modelElement="EAID_C04A3529_BA24_4b09_BA1E_34917AA6433D">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4C4E_48f9_BA1E_34917AA6433D" text="epo-not:QSNotice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_BA1E_34917AA6433D" x="611" y="270" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_BA1E_34917AA6433D" x="875" y="237" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_311D2286_4C4E_48f9_A696_E3B22916E927" modelElement="EAID_C2B5E2C0_38FA_484b_A696_E3B22916E927">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4C4E_48f9_A696_E3B22916E927" text="epo-not:DesignContestNotice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_A696_E3B22916E927" x="1605" y="270" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_A696_E3B22916E927" x="1980" y="237" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_311D2286_4C4E_48f9_9EDC_EB166766150C" modelElement="EAID_E3E1C02A_989B_432d_9EDC_EB166766150C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4C4E_48f9_9EDC_EB166766150C" text="epo-not:Notice12"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_9EDC_EB166766150C" x="260" y="405" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_9EDC_EB166766150C" x="524" y="372" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_311D2286_4C4E_48f9_9464_2B2F2DA07EF0" modelElement="EAID_F5BD72AB_5FF0_48bc_9464_2B2F2DA07EF0">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4C4E_48f9_9464_2B2F2DA07EF0" text="epo-not:Notice10"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_9464_2B2F2DA07EF0" x="26" y="405" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_9464_2B2F2DA07EF0" x="290" y="372" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLCompartmentableShape" xmi:id="EAID_311D2286_4C4E_48f9_B90C_EF55511242C8" modelElement="EAID_F89732E3_0046_41b6_B90C_EF55511242C8">
 				<ownedElement xmi:type="umldi:UMLTypedElementLabel" xmi:id="EAID_NL000000_4C4E_48f9_B90C_EF55511242C8" text="Directive 24"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_B90C_EF55511242C8" x="495" y="653" width="90" height="85"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_B90C_EF55511242C8" x="759" y="620" width="90" height="85"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_9BBB_86D95D89F26A" source="EAID_7C815E00_5AB7_4221_9673_417A43FCEAF3" target="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" modelElement="EAID_49BC96B7_CB04_420a_9BBB_86D95D89F26A">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_9BBB_86D95D89F26A" x="168" y="440"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_9BBB_86D95D89F26A" x="168" y="1015"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_9BBB_86D95D89F26A" x="771" y="1015"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_311D2286_4C4E_48f9_A2BB_15ABCBF61F8B" modelElement="EAID_B6AAD0B0_AC78_46dd_A2BB_15ABCBF61F8B">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4C4E_48f9_A2BB_15ABCBF61F8B" text="epo-not:NoticeCEI"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_A2BB_15ABCBF61F8B" x="169" y="372" width="90" height="35"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_82CE_ED5F7075A3D5" source="EAID_C04A3529_BA24_4b09_BA1E_34917AA6433D" target="EAID_17662AEF_1321_446a_AE42_0583F7417A79" modelElement="EAID_77A997B5_6993_4de4_82CE_ED5F7075A3D5">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_82CE_ED5F7075A3D5" x="656" y="270"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_82CE_ED5F7075A3D5" x="891" y="180"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_311D2286_4C4E_48f9_88B4_ABEF21E72261" modelElement="EAID_12A00248_5E3C_489e_88B4_ABEF21E72261">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4C4E_48f9_88B4_ABEF21E72261" text="epo-not:NoticeE3"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_88B4_ABEF21E72261" x="1459" y="373" width="90" height="35"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLCompartmentableShape" xmi:id="EAID_311D2286_4C4E_48f9_BC6F_4434B8DC0F67" modelElement="EAID_64AA7AC6_F248_4162_BC6F_4434B8DC0F67">
+				<ownedElement xmi:type="umldi:UMLTypedElementLabel" xmi:id="EAID_NL000000_4C4E_48f9_BC6F_4434B8DC0F67" text="Regulation 1046"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4C4E_48f9_BC6F_4434B8DC0F67" x="213" y="493" width="90" height="50"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_9E2E_1DD18A71FEAA" source="EAID_E3E1C02A_989B_432d_9EDC_EB166766150C" target="EAID_592715F4_D66A_4a87_928F_BD5CC2C2E681" modelElement="EAID_635AB80A_45DC_4f79_9E2E_1DD18A71FEAA">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_9E2E_1DD18A71FEAA" x="586" y="372"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_9E2E_1DD18A71FEAA" x="653" y="307"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_A728_4F6A0B8B3C8F" source="EAID_82F083DA_42A3_4d07_A10E_D0CBB81A811D" target="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" modelElement="EAID_B162EE79_7E6B_4e0b_A728_4F6A0B8B3C8F">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A728_4F6A0B8B3C8F" x="1065" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A728_4F6A0B8B3C8F" x="1070" y="903"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_8203_ABADAC735C19" source="EAID_82F083DA_42A3_4d07_A10E_D0CBB81A811D" target="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" modelElement="EAID_F64371A9_69A9_42ed_8203_ABADAC735C19">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_8203_ABADAC735C19" x="1038" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_8203_ABADAC735C19" x="1038" y="639"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_8203_ABADAC735C19" x="849" y="639"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_A52E_0256EDE56D0B" source="EAID_B8491411_E302_450a_8C43_283BEAED93F3" target="EAID_C04A3529_BA24_4b09_BA1E_34917AA6433D" modelElement="EAID_9E65DE1F_9426_4db1_A52E_0256EDE56D0B">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A52E_0256EDE56D0B" x="920" y="373"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A52E_0256EDE56D0B" x="920" y="307"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_BB2D_248727FBEE52" source="EAID_B8491411_E302_450a_8C43_283BEAED93F3" target="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" modelElement="EAID_A7D7A61A_07D4_482e_BB2D_248727FBEE52">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_BB2D_248727FBEE52" x="648" y="441"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_BB2D_248727FBEE52" x="648" y="941"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_BB2D_248727FBEE52" x="771" y="941"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_BB2D_248727FBEE52" x="911" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_BB2D_248727FBEE52" x="911" y="918"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_BB2D_248727FBEE52" x="1035" y="918"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_83B1_9E47694F0AEC" source="EAID_B8491411_E302_450a_8C43_283BEAED93F3" target="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" modelElement="EAID_CAD36783_38AE_42d4_83B1_9E47694F0AEC">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_83B1_9E47694F0AEC" x="682" y="441"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_83B1_9E47694F0AEC" x="682" y="647"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_83B1_9E47694F0AEC" x="872" y="647"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_83B1_9E47694F0AEC" x="946" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_83B1_9E47694F0AEC" x="946" y="614"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_83B1_9E47694F0AEC" x="1136" y="614"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_86EA_27A080A75820" source="EAID_B0688B55_49B2_4d49_B3A8_16E8DC1B426C" target="EAID_592715F4_D66A_4a87_928F_BD5CC2C2E681" modelElement="EAID_2B6E93DB_190C_4441_86EA_27A080A75820">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_86EA_27A080A75820" x="522" y="406"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_86EA_27A080A75820" x="458" y="340"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_86EA_27A080A75820" x="786" y="373"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_86EA_27A080A75820" x="722" y="307"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_9D1C_4962C84B5FF6" source="EAID_B0688B55_49B2_4d49_B3A8_16E8DC1B426C" target="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" modelElement="EAID_D9B0F2BE_BBAE_4748_9D1C_4962C84B5FF6">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_9D1C_4962C84B5FF6" x="494" y="427"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_9D1C_4962C84B5FF6" x="475" y="427"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_9D1C_4962C84B5FF6" x="475" y="957"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_4C4E_48f9_9D1C_4962C84B5FF6" x="771" y="957"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_9D1C_4962C84B5FF6" x="758" y="394"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_9D1C_4962C84B5FF6" x="739" y="394"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_9D1C_4962C84B5FF6" x="739" y="941"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_4C4E_48f9_9D1C_4962C84B5FF6" x="1035" y="941"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_AB67_DC0C864CEE43" source="EAID_B0688B55_49B2_4d49_B3A8_16E8DC1B426C" target="EAID_8E4FF705_88E9_4b3e_A98F_ACC159CC13C2" modelElement="EAID_FA228CBB_BF55_48ad_AB67_DC0C864CEE43">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_AB67_DC0C864CEE43" x="539" y="441"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_AB67_DC0C864CEE43" x="539" y="492"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_AB67_DC0C864CEE43" x="803" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_AB67_DC0C864CEE43" x="803" y="459"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_ACF1_4A847DD828B4" source="EAID_2A716878_4D7B_473c_A793_4F4CB4AAA00E" target="EAID_592715F4_D66A_4a87_928F_BD5CC2C2E681" modelElement="EAID_4E457C38_9393_4661_ACF1_4A847DD828B4">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_ACF1_4A847DD828B4" x="422" y="406"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_ACF1_4A847DD828B4" x="424" y="340"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_ACF1_4A847DD828B4" x="686" y="373"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_ACF1_4A847DD828B4" x="688" y="307"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_91D4_3991E8968B23" source="EAID_2A716878_4D7B_473c_A793_4F4CB4AAA00E" target="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" modelElement="EAID_816FEADA_9E37_4958_91D4_3991E8968B23">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_91D4_3991E8968B23" x="397" y="441"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_91D4_3991E8968B23" x="397" y="976"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_91D4_3991E8968B23" x="771" y="976"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_91D4_3991E8968B23" x="662" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_91D4_3991E8968B23" x="662" y="961"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_91D4_3991E8968B23" x="1035" y="961"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_A4A8_80A1D9EEA78F" source="EAID_2A716878_4D7B_473c_A793_4F4CB4AAA00E" target="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" modelElement="EAID_BBF21AB4_820E_42a4_A4A8_80A1D9EEA78F">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A4A8_80A1D9EEA78F" x="423" y="441"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A4A8_80A1D9EEA78F" x="423" y="618"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_A4A8_80A1D9EEA78F" x="872" y="618"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A4A8_80A1D9EEA78F" x="687" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A4A8_80A1D9EEA78F" x="687" y="585"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_A4A8_80A1D9EEA78F" x="1136" y="585"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_8D2E_727F543D2A9D" source="EAID_E3E1C02A_989B_432d_9EDC_EB166766150C" target="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" modelElement="EAID_45B5738D_C570_4834_8D2E_727F543D2A9D">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_8D2E_727F543D2A9D" x="292" y="440"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_8D2E_727F543D2A9D" x="292" y="997"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_8D2E_727F543D2A9D" x="771" y="997"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_82CE_ED5F7075A3D5" source="EAID_C04A3529_BA24_4b09_BA1E_34917AA6433D" target="EAID_17662AEF_1321_446a_AE42_0583F7417A79" modelElement="EAID_77A997B5_6993_4de4_82CE_ED5F7075A3D5">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_82CE_ED5F7075A3D5" x="920" y="237"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_82CE_ED5F7075A3D5" x="1155" y="147"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_8203_ABADAC735C19" source="EAID_82F083DA_42A3_4d07_A10E_D0CBB81A811D" target="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" modelElement="EAID_F64371A9_69A9_42ed_8203_ABADAC735C19">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_8203_ABADAC735C19" x="774" y="441"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_8203_ABADAC735C19" x="774" y="672"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_8203_ABADAC735C19" x="585" y="672"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_811D_CC6B095ED05E" source="EAID_E3E1C02A_989B_432d_9EDC_EB166766150C" target="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" modelElement="EAID_E83907E3_1D56_4a9b_811D_CC6B095ED05E">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_811D_CC6B095ED05E" x="571" y="407"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_811D_CC6B095ED05E" x="571" y="646"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_811D_CC6B095ED05E" x="759" y="646"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_9E2E_1DD18A71FEAA" source="EAID_E3E1C02A_989B_432d_9EDC_EB166766150C" target="EAID_592715F4_D66A_4a87_928F_BD5CC2C2E681" modelElement="EAID_635AB80A_45DC_4f79_9E2E_1DD18A71FEAA">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_9E2E_1DD18A71FEAA" x="322" y="405"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_9E2E_1DD18A71FEAA" x="389" y="340"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_8941_D0694C121639" source="EAID_60BE7698_3371_4fef_94A7_1536255B4CDF" target="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" modelElement="EAID_FB55E0C5_D63F_497b_8941_D0694C121639">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_8941_D0694C121639" x="1112" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_8941_D0694C121639" x="1112" y="903"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_A728_4F6A0B8B3C8F" source="EAID_82F083DA_42A3_4d07_A10E_D0CBB81A811D" target="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" modelElement="EAID_B162EE79_7E6B_4e0b_A728_4F6A0B8B3C8F">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A728_4F6A0B8B3C8F" x="801" y="441"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A728_4F6A0B8B3C8F" x="806" y="936"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_9BBB_86D95D89F26A" source="EAID_7C815E00_5AB7_4221_9673_417A43FCEAF3" target="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" modelElement="EAID_49BC96B7_CB04_420a_9BBB_86D95D89F26A">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_9BBB_86D95D89F26A" x="433" y="407"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_9BBB_86D95D89F26A" x="433" y="1004"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_9BBB_86D95D89F26A" x="1035" y="1004"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_8FD9_2F861B44B724" source="EAID_7C815E00_5AB7_4221_9673_417A43FCEAF3" target="EAID_A055DBBD_DFB0_481c_8A60_5F8E32E52187" modelElement="EAID_76F210FA_5489_47b7_8FD9_2F861B44B724">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_8FD9_2F861B44B724" x="179" y="405"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_8FD9_2F861B44B724" x="158" y="361"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_8FD9_2F861B44B724" x="434" y="372"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_8FD9_2F861B44B724" x="369" y="307"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_B0D2_7E09533694D7" source="EAID_7C815E00_5AB7_4221_9673_417A43FCEAF3" target="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" modelElement="EAID_E43DD256_3301_4c14_B0D2_7E09533694D7">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_B0D2_7E09533694D7" x="186" y="440"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_B0D2_7E09533694D7" x="186" y="594"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_B0D2_7E09533694D7" x="872" y="594"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_B0D2_7E09533694D7" x="450" y="407"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_B0D2_7E09533694D7" x="450" y="561"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_B0D2_7E09533694D7" x="1136" y="561"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_BBD9_C09B9510F1FE" source="EAID_F5BD72AB_5FF0_48bc_9464_2B2F2DA07EF0" target="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" modelElement="EAID_42FCF429_74A4_44dd_BBD9_C09B9510F1FE">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_BBD9_C09B9510F1FE" x="87" y="440"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_BBD9_C09B9510F1FE" x="87" y="1038"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_BBD9_C09B9510F1FE" x="771" y="1038"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_BBD9_C09B9510F1FE" x="351" y="407"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_BBD9_C09B9510F1FE" x="351" y="1029"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_BBD9_C09B9510F1FE" x="1035" y="1029"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_B7E4_571054E1ACA1" source="EAID_F5BD72AB_5FF0_48bc_9464_2B2F2DA07EF0" target="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" modelElement="EAID_0395D6B0_402A_4455_B7E4_571054E1ACA1">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_B7E4_571054E1ACA1" x="73" y="440"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_B7E4_571054E1ACA1" x="73" y="704"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_B7E4_571054E1ACA1" x="495" y="704"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_B7E4_571054E1ACA1" x="337" y="407"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_B7E4_571054E1ACA1" x="337" y="671"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_B7E4_571054E1ACA1" x="759" y="671"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_BE8D_F948E5020DDC" source="EAID_F5BD72AB_5FF0_48bc_9464_2B2F2DA07EF0" target="EAID_A055DBBD_DFB0_481c_8A60_5F8E32E52187" modelElement="EAID_B027C297_9F8F_4fe5_BE8D_F948E5020DDC">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_BE8D_F948E5020DDC" x="81" y="405"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_BE8D_F948E5020DDC" x="108" y="361"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_BE8D_F948E5020DDC" x="334" y="372"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_BE8D_F948E5020DDC" x="334" y="307"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_A3D9_55355B814130" source="EAID_4E444B8E_FC46_42b6_9A28_4F03AE4B456A" target="EAID_17662AEF_1321_446a_AE42_0583F7417A79" modelElement="EAID_BC6D5FD3_0356_4463_A3D9_55355B814130">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A3D9_55355B814130" x="1473" y="270"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A3D9_55355B814130" x="1473" y="152"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_A3D9_55355B814130" x="995" y="152"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A3D9_55355B814130" x="1848" y="237"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A3D9_55355B814130" x="1848" y="119"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_A3D9_55355B814130" x="1259" y="119"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_89DC_B3689DBDE53E" source="EAID_A055DBBD_DFB0_481c_8A60_5F8E32E52187" target="EAID_17662AEF_1321_446a_AE42_0583F7417A79" modelElement="EAID_3F8437A0_516C_4b2e_89DC_B3689DBDE53E">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_89DC_B3689DBDE53E" x="135" y="270"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_89DC_B3689DBDE53E" x="135" y="142"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_89DC_B3689DBDE53E" x="891" y="142"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_89DC_B3689DBDE53E" x="332" y="237"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_89DC_B3689DBDE53E" x="332" y="109"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_89DC_B3689DBDE53E" x="1155" y="109"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_A51D_3AD3E8CE91EB" source="EAID_C2B5E2C0_38FA_484b_A696_E3B22916E927" target="EAID_17662AEF_1321_446a_AE42_0583F7417A79" modelElement="EAID_B69D002B_14AF_4080_A51D_3AD3E8CE91EB">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A51D_3AD3E8CE91EB" x="1649" y="270"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A51D_3AD3E8CE91EB" x="1649" y="138"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_A51D_3AD3E8CE91EB" x="995" y="138"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A51D_3AD3E8CE91EB" x="2024" y="237"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A51D_3AD3E8CE91EB" x="2024" y="105"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_A51D_3AD3E8CE91EB" x="1259" y="105"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_B0DF_62CFC4CE6A0A" source="EAID_33778168_3AF6_4d83_B03E_875438FD6EAC" target="EAID_17662AEF_1321_446a_AE42_0583F7417A79" modelElement="EAID_6D29D1B0_227D_4d86_B0DF_62CFC4CE6A0A">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_B0DF_62CFC4CE6A0A" x="1290" y="270"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_B0DF_62CFC4CE6A0A" x="987" y="181"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_B0DF_62CFC4CE6A0A" x="1664" y="237"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_B0DF_62CFC4CE6A0A" x="1251" y="148"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_A3D5_722A4F20BE68" source="EAID_5DE4BBA5_24F3_4e6e_823C_BFF3401A979F" target="EAID_17662AEF_1321_446a_AE42_0583F7417A79" modelElement="EAID_83C8FB41_B08A_49a2_A3D5_722A4F20BE68">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A3D5_722A4F20BE68" x="941" y="270"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A3D5_722A4F20BE68" x="941" y="181"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A3D5_722A4F20BE68" x="1205" y="237"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A3D5_722A4F20BE68" x="1205" y="148"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_AD76_B35D2F6B65EC" source="EAID_592715F4_D66A_4a87_928F_BD5CC2C2E681" target="EAID_17662AEF_1321_446a_AE42_0583F7417A79" modelElement="EAID_51552DDF_3D55_4c2a_AD76_B35D2F6B65EC">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_AD76_B35D2F6B65EC" x="423" y="270"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_AD76_B35D2F6B65EC" x="423" y="156"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_AD76_B35D2F6B65EC" x="891" y="156"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_AD76_B35D2F6B65EC" x="687" y="237"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_AD76_B35D2F6B65EC" x="687" y="123"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_AD76_B35D2F6B65EC" x="1155" y="123"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_811D_CC6B095ED05E" source="EAID_E3E1C02A_989B_432d_9EDC_EB166766150C" target="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" modelElement="EAID_E83907E3_1D56_4a9b_811D_CC6B095ED05E">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_811D_CC6B095ED05E" x="307" y="440"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_811D_CC6B095ED05E" x="307" y="679"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_811D_CC6B095ED05E" x="495" y="679"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_8D2E_727F543D2A9D" source="EAID_E3E1C02A_989B_432d_9EDC_EB166766150C" target="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" modelElement="EAID_45B5738D_C570_4834_8D2E_727F543D2A9D">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_8D2E_727F543D2A9D" x="556" y="407"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_8D2E_727F543D2A9D" x="556" y="982"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_8D2E_727F543D2A9D" x="1035" y="982"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_B2DD_947CBECD8265" source="EAID_459BFB03_27E6_42e5_814A_F4CDA161B12A" target="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" modelElement="EAID_8F0FD8B2_F185_4e94_B2DD_947CBECD8265">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_B2DD_947CBECD8265" x="1268" y="441"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_B2DD_947CBECD8265" x="1268" y="954"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_B2DD_947CBECD8265" x="941" y="954"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_B3BE_2EBE77045AC9" source="EAID_53A92E92_9CAF_4d77_A25C_5BE7FADB130C" target="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" modelElement="EAID_D373C122_1BC3_4bed_B3BE_2EBE77045AC9">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_B3BE_2EBE77045AC9" x="1761" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_B3BE_2EBE77045AC9" x="1761" y="975"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_B3BE_2EBE77045AC9" x="1205" y="975"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_93E9_B9CDDC757DFE" source="EAID_12A00248_5E3C_489e_88B4_ABEF21E72261" target="EAID_5DE4BBA5_24F3_4e6e_823C_BFF3401A979F" modelElement="EAID_E4877D84_62DD_4b49_93E9_B9CDDC757DFE">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_93E9_B9CDDC757DFE" x="1461" y="373"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_93E9_B9CDDC757DFE" x="1252" y="289"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_BBA5_1BAA08D19F04" source="EAID_B6AAD0B0_AC78_46dd_A2BB_15ABCBF61F8B" target="EAID_64AA7AC6_F248_4162_BC6F_4434B8DC0F67" modelElement="EAID_39D76FBC_915F_4506_BBA5_1BAA08D19F04">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_BBA5_1BAA08D19F04" x="243" y="407"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_BBA5_1BAA08D19F04" x="243" y="493"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_A6C2_A6B376E78B1B" source="EAID_B6AAD0B0_AC78_46dd_A2BB_15ABCBF61F8B" target="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" modelElement="EAID_70B69CB3_7E46_46fb_A6C2_A6B376E78B1B">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A6C2_A6B376E78B1B" x="190" y="407"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A6C2_A6B376E78B1B" x="190" y="1053"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_A6C2_A6B376E78B1B" x="1035" y="1053"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_93E2_2C730C732867" source="EAID_B6AAD0B0_AC78_46dd_A2BB_15ABCBF61F8B" target="EAID_A055DBBD_DFB0_481c_8A60_5F8E32E52187" modelElement="EAID_40F0FF83_FA54_4eb1_93E2_2C730C732867">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_93E2_2C730C732867" x="231" y="372"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_93E2_2C730C732867" x="298" y="307"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_984D_B48009494E55" source="EAID_BFA7907E_8FB6_49ba_B11E_EBCC5F1EDA23" target="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" modelElement="EAID_0AE161D5_0060_433e_984D_B48009494E55">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_984D_B48009494E55" x="2085" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_984D_B48009494E55" x="2085" y="1050"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_984D_B48009494E55" x="1205" y="1050"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_99FF_4F8AEE7E3C93" source="EAID_BFA7907E_8FB6_49ba_B11E_EBCC5F1EDA23" target="EAID_C2B5E2C0_38FA_484b_A696_E3B22916E927" modelElement="EAID_B9946A5D_9729_487c_99FF_4F8AEE7E3C93">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_99FF_4F8AEE7E3C93" x="1700" y="406"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_99FF_4F8AEE7E3C93" x="1667" y="340"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_99FF_4F8AEE7E3C93" x="2075" y="373"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_99FF_4F8AEE7E3C93" x="2042" y="307"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_9881_8D25909380BF" source="EAID_BFA7907E_8FB6_49ba_B11E_EBCC5F1EDA23" target="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" modelElement="EAID_A485A567_4A80_4862_9881_8D25909380BF">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_9881_8D25909380BF" x="1717" y="441"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_9881_8D25909380BF" x="1717" y="632"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_9881_8D25909380BF" x="962" y="632"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_9881_8D25909380BF" x="2092" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_9881_8D25909380BF" x="2092" y="599"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_9881_8D25909380BF" x="1226" y="599"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_A367_306D811B657C" source="EAID_53B59A9E_0F19_4d91_A276_C93E14F56BF8" target="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" modelElement="EAID_04DE498E_EC37_41fe_A367_306D811B657C">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A367_306D811B657C" x="1573" y="441"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A367_306D811B657C" x="1573" y="1013"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_A367_306D811B657C" x="941" y="1013"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A367_306D811B657C" x="1952" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A367_306D811B657C" x="1952" y="1023"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_A367_306D811B657C" x="1205" y="1023"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_90D3_C50FC9DCEF6A" source="EAID_53B59A9E_0F19_4d91_A276_C93E14F56BF8" target="EAID_C2B5E2C0_38FA_484b_A696_E3B22916E927" modelElement="EAID_51E53893_4A9F_4065_90D3_C50FC9DCEF6A">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_90D3_C50FC9DCEF6A" x="1600" y="406"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_90D3_C50FC9DCEF6A" x="1632" y="340"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_90D3_C50FC9DCEF6A" x="1975" y="373"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_90D3_C50FC9DCEF6A" x="2007" y="307"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_B0D7_33EC07BB4132" source="EAID_53B59A9E_0F19_4d91_A276_C93E14F56BF8" target="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" modelElement="EAID_524BC667_7E62_4a3d_B0D7_33EC07BB4132">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_B0D7_33EC07BB4132" x="1592" y="441"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_B0D7_33EC07BB4132" x="1592" y="723"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_B0D7_33EC07BB4132" x="585" y="723"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_B0D7_33EC07BB4132" x="1967" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_B0D7_33EC07BB4132" x="1967" y="690"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_B0D7_33EC07BB4132" x="849" y="690"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_B15F_D9A35438C920" source="EAID_1D9B79BD_930F_4444_8C1F_45A560037124" target="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" modelElement="EAID_E66FC8C6_19D8_44c5_B15F_D9A35438C920">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_B15F_D9A35438C920" x="1453" y="441"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_B15F_D9A35438C920" x="1453" y="995"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_B15F_D9A35438C920" x="941" y="995"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_B15F_D9A35438C920" x="1828" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_B15F_D9A35438C920" x="1828" y="998"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_B15F_D9A35438C920" x="1205" y="998"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_ADDC_48808B3F3555" source="EAID_1D9B79BD_930F_4444_8C1F_45A560037124" target="EAID_89668AB6_A244_441e_B851_9289BD4E15F3" modelElement="EAID_C05DD8F5_18B8_42f1_ADDC_48808B3F3555">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_ADDC_48808B3F3555" x="1476" y="441"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_ADDC_48808B3F3555" x="1476" y="799"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_ADDC_48808B3F3555" x="1118" y="799"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_ADDC_48808B3F3555" x="1851" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_ADDC_48808B3F3555" x="1851" y="766"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_ADDC_48808B3F3555" x="1382" y="766"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_998B_FD1C7AF51A31" source="EAID_1D9B79BD_930F_4444_8C1F_45A560037124" target="EAID_4E444B8E_FC46_42b6_9A28_4F03AE4B456A" modelElement="EAID_F52DCC56_F762_479b_998B_FD1C7AF51A31">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_998B_FD1C7AF51A31" x="1475" y="406"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_998B_FD1C7AF51A31" x="1475" y="340"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_A9CC_DDD002BD9D7A" source="EAID_82F083DA_42A3_4d07_A10E_D0CBB81A811D" target="EAID_5DE4BBA5_24F3_4e6e_823C_BFF3401A979F" modelElement="EAID_0D36E96A_7E1E_4805_A9CC_DDD002BD9D7A">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A9CC_DDD002BD9D7A" x="1061" y="373"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A9CC_DDD002BD9D7A" x="1162" y="303"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_B6D6_937D926E0FB1" source="EAID_53A92E92_9CAF_4d77_A25C_5BE7FADB130C" target="EAID_33778168_3AF6_4d83_B03E_875438FD6EAC" modelElement="EAID_82384408_BDB4_4aea_B6D6_937D926E0FB1">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_B6D6_937D926E0FB1" x="1348" y="406"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_B6D6_937D926E0FB1" x="1312" y="340"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_B6D6_937D926E0FB1" x="1723" y="373"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_B6D6_937D926E0FB1" x="1687" y="307"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_B3BE_2EBE77045AC9" source="EAID_53A92E92_9CAF_4d77_A25C_5BE7FADB130C" target="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" modelElement="EAID_D373C122_1BC3_4bed_B3BE_2EBE77045AC9">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_B3BE_2EBE77045AC9" x="1385" y="441"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_B3BE_2EBE77045AC9" x="1385" y="971"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_B3BE_2EBE77045AC9" x="941" y="971"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_97ED_ADF0F3DB2666" source="EAID_60BE7698_3371_4fef_94A7_1536255B4CDF" target="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" modelElement="EAID_D520E2A3_E451_4ac1_97ED_ADF0F3DB2666">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_97ED_ADF0F3DB2666" x="1180" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_97ED_ADF0F3DB2666" x="1180" y="544"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_A52E_0256EDE56D0B" source="EAID_B8491411_E302_450a_8C43_283BEAED93F3" target="EAID_C04A3529_BA24_4b09_BA1E_34917AA6433D" modelElement="EAID_9E65DE1F_9426_4db1_A52E_0256EDE56D0B">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A52E_0256EDE56D0B" x="656" y="406"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A52E_0256EDE56D0B" x="656" y="340"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_9B6C_EEC7C251E248" source="EAID_53A92E92_9CAF_4d77_A25C_5BE7FADB130C" target="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" modelElement="EAID_C1A159CA_1BCA_4563_9B6C_EEC7C251E248">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_9B6C_EEC7C251E248" x="1733" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_9B6C_EEC7C251E248" x="1733" y="574"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_9B6C_EEC7C251E248" x="1226" y="574"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_B0A7_F42B6A4C497D" source="EAID_459BFB03_27E6_42e5_814A_F4CDA161B12A" target="EAID_33778168_3AF6_4d83_B03E_875438FD6EAC" modelElement="EAID_3095E23F_6F7A_4faa_B0A7_F42B6A4C497D">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_B0A7_F42B6A4C497D" x="1248" y="406"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_B0A7_F42B6A4C497D" x="1277" y="340"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_B0A7_F42B6A4C497D" x="1623" y="373"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_B0A7_F42B6A4C497D" x="1652" y="307"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_984D_B48009494E55" source="EAID_BFA7907E_8FB6_49ba_B11E_EBCC5F1EDA23" target="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" modelElement="EAID_0AE161D5_0060_433e_984D_B48009494E55">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_984D_B48009494E55" x="1704" y="441"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_984D_B48009494E55" x="1704" y="1038"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_984D_B48009494E55" x="941" y="1038"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_B2DD_947CBECD8265" source="EAID_459BFB03_27E6_42e5_814A_F4CDA161B12A" target="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" modelElement="EAID_8F0FD8B2_F185_4e94_B2DD_947CBECD8265">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_B2DD_947CBECD8265" x="1643" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_B2DD_947CBECD8265" x="1643" y="953"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_B2DD_947CBECD8265" x="1205" y="953"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_AEE1_7E97C8212E81" source="EAID_459BFB03_27E6_42e5_814A_F4CDA161B12A" target="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" modelElement="EAID_CE22747B_385E_4705_AEE1_7E97C8212E81">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_AEE1_7E97C8212E81" x="1242" y="441"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_AEE1_7E97C8212E81" x="1242" y="696"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_AEE1_7E97C8212E81" x="585" y="696"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_AEE1_7E97C8212E81" x="1617" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_AEE1_7E97C8212E81" x="1617" y="663"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_AEE1_7E97C8212E81" x="849" y="663"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_A4E4_A2FF446DF6A3" source="EAID_95A5493E_AB63_497a_B38E_96B488D39429" target="EAID_5DE4BBA5_24F3_4e6e_823C_BFF3401A979F" modelElement="EAID_37773559_8236_4994_A4E4_A2FF446DF6A3">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A4E4_A2FF446DF6A3" x="1097" y="406"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A4E4_A2FF446DF6A3" x="988" y="334"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A4E4_A2FF446DF6A3" x="1361" y="373"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A4E4_A2FF446DF6A3" x="1252" y="301"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_9AF9_594FEC647E55" source="EAID_95A5493E_AB63_497a_B38E_96B488D39429" target="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" modelElement="EAID_0F05AECA_2EC4_4086_9AF9_594FEC647E55">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_9AF9_594FEC647E55" x="1169" y="441"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_9AF9_594FEC647E55" x="1169" y="937"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_9AF9_594FEC647E55" x="941" y="937"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_9AF9_594FEC647E55" x="1419" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_9AF9_594FEC647E55" x="1419" y="911"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_9AF9_594FEC647E55" x="1205" y="911"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_A855_399E5F8DF512" source="EAID_95A5493E_AB63_497a_B38E_96B488D39429" target="EAID_8E4FF705_88E9_4b3e_A98F_ACC159CC13C2" modelElement="EAID_63744D9C_1D40_4611_A855_399E5F8DF512">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A855_399E5F8DF512" x="1131" y="441"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A855_399E5F8DF512" x="1131" y="517"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_A855_399E5F8DF512" x="584" y="517"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A855_399E5F8DF512" x="1395" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A855_399E5F8DF512" x="1395" y="484"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_A855_399E5F8DF512" x="848" y="484"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_82D8_818B9477B524" source="EAID_3FC83BCD_6B25_4180_B697_6D64E2AF9220" target="EAID_5DE4BBA5_24F3_4e6e_823C_BFF3401A979F" modelElement="EAID_5151BB57_9A61_4a55_82D8_818B9477B524">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_82D8_818B9477B524" x="997" y="406"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_82D8_818B9477B524" x="961" y="340"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_82D8_818B9477B524" x="1261" y="373"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_82D8_818B9477B524" x="1225" y="307"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_A4EC_CE72A02654ED" source="EAID_3FC83BCD_6B25_4180_B697_6D64E2AF9220" target="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" modelElement="EAID_B17671EF_9E4A_497d_A4EC_CE72A02654ED">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A4EC_CE72A02654ED" x="989" y="441"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A4EC_CE72A02654ED" x="989" y="893"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_A4EC_CE72A02654ED" x="914" y="893"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_4C4E_48f9_A4EC_CE72A02654ED" x="914" y="936"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A4EC_CE72A02654ED" x="1253" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A4EC_CE72A02654ED" x="1253" y="860"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_A4EC_CE72A02654ED" x="1178" y="860"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_4C4E_48f9_A4EC_CE72A02654ED" x="1178" y="903"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_ABC0_AF744FDF5AB1" source="EAID_3FC83BCD_6B25_4180_B697_6D64E2AF9220" target="EAID_89668AB6_A244_441e_B851_9289BD4E15F3" modelElement="EAID_D0C69A78_A417_43c8_ABC0_AF744FDF5AB1">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_ABC0_AF744FDF5AB1" x="1041" y="441"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_ABC0_AF744FDF5AB1" x="1041" y="755"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_ABC0_AF744FDF5AB1" x="1305" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_ABC0_AF744FDF5AB1" x="1305" y="722"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_A5AA_C2D31307FFF6" source="EAID_60BE7698_3371_4fef_94A7_1536255B4CDF" target="EAID_5DE4BBA5_24F3_4e6e_823C_BFF3401A979F" modelElement="EAID_A13194F0_9A95_4fda_A5AA_C2D31307FFF6">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A5AA_C2D31307FFF6" x="897" y="406"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A5AA_C2D31307FFF6" x="927" y="340"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_8941_D0694C121639" source="EAID_60BE7698_3371_4fef_94A7_1536255B4CDF" target="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" modelElement="EAID_FB55E0C5_D63F_497b_8941_D0694C121639">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_8941_D0694C121639" x="848" y="441"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_8941_D0694C121639" x="848" y="936"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A5AA_C2D31307FFF6" x="1161" y="373"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A5AA_C2D31307FFF6" x="1191" y="307"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_97ED_ADF0F3DB2666" source="EAID_60BE7698_3371_4fef_94A7_1536255B4CDF" target="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" modelElement="EAID_D520E2A3_E451_4ac1_97ED_ADF0F3DB2666">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_97ED_ADF0F3DB2666" x="916" y="441"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_97ED_ADF0F3DB2666" x="916" y="577"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_A9CC_DDD002BD9D7A" source="EAID_82F083DA_42A3_4d07_A10E_D0CBB81A811D" target="EAID_5DE4BBA5_24F3_4e6e_823C_BFF3401A979F" modelElement="EAID_0D36E96A_7E1E_4805_A9CC_DDD002BD9D7A">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A9CC_DDD002BD9D7A" x="797" y="406"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A9CC_DDD002BD9D7A" x="898" y="336"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_A33E_E62EFF274606" source="EAID_12A00248_5E3C_489e_88B4_ABEF21E72261" target="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" modelElement="EAID_7226E575_9BF3_4599_A33E_E62EFF274606">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_A33E_E62EFF274606" x="1508" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_A33E_E62EFF274606" x="1508" y="934"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_A33E_E62EFF274606" x="1205" y="934"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_9B6C_EEC7C251E248" source="EAID_53A92E92_9CAF_4d77_A25C_5BE7FADB130C" target="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" modelElement="EAID_C1A159CA_1BCA_4563_9B6C_EEC7C251E248">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_9B6C_EEC7C251E248" x="1358" y="441"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_9B6C_EEC7C251E248" x="1358" y="607"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_9B6C_EEC7C251E248" x="962" y="607"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_311D2286_4C4E_48f9_998B_FD1C7AF51A31" source="EAID_1D9B79BD_930F_4444_8C1F_45A560037124" target="EAID_4E444B8E_FC46_42b6_9A28_4F03AE4B456A" modelElement="EAID_F52DCC56_F762_479b_998B_FD1C7AF51A31">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4C4E_48f9_998B_FD1C7AF51A31" x="1850" y="373"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_998B_FD1C7AF51A31" x="1850" y="307"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_2FDB7244_40AB_4df1_AE7C_A26145DA0BCF" isFrame="false" modelElement="EAPK_FB5DC6CC_1C70_4f3c_946C_F4B0A08D9192">
@@ -4297,210 +4780,244 @@
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_0301AA4B_61CC_4101_B049_132023B470AA" isFrame="false" modelElement="EAPK_B775C397_9DD7_4b60_8DF5_BD1A1119F341">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0301AA4B_61CC_4101_9C06_ACF3001ADED8" modelElement="EAID_1B4364F6_9CFF_4697_9C06_ACF3001ADED8">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_61CC_4101_9C06_ACF3001ADED8" text="epo-not:Notice33"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_9C06_ACF3001ADED8" x="479" y="298" width="90" height="36"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_9C06_ACF3001ADED8" x="584" y="290" width="90" height="36"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0301AA4B_61CC_4101_8A46_523230F3EEE0" modelElement="EAID_275E786B_A6CB_4f7d_8A46_523230F3EEE0">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_61CC_4101_8A46_523230F3EEE0" text="epo-not:Notice31"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_8A46_523230F3EEE0" x="247" y="299" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_8A46_523230F3EEE0" x="352" y="291" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0301AA4B_61CC_4101_BD32_93632614BD58" modelElement="EAID_406DCE49_EA4F_4aa6_BD32_93632614BD58">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_61CC_4101_BD32_93632614BD58" text="epo-not:Notice36"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_BD32_93632614BD58" x="827" y="299" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_BD32_93632614BD58" x="1025" y="291" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0301AA4B_61CC_4101_9E94_54C4E5AD26F2" modelElement="EAID_6019482D_1758_4997_9E94_54C4E5AD26F2">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_61CC_4101_9E94_54C4E5AD26F2" text="epo-not:Notice32"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_9E94_54C4E5AD26F2" x="363" y="299" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_9E94_54C4E5AD26F2" x="468" y="291" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0301AA4B_61CC_4101_9A81_0609FB33A070" modelElement="EAID_61E6D7F3_02F4_4fe3_9A81_0609FB33A070">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_61CC_4101_9A81_0609FB33A070" text="epo-not:Notice29"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_9A81_0609FB33A070" x="15" y="299" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_9A81_0609FB33A070" x="120" y="291" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLCompartmentableShape" xmi:id="EAID_0301AA4B_61CC_4101_AD29_7F3F7BD7460A" modelElement="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A">
 				<ownedElement xmi:type="umldi:UMLTypedElementLabel" xmi:id="EAID_NL000000_61CC_4101_AD29_7F3F7BD7460A" text="Directive 25"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_AD29_7F3F7BD7460A" x="626" y="475" width="90" height="50"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_AD29_7F3F7BD7460A" x="731" y="467" width="90" height="50"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0301AA4B_61CC_4101_BDAC_C1B68CDF47C1" modelElement="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_61CC_4101_BDAC_C1B68CDF47C1" text="epo-not:CANSocialNotice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_BDAC_C1B68CDF47C1" x="576" y="203" width="128" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_BDAC_C1B68CDF47C1" x="681" y="195" width="128" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0301AA4B_61CC_4101_9D61_AD99797CBD13" modelElement="EAID_83474E52_0601_44c6_9D61_AD99797CBD13">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_61CC_4101_9D61_AD99797CBD13" text="epo-not:CANStandardNotice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_9D61_AD99797CBD13" x="172" y="203" width="128" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_9D61_AD99797CBD13" x="217" y="195" width="128" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLCompartmentableShape" xmi:id="EAID_0301AA4B_61CC_4101_B851_9289BD4E15F3" modelElement="EAID_89668AB6_A244_441e_B851_9289BD4E15F3">
 				<ownedElement xmi:type="umldi:UMLTypedElementLabel" xmi:id="EAID_NL000000_61CC_4101_B851_9289BD4E15F3" text="Directive 81"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_B851_9289BD4E15F3" x="247" y="379" width="90" height="50"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_B851_9289BD4E15F3" x="352" y="371" width="90" height="50"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLCompartmentableShape" xmi:id="EAID_0301AA4B_61CC_4101_A98F_ACC159CC13C2" modelElement="EAID_8E4FF705_88E9_4b3e_A98F_ACC159CC13C2">
 				<ownedElement xmi:type="umldi:UMLTypedElementLabel" xmi:id="EAID_NL000000_61CC_4101_A98F_ACC159CC13C2" text="Directive 23"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_A98F_ACC159CC13C2" x="685" y="389" width="90" height="50"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_A98F_ACC159CC13C2" x="790" y="381" width="90" height="50"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0301AA4B_61CC_4101_8149_B4372990E2A4" modelElement="EAID_9534CCE2_2925_49a9_8149_B4372990E2A4">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_61CC_4101_8149_B4372990E2A4" text="epo-not:Notice37"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_8149_B4372990E2A4" x="943" y="299" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_8149_B4372990E2A4" x="1141" y="291" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0301AA4B_61CC_4101_B7A8_D2D05116023F" modelElement="EAID_961635DD_1E69_4907_B7A8_D2D05116023F">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_61CC_4101_B7A8_D2D05116023F" text="epo-not:Notice30"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_B7A8_D2D05116023F" x="131" y="299" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_B7A8_D2D05116023F" x="236" y="291" width="90" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0301AA4B_61CC_4101_9700_767D093EA6DE" modelElement="EAID_AA33DDB3_015E_422f_9700_767D093EA6DE">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_61CC_4101_9700_767D093EA6DE" text="epo-not:Notice34"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_9700_767D093EA6DE" x="595" y="298" width="90" height="36"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_9700_767D093EA6DE" x="700" y="290" width="90" height="36"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0301AA4B_61CC_4101_ACA1_4EE4A3ADE597" modelElement="EAID_AE877E81_8A12_4ec7_ACA1_4EE4A3ADE597">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_61CC_4101_ACA1_4EE4A3ADE597" text="epo-not:DesignContestResultNotice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_ACA1_4EE4A3ADE597" x="873" y="203" width="128" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_ACA1_4EE4A3ADE597" x="1071" y="195" width="128" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0301AA4B_61CC_4101_A018_D5E4E2B01404" modelElement="EAID_BDB13855_F3DD_4561_A018_D5E4E2B01404">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_61CC_4101_A018_D5E4E2B01404" text="epo-not:Notice35"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_A018_D5E4E2B01404" x="711" y="298" width="90" height="36"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_A018_D5E4E2B01404" x="816" y="290" width="90" height="36"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0301AA4B_61CC_4101_A23F_1DCF65619AE2" modelElement="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_61CC_4101_A23F_1DCF65619AE2" text="epo-not:ResultNotice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_A23F_1DCF65619AE2" x="576" y="115" width="128" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_A23F_1DCF65619AE2" x="681" y="107" width="128" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLCompartmentableShape" xmi:id="EAID_0301AA4B_61CC_4101_B90C_EF55511242C8" modelElement="EAID_F89732E3_0046_41b6_B90C_EF55511242C8">
 				<ownedElement xmi:type="umldi:UMLTypedElementLabel" xmi:id="EAID_NL000000_61CC_4101_B90C_EF55511242C8" text="Directive 24"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_B90C_EF55511242C8" x="33" y="533" width="90" height="50"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_B90C_EF55511242C8" x="138" y="525" width="90" height="50"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLCompartmentableShape" xmi:id="EAID_0301AA4B_61CC_4101_B59C_B38E907B03B5" modelElement="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5">
 				<ownedElement xmi:type="umldi:UMLTypedElementLabel" xmi:id="EAID_NL000000_61CC_4101_B59C_B38E907B03B5" text="result"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_B59C_B38E907B03B5" x="498" y="624" width="128" height="86"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_B59C_B38E907B03B5" x="603" y="616" width="128" height="122"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0301AA4B_61CC_4101_84D4_6FB3AAC4A4F9" modelElement="EAID_1A622AA7_D176_418b_84D4_6FB3AAC4A4F9">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_61CC_4101_84D4_6FB3AAC4A4F9" text="epo-not:NoticeE4"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_84D4_6FB3AAC4A4F9" x="7" y="291" width="90" height="35"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0301AA4B_61CC_4101_AB43_7ACC411B4F0F" modelElement="EAID_B93F6450_B2DC_42d5_AB43_7ACC411B4F0F">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_61CC_4101_AB43_7ACC411B4F0F" text="epo-not:NoticeT02"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_AB43_7ACC411B4F0F" x="920" y="291" width="90" height="35"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLCompartmentableShape" xmi:id="EAID_0301AA4B_61CC_4101_B8F5_31F967E74257" modelElement="EAID_C0E81714_CC78_4bd5_B8F5_31F967E74257">
+				<ownedElement xmi:type="umldi:UMLTypedElementLabel" xmi:id="EAID_NL000000_61CC_4101_B8F5_31F967E74257" text="Regulation 1370"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61CC_4101_B8F5_31F967E74257" x="966" y="381" width="90" height="50"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_B406_686C04509EC6" source="EAID_961635DD_1E69_4907_B7A8_D2D05116023F" target="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" modelElement="EAID_AEC77620_A2B4_4cf8_B406_686C04509EC6">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_B406_686C04509EC6" x="308" y="326"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_B406_686C04509EC6" x="308" y="490"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_B406_686C04509EC6" x="731" y="490"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_9A95_1F387AB2B926" source="EAID_1B4364F6_9CFF_4697_9C06_ACF3001ADED8" target="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1" modelElement="EAID_2470BB20_3107_4023_9A95_1F387AB2B926">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_9A95_1F387AB2B926" x="545" y="298"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_9A95_1F387AB2B926" x="618" y="238"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_9A95_1F387AB2B926" x="650" y="290"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_9A95_1F387AB2B926" x="723" y="230"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_9118_C084D6F128C5" source="EAID_83474E52_0601_44c6_9D61_AD99797CBD13" target="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" modelElement="EAID_24895ADA_E91E_44cf_9118_C084D6F128C5">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_9118_C084D6F128C5" x="217" y="203"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_9118_C084D6F128C5" x="217" y="132"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_9118_C084D6F128C5" x="576" y="132"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_AB95_EB7BA3114932" source="EAID_6019482D_1758_4997_9E94_54C4E5AD26F2" target="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5" modelElement="EAID_FE5B42CB_B903_40b0_AB95_EB7BA3114932">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_AB95_EB7BA3114932" x="487" y="326"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_AB95_EB7BA3114932" x="487" y="635"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_AB95_EB7BA3114932" x="603" y="635"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_B003_0CF86709B61A" source="EAID_AE877E81_8A12_4ec7_ACA1_4EE4A3ADE597" target="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" modelElement="EAID_76A51C8C_F081_425d_B003_0CF86709B61A">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_B003_0CF86709B61A" x="917" y="203"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_B003_0CF86709B61A" x="917" y="134"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_B003_0CF86709B61A" x="704" y="134"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_87BA_D03D3521D137" source="EAID_6019482D_1758_4997_9E94_54C4E5AD26F2" target="EAID_8E4FF705_88E9_4b3e_A98F_ACC159CC13C2" modelElement="EAID_33F55B39_3AC8_40e3_87BA_D03D3521D137">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_87BA_D03D3521D137" x="515" y="326"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_87BA_D03D3521D137" x="515" y="405"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_87BA_D03D3521D137" x="790" y="405"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_8EA3_14B93254E757" source="EAID_61E6D7F3_02F4_4fe3_9A81_0609FB33A070" target="EAID_83474E52_0601_44c6_9D61_AD99797CBD13" modelElement="EAID_D60668CB_4565_4f10_8EA3_14B93254E757">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_8EA3_14B93254E757" x="91" y="299"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_8EA3_14B93254E757" x="203" y="238"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_842E_F2E5FA432810" source="EAID_6019482D_1758_4997_9E94_54C4E5AD26F2" target="EAID_83474E52_0601_44c6_9D61_AD99797CBD13" modelElement="EAID_C926EE7A_E434_4893_842E_F2E5FA432810">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_842E_F2E5FA432810" x="471" y="291"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_842E_F2E5FA432810" x="324" y="230"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_8965_0C8831D5C6F6" source="EAID_61E6D7F3_02F4_4fe3_9A81_0609FB33A070" target="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" modelElement="EAID_684A21F9_B14B_4fe3_8965_0C8831D5C6F6">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_8965_0C8831D5C6F6" x="78" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_8965_0C8831D5C6F6" x="78" y="533"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_9578_FA3BF570A314" source="EAID_275E786B_A6CB_4f7d_8A46_523230F3EEE0" target="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5" modelElement="EAID_45889F4C_DDD6_45a7_9578_FA3BF570A314">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_9578_FA3BF570A314" x="442" y="309"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_9578_FA3BF570A314" x="456" y="309"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_9578_FA3BF570A314" x="456" y="658"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_61CC_4101_9578_FA3BF570A314" x="603" y="658"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_8F5D_5203FC4612DB" source="EAID_61E6D7F3_02F4_4fe3_9A81_0609FB33A070" target="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5" modelElement="EAID_85E80E5D_F364_4763_8F5D_5203FC4612DB">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_8F5D_5203FC4612DB" x="26" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_8F5D_5203FC4612DB" x="26" y="705"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_8F5D_5203FC4612DB" x="498" y="705"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_AF5A_305FCC30D1E9" source="EAID_275E786B_A6CB_4f7d_8A46_523230F3EEE0" target="EAID_89668AB6_A244_441e_B851_9289BD4E15F3" modelElement="EAID_E4B59BE3_9FA5_443f_AF5A_305FCC30D1E9">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_AF5A_305FCC30D1E9" x="397" y="326"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_AF5A_305FCC30D1E9" x="397" y="371"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_96F5_5066D75785F4" source="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1" target="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" modelElement="EAID_19D21EDF_4A27_44be_96F5_5066D75785F4">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_96F5_5066D75785F4" x="745" y="195"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_96F5_5066D75785F4" x="745" y="142"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_8C73_04DB39B171EA" source="EAID_961635DD_1E69_4907_B7A8_D2D05116023F" target="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5" modelElement="EAID_42AA0D6A_27A6_4fc3_8C73_04DB39B171EA">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_8C73_04DB39B171EA" x="288" y="326"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_8C73_04DB39B171EA" x="288" y="682"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_8C73_04DB39B171EA" x="603" y="682"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_ADF9_6954786BECD9" source="EAID_AA33DDB3_015E_422f_9700_767D093EA6DE" target="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1" modelElement="EAID_6B05B709_B9D0_446e_ADF9_6954786BECD9">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_ADF9_6954786BECD9" x="745" y="290"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_ADF9_6954786BECD9" x="745" y="230"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_9AE9_32813DCF358A" source="EAID_961635DD_1E69_4907_B7A8_D2D05116023F" target="EAID_83474E52_0601_44c6_9D61_AD99797CBD13" modelElement="EAID_A37999FA_4BFE_4661_9AE9_32813DCF358A">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_9AE9_32813DCF358A" x="186" y="299"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_9AE9_32813DCF358A" x="224" y="238"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_9AE9_32813DCF358A" x="281" y="291"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_9AE9_32813DCF358A" x="281" y="230"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_B406_686C04509EC6" source="EAID_961635DD_1E69_4907_B7A8_D2D05116023F" target="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" modelElement="EAID_AEC77620_A2B4_4cf8_B406_686C04509EC6">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_B406_686C04509EC6" x="203" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_B406_686C04509EC6" x="203" y="498"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_B406_686C04509EC6" x="626" y="498"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_8F5D_5203FC4612DB" source="EAID_61E6D7F3_02F4_4fe3_9A81_0609FB33A070" target="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5" modelElement="EAID_85E80E5D_F364_4763_8F5D_5203FC4612DB">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_8F5D_5203FC4612DB" x="130" y="326"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_8F5D_5203FC4612DB" x="130" y="708"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_8F5D_5203FC4612DB" x="603" y="708"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_8C73_04DB39B171EA" source="EAID_961635DD_1E69_4907_B7A8_D2D05116023F" target="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5" modelElement="EAID_42AA0D6A_27A6_4fc3_8C73_04DB39B171EA">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_8C73_04DB39B171EA" x="183" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_8C73_04DB39B171EA" x="183" y="676"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_8C73_04DB39B171EA" x="498" y="676"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_8965_0C8831D5C6F6" source="EAID_61E6D7F3_02F4_4fe3_9A81_0609FB33A070" target="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" modelElement="EAID_684A21F9_B14B_4fe3_8965_0C8831D5C6F6">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_8965_0C8831D5C6F6" x="183" y="326"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_8965_0C8831D5C6F6" x="183" y="525"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_8EA3_14B93254E757" source="EAID_61E6D7F3_02F4_4fe3_9A81_0609FB33A070" target="EAID_83474E52_0601_44c6_9D61_AD99797CBD13" modelElement="EAID_D60668CB_4565_4f10_8EA3_14B93254E757">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_8EA3_14B93254E757" x="185" y="291"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_8EA3_14B93254E757" x="259" y="230"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_B003_0CF86709B61A" source="EAID_AE877E81_8A12_4ec7_ACA1_4EE4A3ADE597" target="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" modelElement="EAID_76A51C8C_F081_425d_B003_0CF86709B61A">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_B003_0CF86709B61A" x="1115" y="195"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_B003_0CF86709B61A" x="1115" y="126"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_B003_0CF86709B61A" x="809" y="126"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_9118_C084D6F128C5" source="EAID_83474E52_0601_44c6_9D61_AD99797CBD13" target="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" modelElement="EAID_24895ADA_E91E_44cf_9118_C084D6F128C5">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_9118_C084D6F128C5" x="279" y="195"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_9118_C084D6F128C5" x="279" y="124"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_9118_C084D6F128C5" x="681" y="124"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_8697_AA4E52589D49" source="EAID_275E786B_A6CB_4f7d_8A46_523230F3EEE0" target="EAID_83474E52_0601_44c6_9D61_AD99797CBD13" modelElement="EAID_1A090812_CCBF_46aa_8697_AA4E52589D49">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_8697_AA4E52589D49" x="282" y="299"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_8697_AA4E52589D49" x="246" y="238"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_8697_AA4E52589D49" x="376" y="291"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_8697_AA4E52589D49" x="302" y="230"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_AF5A_305FCC30D1E9" source="EAID_275E786B_A6CB_4f7d_8A46_523230F3EEE0" target="EAID_89668AB6_A244_441e_B851_9289BD4E15F3" modelElement="EAID_E4B59BE3_9FA5_443f_AF5A_305FCC30D1E9">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_AF5A_305FCC30D1E9" x="292" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_AF5A_305FCC30D1E9" x="292" y="379"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_9149_B0D356179DF9" source="EAID_406DCE49_EA4F_4aa6_BD32_93632614BD58" target="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" modelElement="EAID_79B001C2_5537_4051_9149_B0D356179DF9">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_9149_B0D356179DF9" x="1069" y="326"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_9149_B0D356179DF9" x="1069" y="561"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_9149_B0D356179DF9" x="228" y="561"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_9578_FA3BF570A314" source="EAID_275E786B_A6CB_4f7d_8A46_523230F3EEE0" target="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5" modelElement="EAID_45889F4C_DDD6_45a7_9578_FA3BF570A314">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_9578_FA3BF570A314" x="337" y="317"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_9578_FA3BF570A314" x="351" y="317"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_9578_FA3BF570A314" x="351" y="654"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_61CC_4101_9578_FA3BF570A314" x="498" y="654"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_B172_6F9C6045CFC9" source="EAID_B93F6450_B2DC_42d5_AB43_7ACC411B4F0F" target="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5" modelElement="EAID_092B4BA8_26FC_40e9_B172_6F9C6045CFC9">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_B172_6F9C6045CFC9" x="944" y="326"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_B172_6F9C6045CFC9" x="944" y="655"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_B172_6F9C6045CFC9" x="731" y="655"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_842E_F2E5FA432810" source="EAID_6019482D_1758_4997_9E94_54C4E5AD26F2" target="EAID_83474E52_0601_44c6_9D61_AD99797CBD13" modelElement="EAID_C926EE7A_E434_4893_842E_F2E5FA432810">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_842E_F2E5FA432810" x="377" y="299"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_842E_F2E5FA432810" x="268" y="238"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_9DA7_6869F03D59F3" source="EAID_B93F6450_B2DC_42d5_AB43_7ACC411B4F0F" target="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1" modelElement="EAID_FF4E869D_E24B_4c77_9DA7_6869F03D59F3">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_9DA7_6869F03D59F3" x="926" y="291"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_9DA7_6869F03D59F3" x="786" y="230"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_96F5_5066D75785F4" source="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1" target="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" modelElement="EAID_19D21EDF_4A27_44be_96F5_5066D75785F4">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_96F5_5066D75785F4" x="640" y="203"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_96F5_5066D75785F4" x="640" y="150"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_8F6F_6DAB4A8EF634" source="EAID_1A622AA7_D176_418b_84D4_6FB3AAC4A4F9" target="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5" modelElement="EAID_8E5E0D60_1F11_4dc5_8F6F_6DAB4A8EF634">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_8F6F_6DAB4A8EF634" x="50" y="326"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_8F6F_6DAB4A8EF634" x="50" y="731"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_8F6F_6DAB4A8EF634" x="603" y="731"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_AB95_EB7BA3114932" source="EAID_6019482D_1758_4997_9E94_54C4E5AD26F2" target="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5" modelElement="EAID_FE5B42CB_B903_40b0_AB95_EB7BA3114932">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_AB95_EB7BA3114932" x="382" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_AB95_EB7BA3114932" x="382" y="632"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_AB95_EB7BA3114932" x="498" y="632"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_9BBF_0C20785CB74C" source="EAID_1A622AA7_D176_418b_84D4_6FB3AAC4A4F9" target="EAID_83474E52_0601_44c6_9D61_AD99797CBD13" modelElement="EAID_CD899FA2_16BF_440c_9BBF_0C20785CB74C">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_9BBF_0C20785CB74C" x="92" y="291"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_9BBF_0C20785CB74C" x="238" y="230"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_B68A_8AE98592729E" source="EAID_9534CCE2_2925_49a9_8149_B4372990E2A4" target="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5" modelElement="EAID_F7CC5A3E_F7E9_4f76_B68A_8AE98592729E">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_B68A_8AE98592729E" x="988" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_B68A_8AE98592729E" x="988" y="694"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_B68A_8AE98592729E" x="626" y="694"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_B68A_8AE98592729E" x="1192" y="326"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_B68A_8AE98592729E" x="1192" y="712"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_B68A_8AE98592729E" x="731" y="712"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_99DC_3C9C7CDA4DCB" source="EAID_1B4364F6_9CFF_4697_9C06_ACF3001ADED8" target="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" modelElement="EAID_93FDB9F8_FAB1_4bc1_99DC_3C9C7CDA4DCB">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_99DC_3C9C7CDA4DCB" x="490" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_99DC_3C9C7CDA4DCB" x="490" y="544"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_99DC_3C9C7CDA4DCB" x="123" y="544"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_8F6A_AF16FAB37C24" source="EAID_9534CCE2_2925_49a9_8149_B4372990E2A4" target="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" modelElement="EAID_5C309854_4FBF_495b_8F6A_AF16FAB37C24">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_8F6A_AF16FAB37C24" x="1163" y="326"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_8F6A_AF16FAB37C24" x="1163" y="496"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_8F6A_AF16FAB37C24" x="821" y="496"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_967E_E21B2767CCE7" source="EAID_1B4364F6_9CFF_4697_9C06_ACF3001ADED8" target="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5" modelElement="EAID_42611760_184B_41b9_967E_E21B2767CCE7">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_967E_E21B2767CCE7" x="525" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_967E_E21B2767CCE7" x="525" y="624"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_99DC_3C9C7CDA4DCB" source="EAID_1B4364F6_9CFF_4697_9C06_ACF3001ADED8" target="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" modelElement="EAID_93FDB9F8_FAB1_4bc1_99DC_3C9C7CDA4DCB">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_99DC_3C9C7CDA4DCB" x="595" y="326"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_99DC_3C9C7CDA4DCB" x="595" y="536"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_99DC_3C9C7CDA4DCB" x="228" y="536"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_ADF9_6954786BECD9" source="EAID_AA33DDB3_015E_422f_9700_767D093EA6DE" target="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1" modelElement="EAID_6B05B709_B9D0_446e_ADF9_6954786BECD9">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_ADF9_6954786BECD9" x="640" y="298"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_ADF9_6954786BECD9" x="640" y="238"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_8B83_7E96F8F27796" source="EAID_406DCE49_EA4F_4aa6_BD32_93632614BD58" target="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5" modelElement="EAID_3A176A7E_6EAC_4714_8B83_7E96F8F27796">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_8B83_7E96F8F27796" x="1094" y="326"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_8B83_7E96F8F27796" x="1094" y="683"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_8B83_7E96F8F27796" x="731" y="683"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_9CD7_F01DCE4E5449" source="EAID_AA33DDB3_015E_422f_9700_767D093EA6DE" target="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" modelElement="EAID_A1B0769A_6C40_4127_9CD7_F01DCE4E5449">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_9CD7_F01DCE4E5449" x="657" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_9CD7_F01DCE4E5449" x="657" y="475"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_967E_E21B2767CCE7" source="EAID_1B4364F6_9CFF_4697_9C06_ACF3001ADED8" target="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5" modelElement="EAID_42611760_184B_41b9_967E_E21B2767CCE7">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_967E_E21B2767CCE7" x="630" y="326"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_967E_E21B2767CCE7" x="630" y="616"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_9388_71D77D79C7B7" source="EAID_AA33DDB3_015E_422f_9700_767D093EA6DE" target="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5" modelElement="EAID_6926B6AE_BEA0_4f27_9388_71D77D79C7B7">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_9388_71D77D79C7B7" x="601" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_9388_71D77D79C7B7" x="601" y="624"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_9A01_A7B6965739FE" source="EAID_406DCE49_EA4F_4aa6_BD32_93632614BD58" target="EAID_AE877E81_8A12_4ec7_ACA1_4EE4A3ADE597" modelElement="EAID_B41CAE99_910B_45c3_9A01_A7B6965739FE">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_9A01_A7B6965739FE" x="1081" y="291"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_9A01_A7B6965739FE" x="1122" y="230"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_A11F_7EEDF94928AC" source="EAID_BDB13855_F3DD_4561_A018_D5E4E2B01404" target="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1" modelElement="EAID_3E955EE8_380D_40d3_A11F_7EEDF94928AC">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_A11F_7EEDF94928AC" x="734" y="298"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_A11F_7EEDF94928AC" x="661" y="238"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_88C7_3C5CF97F6EFF" source="EAID_BDB13855_F3DD_4561_A018_D5E4E2B01404" target="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5" modelElement="EAID_A84907C9_3C78_4400_88C7_3C5CF97F6EFF">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_88C7_3C5CF97F6EFF" x="898" y="326"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_88C7_3C5CF97F6EFF" x="898" y="628"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_88C7_3C5CF97F6EFF" x="731" y="628"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_B6FE_CDD24BBDA1FC" source="EAID_BDB13855_F3DD_4561_A018_D5E4E2B01404" target="EAID_8E4FF705_88E9_4b3e_A98F_ACC159CC13C2" modelElement="EAID_2B87E05C_8E93_4fd1_B6FE_CDD24BBDA1FC">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_B6FE_CDD24BBDA1FC" x="730" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_B6FE_CDD24BBDA1FC" x="730" y="389"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_B6FE_CDD24BBDA1FC" x="835" y="326"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_B6FE_CDD24BBDA1FC" x="835" y="381"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_88C7_3C5CF97F6EFF" source="EAID_BDB13855_F3DD_4561_A018_D5E4E2B01404" target="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5" modelElement="EAID_A84907C9_3C78_4400_88C7_3C5CF97F6EFF">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_88C7_3C5CF97F6EFF" x="793" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_88C7_3C5CF97F6EFF" x="793" y="635"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_88C7_3C5CF97F6EFF" x="626" y="635"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_A11F_7EEDF94928AC" source="EAID_BDB13855_F3DD_4561_A018_D5E4E2B01404" target="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1" modelElement="EAID_3E955EE8_380D_40d3_A11F_7EEDF94928AC">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_A11F_7EEDF94928AC" x="839" y="290"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_A11F_7EEDF94928AC" x="766" y="230"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_9A01_A7B6965739FE" source="EAID_406DCE49_EA4F_4aa6_BD32_93632614BD58" target="EAID_AE877E81_8A12_4ec7_ACA1_4EE4A3ADE597" modelElement="EAID_B41CAE99_910B_45c3_9A01_A7B6965739FE">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_9A01_A7B6965739FE" x="883" y="299"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_9A01_A7B6965739FE" x="924" y="238"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_9388_71D77D79C7B7" source="EAID_AA33DDB3_015E_422f_9700_767D093EA6DE" target="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5" modelElement="EAID_6926B6AE_BEA0_4f27_9388_71D77D79C7B7">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_9388_71D77D79C7B7" x="706" y="326"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_9388_71D77D79C7B7" x="706" y="616"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_9149_B0D356179DF9" source="EAID_406DCE49_EA4F_4aa6_BD32_93632614BD58" target="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" modelElement="EAID_79B001C2_5537_4051_9149_B0D356179DF9">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_9149_B0D356179DF9" x="871" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_9149_B0D356179DF9" x="871" y="569"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_9149_B0D356179DF9" x="123" y="569"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_9CD7_F01DCE4E5449" source="EAID_AA33DDB3_015E_422f_9700_767D093EA6DE" target="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" modelElement="EAID_A1B0769A_6C40_4127_9CD7_F01DCE4E5449">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_9CD7_F01DCE4E5449" x="762" y="326"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_9CD7_F01DCE4E5449" x="762" y="467"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_8B83_7E96F8F27796" source="EAID_406DCE49_EA4F_4aa6_BD32_93632614BD58" target="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5" modelElement="EAID_3A176A7E_6EAC_4714_8B83_7E96F8F27796">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_8B83_7E96F8F27796" x="897" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_8B83_7E96F8F27796" x="897" y="662"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_8B83_7E96F8F27796" x="626" y="662"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_94C5_251FABA00729" source="EAID_B93F6450_B2DC_42d5_AB43_7ACC411B4F0F" target="EAID_C0E81714_CC78_4bd5_B8F5_31F967E74257" modelElement="EAID_01E7319D_7EE6_4b79_94C5_251FABA00729">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_94C5_251FABA00729" x="979" y="326"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_94C5_251FABA00729" x="979" y="381"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_8D04_3DD2183E5504" source="EAID_9534CCE2_2925_49a9_8149_B4372990E2A4" target="EAID_AE877E81_8A12_4ec7_ACA1_4EE4A3ADE597" modelElement="EAID_C44465DB_D26F_4ce5_8D04_3DD2183E5504">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_8D04_3DD2183E5504" x="978" y="299"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_8D04_3DD2183E5504" x="946" y="238"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_8F6A_AF16FAB37C24" source="EAID_9534CCE2_2925_49a9_8149_B4372990E2A4" target="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" modelElement="EAID_5C309854_4FBF_495b_8F6A_AF16FAB37C24">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_8F6A_AF16FAB37C24" x="965" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_8F6A_AF16FAB37C24" x="965" y="504"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_8F6A_AF16FAB37C24" x="716" y="504"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0301AA4B_61CC_4101_87BA_D03D3521D137" source="EAID_6019482D_1758_4997_9E94_54C4E5AD26F2" target="EAID_8E4FF705_88E9_4b3e_A98F_ACC159CC13C2" modelElement="EAID_33F55B39_3AC8_40e3_87BA_D03D3521D137">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_87BA_D03D3521D137" x="410" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_87BA_D03D3521D137" x="410" y="413"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61CC_4101_87BA_D03D3521D137" x="685" y="413"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61CC_4101_8D04_3DD2183E5504" x="1176" y="291"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61CC_4101_8D04_3DD2183E5504" x="1144" y="230"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_70B7CFA1_FE5A_451d_9BBA_798A95377279" isFrame="false" modelElement="EAPK_C7DD7F9D_C549_4bd0_AC8A_D079586C69E5">
@@ -4582,7 +5099,22 @@
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_1488F282_3C96_4933_B390_907FA87FE3C2" isFrame="false" modelElement="EAPK_F92ADA51_C0C0_408e_A6E8_EA20B8C21EAD">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1488F282_3C96_4933_9DC0_B20FB6460524" modelElement="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3C96_4933_9DC0_B20FB6460524" text="epo-not:CompletionNotice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3C96_4933_9DC0_B20FB6460524" x="178" y="126" width="136" height="30"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3C96_4933_9DC0_B20FB6460524" x="130" y="61" width="136" height="30"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1488F282_3C96_4933_BB25_DB95F670222F" modelElement="EAID_137272D3_D36E_4bc8_BB25_DB95F670222F">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3C96_4933_BB25_DB95F670222F" text="epo-not:NoticeE5"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3C96_4933_BB25_DB95F670222F" x="154" y="148" width="90" height="35"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_1488F282_3C96_4933_85C1_44FFF7302FAA" modelElement="EAID_F72A2F1B_E855_4fd5_85C1_44FFF7302FAA">
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3C96_4933_85C1_44FFF7302FAA" x="141" y="234" width="115" height="55"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1488F282_3C96_4933_900A_DFA61A369012" source="EAID_F72A2F1B_E855_4fd5_85C1_44FFF7302FAA" target="EAID_137272D3_D36E_4bc8_BB25_DB95F670222F" modelElement="EAID_211F10EB_36BF_46b2_900A_DFA61A369012">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3C96_4933_900A_DFA61A369012" x="198" y="234"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3C96_4933_900A_DFA61A369012" x="198" y="183"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1488F282_3C96_4933_AD87_6CDE7E017303" source="EAID_137272D3_D36E_4bc8_BB25_DB95F670222F" target="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" modelElement="EAID_08F5FCE9_9B75_4d80_AD87_6CDE7E017303">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3C96_4933_AD87_6CDE7E017303" x="198" y="148"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3C96_4933_AD87_6CDE7E017303" x="198" y="91"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLObjectDiagram" xmi:id="EAID_DD40D051_ED4F_4994_BE7C_6282641D32F5" isFrame="false" modelElement="EAPK_F410A1D5_B857_4503_97DC_821E366EF608">
@@ -4648,7 +5180,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED4F_4994_9615_1F0D6407D00D" x="402" y="114"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_6FC7DD7D_CA3C_452d_8562_B92FA4C144F0" isFrame="false" modelElement="EAPK_C8716BFF_C5FE_40c2_BF04_C2A97B06669D">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_6FC7DD7D_CA3C_452d_8562_B92FA4C144F0" isFrame="false" modelElement="EAPK_CB52574B_A99F_4805_91CB_5CF174945B4A">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_6FC7DD7D_CA3C_452d_99E9_531E349C4858" modelElement="EAID_04DF90EB_539D_4b7b_99E9_531E349C4858">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_CA3C_452d_99E9_531E349C4858" text="epo-not:CNDefence-D81"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_CA3C_452d_99E9_531E349C4858" x="638" y="20" width="90" height="70"/>
@@ -6300,7 +6832,7 @@
 	<xmi:Extension extender="Enterprise Architect" extenderID="6.5">
 		<elements>
 			<element xmi:idref="EAPK_4595843F_E64E_4d88_A9BA_75D2C28EDDC9">
-				<packageproperties version="1.0" tpos="8"/>
+				<packageproperties version="1.0" tpos="5"/>
 				<paths/>
 				<times created="2021-12-08 00:00:00" modified="2022-03-22 15:46:15"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;"/>
@@ -6345,10 +6877,10 @@
 					<Generalization xmi:id="EAID_9D6F7030_A875_4dc4_BAB4_3226C0E6F8F0" start="EAID_791297F7_2CA7_43e2_92CC_76F1EA30B2E7" end="EAID_ED2786D7_609D_43e8_A94C_47B4744E796D"/>
 				</links>
 			</element>
-			<element xmi:idref="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" xmi:type="uml:Package" name="diagrams" scope="public">
-				<model package2="EAID_C9E6BFC0_2905_4e67_986F_133338DDD7B1" package="EAPK_BD23B8EE_A621_4d1e_A562_7BA554221AA8" tpos="1" ea_localid="260" ea_eleType="package"/>
+			<element xmi:idref="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" xmi:type="uml:Package" name="diagrams" scope="public">
+				<model package2="EAID_62C803D9_1F9E_4da3_A181_F64426A1DB2B" package="EAPK_BD23B8EE_A621_4d1e_A562_7BA554221AA8" tpos="1" ea_localid="249" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 13:05:15" modified="2024-03-18 13:05:15" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:43:48" modified="2024-07-23 11:43:48" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -6356,169 +6888,429 @@
 				<extendedProperties tagged="0" package_name="notice core"/>
 				<packageproperties version="1.0" tpos="1"/>
 				<paths/>
-				<times created="2024-03-18 13:05:15" modified="2024-03-18 13:05:15"/>
+				<times created="2024-07-23 11:43:48" modified="2024-07-23 11:43:48"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
-			<element xmi:idref="EAID_47C8E7DE_AC4A_4d3a_B612_6364BFB42020" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_A5762169_952E_4db0_9FE7_6B4A895F2AF1">
-				<model package="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" tpos="0" ea_localid="2075" ea_eleType="element"/>
+			<element xmi:idref="EAID_08C84AC0_E262_46e1_9EC6_644AFF8D9561" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_55B64699_B98C_49f8_AAA8_01BAEEF0DD49">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="3670" ea_eleType="element"/>
 				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-09-13 16:34:06" modified="2022-09-13 16:34:06" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 10:23:59" modified="2024-07-23 10:23:59" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
 				<links>
-					<Generalization xmi:id="EAID_F68B7543_9FB7_4a53_A12D_3B9DB56D9AD2" start="EAID_6B960963_83B6_4496_956C_AC7B8E5E9891" end="EAID_47C8E7DE_AC4A_4d3a_B612_6364BFB42020"/>
+					<Generalization xmi:id="EAID_C56014E3_B90C_4023_BFE9_EFC9B42720F4" start="EAID_08C84AC0_E262_46e1_9EC6_644AFF8D9561" end="EAID_17272E7E_FAA6_4f11_BBB3_457706068099"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_5AE64A69_B9E1_4007_8268_679A87B91611" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" tpos="0" ea_localid="1279" ea_eleType="element"/>
-				<properties documentation="Design Contest Result Notice&#xA;PIN only&#xA;PIN CFC&#xA;PIN RTL" isSpecification="false" sType="Note" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-17 11:34:33" modified="2021-12-17 11:35:52" complexity="1" status="Proposed"/>
-				<code gentype="&lt;none&gt;"/>
+			<element xmi:idref="EAID_17272E7E_FAA6_4f11_BBB3_457706068099" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="3671" ea_eleType="element"/>
+				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 10:23:59" modified="2024-07-23 10:23:59" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
 				<links>
-					<NoteLink xmi:id="EAID_36806876_C16C_4dc1_BD29_58E4B7187783" start="EAID_5AE64A69_B9E1_4007_8268_679A87B91611" end="EAID_C07688A9_AAC8_4f60_A2CC_FA90C006C282"/>
+					<Generalization xmi:id="EAID_C56014E3_B90C_4023_BFE9_EFC9B42720F4" start="EAID_08C84AC0_E262_46e1_9EC6_644AFF8D9561" end="EAID_17272E7E_FAA6_4f11_BBB3_457706068099"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_6288458C_4439_46bc_A898_C99A5E4A62D6" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_39F3583F_0D40_4e9f_8018_10297955785C">
-				<model package="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" tpos="0" ea_localid="1785" ea_eleType="element"/>
+			<element xmi:idref="EAID_39DBC436_506A_46a4_9670_9A00EC98EC62" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_AEF23C3F_F74B_434a_AA2D_59AF706E79E6">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="3666" ea_eleType="element"/>
 				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-04-26 14:45:41" modified="2022-04-26 14:45:41" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 10:23:04" modified="2024-07-23 10:23:04" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
 				<links>
-					<Generalization xmi:id="EAID_72F9467C_3D0D_4b12_8FA6_A01D070F8819" start="EAID_AC8CC935_389B_479b_B0EA_B6FB8B5C8EB6" end="EAID_6288458C_4439_46bc_A898_C99A5E4A62D6"/>
+					<Generalization xmi:id="EAID_87A13B98_6E29_4694_AA8F_DE5A3705B3A2" start="EAID_39DBC436_506A_46a4_9670_9A00EC98EC62" end="EAID_8944D0F2_D657_4ce9_B2E9_DEBFBA9394DE"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_6B960963_83B6_4496_956C_AC7B8E5E9891" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_B1307E49_0838_4569_819E_D05D699E0983">
-				<model package="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" tpos="0" ea_localid="2071" ea_eleType="element"/>
+			<element xmi:idref="EAID_3CA58BCF_C8DB_4609_9044_CFAA473152BE" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_53A06CD6_3F60_4e8f_A32A_669CA4829E33">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="3674" ea_eleType="element"/>
 				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-09-13 16:34:06" modified="2022-09-13 16:34:06" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 10:24:42" modified="2024-07-23 10:24:42" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
 				<links>
-					<Generalization xmi:id="EAID_F68B7543_9FB7_4a53_A12D_3B9DB56D9AD2" start="EAID_6B960963_83B6_4496_956C_AC7B8E5E9891" end="EAID_47C8E7DE_AC4A_4d3a_B612_6364BFB42020"/>
+					<Generalization xmi:id="EAID_8B06B92A_4560_49c7_9EFF_FF8FC578D4D1" start="EAID_3CA58BCF_C8DB_4609_9044_CFAA473152BE" end="EAID_D51DF83F_EDA1_4cfa_94A2_34A940C86AB6"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_7BE947BB_A71B_4e7a_AA2B_BE7308712695" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" tpos="0" ea_localid="1391" ea_eleType="element"/>
-				<properties documentation="When backwards compatibility to StandardForms is no longer required, switch to establishing the notice type constraint at this level." isSpecification="false" sType="Note" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2021-12-23 15:04:38" modified="2021-12-23 15:07:10" complexity="1" status="Proposed"/>
-				<code gentype="&lt;none&gt;"/>
+			<element xmi:idref="EAID_44910AF1_0738_4bac_B8E3_2BC8677D2EC1" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_F955E894_651A_4a8b_A411_E8DA312BC449">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="3663" ea_eleType="element"/>
+				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 10:22:18" modified="2024-07-23 10:22:18" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
 				<links>
-					<NoteLink xmi:id="EAID_E00978F6_EFF6_47d8_84D3_E0EDCB7DC006" start="EAID_7BE947BB_A71B_4e7a_AA2B_BE7308712695" end="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B"/>
+					<Generalization xmi:id="EAID_CFE865BE_F277_4169_ABC1_9D68D997C916" start="EAID_E6FB12CB_F678_4ec8_98CD_608C5E762EE9" end="EAID_44910AF1_0738_4bac_B8E3_2BC8677D2EC1"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_8633DF60_DBCB_4ca7_AA83_B82252A1F6D6" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" tpos="0" ea_localid="1280" ea_eleType="element"/>
-				<properties documentation="Planning&#xA;Competition&#xA;DAP&#xA;Result&#xA;Contract modification" isSpecification="false" sType="Note" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-17 11:36:01" modified="2021-12-17 11:37:18" complexity="1" status="Proposed"/>
-				<code gentype="&lt;none&gt;"/>
+			<element xmi:idref="EAID_47C8E7DE_AC4A_4d3a_B612_6364BFB42020" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_A5762169_952E_4db0_9FE7_6B4A895F2AF1">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="2075" ea_eleType="element"/>
+				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-09-13 16:34:06" modified="2022-09-13 16:34:06" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
 				<links>
-					<NoteLink xmi:id="EAID_6070C1A3_A5F5_4b53_9AAE_48C9E1FDC23C" start="EAID_8633DF60_DBCB_4ca7_AA83_B82252A1F6D6" end="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A"/>
+					<Generalization xmi:id="EAID_F68B7543_9FB7_4a53_A12D_3B9DB56D9AD2" start="EAID_6B960963_83B6_4496_956C_AC7B8E5E9891" end="EAID_47C8E7DE_AC4A_4d3a_B612_6364BFB42020"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_A7E3EEA1_BBD5_409a_9717_8E5FF181CF7E" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" tpos="0" ea_localid="2983" ea_eleType="element"/>
-				<properties documentation="For more information on PlannedProcurementPart see the planning diagram in the phase oriented view from ePO core." isSpecification="false" sType="Note" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-05-10 13:55:28" modified="2023-05-10 13:57:25" complexity="1" status="Proposed"/>
-				<code gentype="&lt;none&gt;"/>
+			<element xmi:idref="EAID_4A97DCFA_BAC8_4f54_BADE_E2E47352BDD6" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_F955E894_651A_4a8b_A411_E8DA312BC449">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="3665" ea_eleType="element"/>
+				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 10:22:41" modified="2024-07-23 10:22:41" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
 				<links>
-					<NoteLink xmi:id="EAID_8A689597_C8A3_475b_AD2A_EA61AB152656" start="EAID_A7E3EEA1_BBD5_409a_9717_8E5FF181CF7E" end="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A"/>
+					<Generalization xmi:id="EAID_90E37548_02F8_4227_8C75_04FFB21501B2" start="EAID_E47E3B9A_672A_4b82_BA0F_A1B9C0D14B8E" end="EAID_4A97DCFA_BAC8_4f54_BADE_E2E47352BDD6"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_AC8CC935_389B_479b_B0EA_B6FB8B5C8EB6" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_7EE70932_F57C_4861_BE52_91F3F7270840">
-				<model package="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" tpos="0" ea_localid="1784" ea_eleType="element"/>
+			<element xmi:idref="EAID_5046F705_8CB4_4b61_9F99_4575710393BB" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_F955E894_651A_4a8b_A411_E8DA312BC449">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="3661" ea_eleType="element"/>
 				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-04-26 14:45:41" modified="2022-04-26 14:45:41" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 10:21:57" modified="2024-07-23 10:21:57" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
 				<links>
-					<Generalization xmi:id="EAID_72F9467C_3D0D_4b12_8FA6_A01D070F8819" start="EAID_AC8CC935_389B_479b_B0EA_B6FB8B5C8EB6" end="EAID_6288458C_4439_46bc_A898_C99A5E4A62D6"/>
+					<Generalization xmi:id="EAID_A70D66E1_34C3_4d44_949F_426C768D6C8B" start="EAID_E65922A8_EFDF_48e3_B6C2_16B9FF224BE8" end="EAID_5046F705_8CB4_4b61_9F99_4575710393BB"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_BD2AF816_6D7A_4cf6_AD18_B2FA72E0240B" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" tpos="0" ea_localid="3036" ea_eleType="element"/>
-				<properties documentation="for ReviewBody" isSpecification="false" sType="Note" nType="1" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-06-08 13:08:07" modified="2023-06-08 13:08:17" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_5AE64A69_B9E1_4007_8268_679A87B91611" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="1279" ea_eleType="element"/>
+				<properties documentation="Design Contest Result Notice&#xA;PIN only&#xA;PIN CFC&#xA;PIN RTL" isSpecification="false" sType="Note" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-17 11:34:33" modified="2021-12-17 11:35:52" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="diagrams" relatedlinks="idref1=EAID_D19EA23B_3707_4f38_8E54_F2D9BE08A114;"/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<NoteLink xmi:id="EAID_36806876_C16C_4dc1_BD29_58E4B7187783" start="EAID_5AE64A69_B9E1_4007_8268_679A87B91611" end="EAID_C07688A9_AAC8_4f60_A2CC_FA90C006C282"/>
+				</links>
 			</element>
-			<element xmi:idref="EAPK_55622713_57C0_4aec_8ABA_05CE52DE1DE1" xmi:type="uml:Package" name="premarket consultation notice" scope="public">
-				<model package2="EAID_55622713_57C0_4aec_8ABA_05CE52DE1DE1" package="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" tpos="1" ea_localid="205" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-06-29 16:43:03" modified="2024-03-18 13:07:15" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_6288458C_4439_46bc_A898_C99A5E4A62D6" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_39F3583F_0D40_4e9f_8018_10297955785C">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="1785" ea_eleType="element"/>
+				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-26 14:45:41" modified="2022-04-26 14:45:41" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
-				<packageproperties version="1.0" tpos="1"/>
-				<paths/>
-				<times created="2023-06-29 16:43:03" modified="2023-06-29 16:43:03"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+				<links>
+					<Generalization xmi:id="EAID_72F9467C_3D0D_4b12_8FA6_A01D070F8819" start="EAID_AC8CC935_389B_479b_B0EA_B6FB8B5C8EB6" end="EAID_6288458C_4439_46bc_A898_C99A5E4A62D6"/>
+				</links>
 			</element>
-			<element xmi:idref="EAPK_2004EEE4_4246_4617_A3E8_7708D7302027" xmi:type="uml:Package" name="planning notices" scope="public">
-				<model package2="EAID_2004EEE4_4246_4617_A3E8_7708D7302027" package="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" tpos="2" ea_localid="59" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 11:58:40" modified="2024-03-18 13:10:23" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_6B960963_83B6_4496_956C_AC7B8E5E9891" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_B1307E49_0838_4569_819E_D05D699E0983">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="2071" ea_eleType="element"/>
+				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-09-13 16:34:06" modified="2022-09-13 16:34:06" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
-				<packageproperties version="1.0" tpos="2"/>
-				<paths/>
-				<times created="2021-12-09 11:58:40" modified="2021-12-09 11:58:40"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+				<links>
+					<Generalization xmi:id="EAID_F68B7543_9FB7_4a53_A12D_3B9DB56D9AD2" start="EAID_6B960963_83B6_4496_956C_AC7B8E5E9891" end="EAID_47C8E7DE_AC4A_4d3a_B612_6364BFB42020"/>
+				</links>
 			</element>
-			<element xmi:idref="EAPK_5CECF7F0_525A_4b25_9FF6_A2777C94113F" xmi:type="uml:Package" name="competition notices" scope="public">
-				<model package2="EAID_5CECF7F0_525A_4b25_9FF6_A2777C94113F" package="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" tpos="3" ea_localid="61" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:39:19" modified="2024-03-18 13:10:23" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_70B80546_7629_40c6_9316_F91D7B17B474" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_3656734D_7238_4738_9F80_EC054ABA2E24">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="3678" ea_eleType="element"/>
+				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 10:25:23" modified="2024-07-23 10:25:23" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
-				<packageproperties version="1.0" tpos="3"/>
-				<paths/>
-				<times created="2021-12-09 12:39:19" modified="2021-12-09 12:39:19"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+				<links>
+					<Generalization xmi:id="EAID_73A6FC03_1825_4ec1_A784_BF1C55F72910" start="EAID_70B80546_7629_40c6_9316_F91D7B17B474" end="EAID_E8E280AD_7469_4b14_ABEA_60317F90ACC4"/>
+				</links>
 			</element>
-			<element xmi:idref="EAPK_D61EDA75_D813_49c2_BE47_B409C4D9F46F" xmi:type="uml:Package" name="DAP notices" scope="public">
-				<model package2="EAID_D61EDA75_D813_49c2_BE47_B409C4D9F46F" package="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" tpos="4" ea_localid="60" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:34:10" modified="2024-03-18 13:10:23" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_74DCC56E_7AA8_41a1_80A0_62B66243936F" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_F955E894_651A_4a8b_A411_E8DA312BC449">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="3669" ea_eleType="element"/>
+				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 10:23:19" modified="2024-07-23 10:23:19" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<Generalization xmi:id="EAID_D85B5D9D_A0A9_4ed4_B03A_DD6F59C0BCAC" start="EAID_A854A4CB_76B3_4887_9781_EB2D19B4D00D" end="EAID_74DCC56E_7AA8_41a1_80A0_62B66243936F"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_7BE947BB_A71B_4e7a_AA2B_BE7308712695" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="1391" ea_eleType="element"/>
+				<properties documentation="When backwards compatibility to StandardForms is no longer required, switch to establishing the notice type constraint at this level." isSpecification="false" sType="Note" nType="0" scope="public"/>
+				<project author="lps" version="1.0" phase="1.0" created="2021-12-23 15:04:38" modified="2021-12-23 15:07:10" complexity="1" status="Proposed"/>
+				<code gentype="&lt;none&gt;"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<NoteLink xmi:id="EAID_E00978F6_EFF6_47d8_84D3_E0EDCB7DC006" start="EAID_7BE947BB_A71B_4e7a_AA2B_BE7308712695" end="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_8633DF60_DBCB_4ca7_AA83_B82252A1F6D6" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="1280" ea_eleType="element"/>
+				<properties documentation="Planning&#xA;Competition&#xA;DAP&#xA;Result&#xA;Contract modification" isSpecification="false" sType="Note" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-17 11:36:01" modified="2021-12-17 11:37:18" complexity="1" status="Proposed"/>
+				<code gentype="&lt;none&gt;"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<NoteLink xmi:id="EAID_6070C1A3_A5F5_4b53_9AAE_48C9E1FDC23C" start="EAID_8633DF60_DBCB_4ca7_AA83_B82252A1F6D6" end="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_8944D0F2_D657_4ce9_B2E9_DEBFBA9394DE" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_F955E894_651A_4a8b_A411_E8DA312BC449">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="3667" ea_eleType="element"/>
+				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 10:23:04" modified="2024-07-23 10:23:04" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<Generalization xmi:id="EAID_87A13B98_6E29_4694_AA8F_DE5A3705B3A2" start="EAID_39DBC436_506A_46a4_9670_9A00EC98EC62" end="EAID_8944D0F2_D657_4ce9_B2E9_DEBFBA9394DE"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_9680588B_831E_4f03_8AD7_7E2899D2520E" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="3677" ea_eleType="element"/>
+				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 10:24:59" modified="2024-07-23 10:24:59" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<Generalization xmi:id="EAID_71F00BB4_9962_4462_99B5_9349107595CF" start="EAID_D5AE1A66_594D_488f_AFDF_6C8C5D111A0F" end="EAID_9680588B_831E_4f03_8AD7_7E2899D2520E"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_A08BABBB_DF17_46af_8086_EFFD7222CAFF" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_389050E1_4285_45aa_87A9_6A9BA62CD554">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="3672" ea_eleType="element"/>
+				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 10:24:25" modified="2024-07-23 10:24:25" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<Generalization xmi:id="EAID_4033C88B_B08F_4630_93FD_457E67FB5F58" start="EAID_A08BABBB_DF17_46af_8086_EFFD7222CAFF" end="EAID_D08F9431_D68C_497b_BC8C_B22259E469A9"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_A7E3EEA1_BBD5_409a_9717_8E5FF181CF7E" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="2983" ea_eleType="element"/>
+				<properties documentation="For more information on PlannedProcurementPart see the planning diagram in the phase oriented view from ePO core." isSpecification="false" sType="Note" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-05-10 13:55:28" modified="2023-05-10 13:57:25" complexity="1" status="Proposed"/>
+				<code gentype="&lt;none&gt;"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<NoteLink xmi:id="EAID_8A689597_C8A3_475b_AD2A_EA61AB152656" start="EAID_A7E3EEA1_BBD5_409a_9717_8E5FF181CF7E" end="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_A854A4CB_76B3_4887_9781_EB2D19B4D00D" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_F5AC099A_F1E0_4926_9F7B_6C2B6C33321B">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="3668" ea_eleType="element"/>
+				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 10:23:19" modified="2024-07-23 10:23:19" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<Generalization xmi:id="EAID_D85B5D9D_A0A9_4ed4_B03A_DD6F59C0BCAC" start="EAID_A854A4CB_76B3_4887_9781_EB2D19B4D00D" end="EAID_74DCC56E_7AA8_41a1_80A0_62B66243936F"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_AC8CC935_389B_479b_B0EA_B6FB8B5C8EB6" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_7EE70932_F57C_4861_BE52_91F3F7270840">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="1784" ea_eleType="element"/>
+				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-26 14:45:41" modified="2022-04-26 14:45:41" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<Generalization xmi:id="EAID_72F9467C_3D0D_4b12_8FA6_A01D070F8819" start="EAID_AC8CC935_389B_479b_B0EA_B6FB8B5C8EB6" end="EAID_6288458C_4439_46bc_A898_C99A5E4A62D6"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_BD2AF816_6D7A_4cf6_AD18_B2FA72E0240B" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="3036" ea_eleType="element"/>
+				<properties documentation="for ReviewBody" isSpecification="false" sType="Note" nType="1" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-06-08 13:08:07" modified="2023-06-08 13:08:17" complexity="1" status="Proposed"/>
+				<code gentype="&lt;none&gt;"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams" relatedlinks="idref1=EAID_D19EA23B_3707_4f38_8E54_F2D9BE08A114;"/>
+			</element>
+			<element xmi:idref="EAID_D08F9431_D68C_497b_BC8C_B22259E469A9" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="3673" ea_eleType="element"/>
+				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 10:24:25" modified="2024-07-23 10:24:25" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<Generalization xmi:id="EAID_4033C88B_B08F_4630_93FD_457E67FB5F58" start="EAID_A08BABBB_DF17_46af_8086_EFFD7222CAFF" end="EAID_D08F9431_D68C_497b_BC8C_B22259E469A9"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_D51DF83F_EDA1_4cfa_94A2_34A940C86AB6" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="3675" ea_eleType="element"/>
+				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 10:24:42" modified="2024-07-23 10:24:42" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<Generalization xmi:id="EAID_8B06B92A_4560_49c7_9EFF_FF8FC578D4D1" start="EAID_3CA58BCF_C8DB_4609_9044_CFAA473152BE" end="EAID_D51DF83F_EDA1_4cfa_94A2_34A940C86AB6"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_D5AE1A66_594D_488f_AFDF_6C8C5D111A0F" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_7355842B_BD0C_4fab_8681_C210E308328D">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="3676" ea_eleType="element"/>
+				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 10:24:59" modified="2024-07-23 10:24:59" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<Generalization xmi:id="EAID_71F00BB4_9962_4462_99B5_9349107595CF" start="EAID_D5AE1A66_594D_488f_AFDF_6C8C5D111A0F" end="EAID_9680588B_831E_4f03_8AD7_7E2899D2520E"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_E47E3B9A_672A_4b82_BA0F_A1B9C0D14B8E" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_A5762169_952E_4db0_9FE7_6B4A895F2AF1">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="3664" ea_eleType="element"/>
+				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 10:22:41" modified="2024-07-23 10:22:41" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<Generalization xmi:id="EAID_90E37548_02F8_4227_8C75_04FFB21501B2" start="EAID_E47E3B9A_672A_4b82_BA0F_A1B9C0D14B8E" end="EAID_4A97DCFA_BAC8_4f54_BADE_E2E47352BDD6"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_E65922A8_EFDF_48e3_B6C2_16B9FF224BE8" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_F365A241_4CD0_4009_A42F_041D198E70E4">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="3660" ea_eleType="element"/>
+				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 10:21:57" modified="2024-07-23 10:21:57" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<Generalization xmi:id="EAID_A70D66E1_34C3_4d44_949F_426C768D6C8B" start="EAID_E65922A8_EFDF_48e3_B6C2_16B9FF224BE8" end="EAID_5046F705_8CB4_4b61_9F99_4575710393BB"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_E6FB12CB_F678_4ec8_98CD_608C5E762EE9" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_B1307E49_0838_4569_819E_D05D699E0983">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="3662" ea_eleType="element"/>
+				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 10:22:18" modified="2024-07-23 10:22:18" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<Generalization xmi:id="EAID_CFE865BE_F277_4169_ABC1_9D68D997C916" start="EAID_E6FB12CB_F678_4ec8_98CD_608C5E762EE9" end="EAID_44910AF1_0738_4bac_B8E3_2BC8677D2EC1"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_E8E280AD_7469_4b14_ABEA_60317F90ACC4" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF">
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="0" ea_localid="3679" ea_eleType="element"/>
+				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 10:25:23" modified="2024-07-23 10:25:23" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<links>
+					<Generalization xmi:id="EAID_73A6FC03_1825_4ec1_A784_BF1C55F72910" start="EAID_70B80546_7629_40c6_9316_F91D7B17B474" end="EAID_E8E280AD_7469_4b14_ABEA_60317F90ACC4"/>
+				</links>
+			</element>
+			<element xmi:idref="EAPK_55622713_57C0_4aec_8ABA_05CE52DE1DE1" xmi:type="uml:Package" name="premarket consultation notice" scope="public">
+				<model package2="EAID_55622713_57C0_4aec_8ABA_05CE52DE1DE1" package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="1" ea_localid="205" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-06-29 16:43:03" modified="2024-07-23 11:45:43" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<packageproperties version="1.0" tpos="1"/>
+				<paths/>
+				<times created="2023-06-29 16:43:03" modified="2023-06-29 16:43:03"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+			</element>
+			<element xmi:idref="EAPK_2004EEE4_4246_4617_A3E8_7708D7302027" xmi:type="uml:Package" name="planning notices" scope="public">
+				<model package2="EAID_2004EEE4_4246_4617_A3E8_7708D7302027" package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="2" ea_localid="59" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 11:58:40" modified="2024-07-23 11:45:43" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<packageproperties version="1.0" tpos="2"/>
+				<paths/>
+				<times created="2021-12-09 11:58:40" modified="2021-12-09 11:58:40"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+			</element>
+			<element xmi:idref="EAPK_5CECF7F0_525A_4b25_9FF6_A2777C94113F" xmi:type="uml:Package" name="competition notices" scope="public">
+				<model package2="EAID_5CECF7F0_525A_4b25_9FF6_A2777C94113F" package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="3" ea_localid="61" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:39:19" modified="2024-07-23 11:45:43" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<packageproperties version="1.0" tpos="3"/>
+				<paths/>
+				<times created="2021-12-09 12:39:19" modified="2021-12-09 12:39:19"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+			</element>
+			<element xmi:idref="EAPK_D61EDA75_D813_49c2_BE47_B409C4D9F46F" xmi:type="uml:Package" name="DAP notices" scope="public">
+				<model package2="EAID_D61EDA75_D813_49c2_BE47_B409C4D9F46F" package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="4" ea_localid="60" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:34:10" modified="2024-07-23 11:45:43" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -6530,9 +7322,9 @@
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAPK_E18E94B8_1A2B_404b_8E22_5F8675700E4E" xmi:type="uml:Package" name="result notices" scope="public">
-				<model package2="EAID_E18E94B8_1A2B_404b_8E22_5F8675700E4E" package="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" tpos="5" ea_localid="62" ea_eleType="package"/>
+				<model package2="EAID_E18E94B8_1A2B_404b_8E22_5F8675700E4E" package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="5" ea_localid="62" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:48:04" modified="2024-03-18 13:10:23" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:48:04" modified="2024-07-23 11:45:43" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -6544,9 +7336,9 @@
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAPK_923A8489_7A3A_4898_A3EE_B83096575837" xmi:type="uml:Package" name="contract modification notices" scope="public">
-				<model package2="EAID_923A8489_7A3A_4898_A3EE_B83096575837" package="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" tpos="6" ea_localid="63" ea_eleType="package"/>
+				<model package2="EAID_923A8489_7A3A_4898_A3EE_B83096575837" package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="6" ea_localid="63" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:52:16" modified="2024-03-18 13:10:23" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:52:16" modified="2024-07-23 11:45:43" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -6558,9 +7350,9 @@
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAPK_D3AC1AE5_E7CB_402d_B534_DE950D5D62E8" xmi:type="uml:Package" name="completion notices" scope="public">
-				<model package2="EAID_D3AC1AE5_E7CB_402d_B534_DE950D5D62E8" package="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" tpos="7" ea_localid="64" ea_eleType="package"/>
+				<model package2="EAID_D3AC1AE5_E7CB_402d_B534_DE950D5D62E8" package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="7" ea_localid="64" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:54:05" modified="2024-03-18 13:10:23" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:54:05" modified="2024-07-23 11:45:43" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -6574,7 +7366,7 @@
 			<element xmi:idref="EAPK_0563EFBC_65FF_4c3c_B917_DBB607993A77" xmi:type="uml:Package" name="classes" scope="public">
 				<model package2="EAID_0563EFBC_65FF_4c3c_B917_DBB607993A77" package="EAPK_BD23B8EE_A621_4d1e_A562_7BA554221AA8" tpos="2" ea_localid="54" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-08 17:33:10" modified="2024-03-18 13:07:11" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-08 17:33:10" modified="2024-07-23 11:45:01" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -6582,13 +7374,13 @@
 				<extendedProperties tagged="0" package_name="notice core"/>
 				<packageproperties version="1.0" tpos="2"/>
 				<paths/>
-				<times created="2021-12-08 17:33:10" modified="2024-03-18 13:07:11"/>
+				<times created="2021-12-08 17:33:10" modified="2024-07-23 11:45:01"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1" xmi:type="uml:Class" name="epo-not:CANSocialNotice" scope="public">
 				<model package="EAPK_0563EFBC_65FF_4c3c_B917_DBB607993A77" tpos="0" ea_localid="1130" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:49:03" modified="2024-03-18 13:07:41" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:49:03" modified="2024-07-23 11:45:28" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -6602,12 +7394,13 @@
 					<Generalization xmi:id="EAID_3E955EE8_380D_40d3_A11F_7EEDF94928AC" start="EAID_BDB13855_F3DD_4561_A018_D5E4E2B01404" end="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1"/>
 					<Generalization xmi:id="EAID_52CC333D_FE06_4af4_AEA3_4DBE039892DA" start="EAID_39F63CA6_7D3A_4db4_B378_92656D0F3452" end="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1"/>
 					<Generalization xmi:id="EAID_6B05B709_B9D0_446e_ADF9_6954786BECD9" start="EAID_AA33DDB3_015E_422f_9700_767D093EA6DE" end="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1"/>
+					<Generalization xmi:id="EAID_FF4E869D_E24B_4c77_9DA7_6869F03D59F3" start="EAID_B93F6450_B2DC_42d5_AB43_7ACC411B4F0F" end="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_83474E52_0601_44c6_9D61_AD99797CBD13" xmi:type="uml:Class" name="epo-not:CANStandardNotice" scope="public">
 				<model package="EAPK_0563EFBC_65FF_4c3c_B917_DBB607993A77" tpos="0" ea_localid="1129" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:48:57" modified="2024-03-18 13:07:41" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:48:57" modified="2024-07-23 11:45:28" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -6620,13 +7413,14 @@
 					<Generalization xmi:id="EAID_6214E31E_213C_469e_BC04_B651E755D91C" start="EAID_1E3043E1_90A9_43f7_9009_1E46C1451F8D" end="EAID_83474E52_0601_44c6_9D61_AD99797CBD13"/>
 					<Generalization xmi:id="EAID_A37999FA_4BFE_4661_9AE9_32813DCF358A" start="EAID_961635DD_1E69_4907_B7A8_D2D05116023F" end="EAID_83474E52_0601_44c6_9D61_AD99797CBD13"/>
 					<Generalization xmi:id="EAID_C926EE7A_E434_4893_842E_F2E5FA432810" start="EAID_6019482D_1758_4997_9E94_54C4E5AD26F2" end="EAID_83474E52_0601_44c6_9D61_AD99797CBD13"/>
+					<Generalization xmi:id="EAID_CD899FA2_16BF_440c_9BBF_0C20785CB74C" start="EAID_1A622AA7_D176_418b_84D4_6FB3AAC4A4F9" end="EAID_83474E52_0601_44c6_9D61_AD99797CBD13"/>
 					<Generalization xmi:id="EAID_D60668CB_4565_4f10_8EA3_14B93254E757" start="EAID_61E6D7F3_02F4_4fe3_9A81_0609FB33A070" end="EAID_83474E52_0601_44c6_9D61_AD99797CBD13"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_33778168_3AF6_4d83_B03E_875438FD6EAC" xmi:type="uml:Class" name="epo-not:CNSocialNotice" scope="public">
 				<model package="EAPK_0563EFBC_65FF_4c3c_B917_DBB607993A77" tpos="0" ea_localid="1126" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:40:36" modified="2024-03-18 13:07:31" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:40:36" modified="2024-07-23 11:45:17" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -6644,7 +7438,7 @@
 			<element xmi:idref="EAID_5DE4BBA5_24F3_4e6e_823C_BFF3401A979F" xmi:type="uml:Class" name="epo-not:CNStandardNotice" scope="public">
 				<model package="EAPK_0563EFBC_65FF_4c3c_B917_DBB607993A77" tpos="0" ea_localid="1124" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:40:30" modified="2024-03-18 13:07:31" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:40:30" modified="2024-07-23 11:45:17" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -6658,6 +7452,7 @@
 					<Generalization xmi:id="EAID_50F3E9A9_9ABF_4032_98EC_E0B7E0C4EC5F" start="EAID_05BD5904_CDFC_48bf_B90A_B606950BAFBE" end="EAID_5DE4BBA5_24F3_4e6e_823C_BFF3401A979F"/>
 					<Generalization xmi:id="EAID_5151BB57_9A61_4a55_82D8_818B9477B524" start="EAID_3FC83BCD_6B25_4180_B697_6D64E2AF9220" end="EAID_5DE4BBA5_24F3_4e6e_823C_BFF3401A979F"/>
 					<Generalization xmi:id="EAID_A13194F0_9A95_4fda_A5AA_C2D31307FFF6" start="EAID_60BE7698_3371_4fef_94A7_1536255B4CDF" end="EAID_5DE4BBA5_24F3_4e6e_823C_BFF3401A979F"/>
+					<Generalization xmi:id="EAID_E4877D84_62DD_4b49_93E9_B9CDDC757DFE" start="EAID_12A00248_5E3C_489e_88B4_ABEF21E72261" end="EAID_5DE4BBA5_24F3_4e6e_823C_BFF3401A979F"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_17662AEF_1321_446a_AE42_0583F7417A79" xmi:type="uml:Class" name="epo-not:CompetitionNotice" scope="public">
@@ -6706,6 +7501,7 @@
 					<Association xmi:id="EAID_D19EA23B_3707_4f38_8E54_F2D9BE08A114" start="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
 					<Association xmi:id="EAID_DB36A935_6B61_49a0_A901_D1A6B9C4D5A7" start="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" end="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
 					<Association xmi:id="EAID_F5AC099A_F1E0_4926_9F7B_6C2B6C33321B" start="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" end="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
+					<Generalization xmi:id="EAID_08F5FCE9_9B75_4d80_AD87_6CDE7E017303" start="EAID_137272D3_D36E_4bc8_BB25_DB95F670222F" end="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257" xmi:type="uml:Class" name="epo-not:ContractModificationNotice" scope="public">
@@ -6740,7 +7536,7 @@
 			<element xmi:idref="EAID_C2B5E2C0_38FA_484b_A696_E3B22916E927" xmi:type="uml:Class" name="epo-not:DesignContestNotice" scope="public">
 				<model package="EAPK_0563EFBC_65FF_4c3c_B917_DBB607993A77" tpos="0" ea_localid="1127" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:40:38" modified="2024-03-18 13:07:31" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:40:38" modified="2024-07-23 11:45:17" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -6758,7 +7554,7 @@
 			<element xmi:idref="EAID_AE877E81_8A12_4ec7_ACA1_4EE4A3ADE597" xmi:type="uml:Class" name="epo-not:DesignContestResultNotice" scope="public">
 				<model package="EAPK_0563EFBC_65FF_4c3c_B917_DBB607993A77" tpos="0" ea_localid="1131" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:49:06" modified="2024-03-18 13:07:41" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:49:06" modified="2024-07-23 11:45:28" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -6799,7 +7595,7 @@
 			<element xmi:idref="EAID_592715F4_D66A_4a87_928F_BD5CC2C2E681" xmi:type="uml:Class" name="epo-not:PIN-CFCSocialNotice" scope="public">
 				<model package="EAPK_0563EFBC_65FF_4c3c_B917_DBB607993A77" tpos="0" ea_localid="1122" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:40:25" modified="2024-03-18 13:07:31" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:40:25" modified="2024-07-23 11:45:17" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -6818,7 +7614,7 @@
 			<element xmi:idref="EAID_A055DBBD_DFB0_481c_8A60_5F8E32E52187" xmi:type="uml:Class" name="epo-not:PIN-CFCStandardNotice" scope="public">
 				<model package="EAPK_0563EFBC_65FF_4c3c_B917_DBB607993A77" tpos="0" ea_localid="1121" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:40:23" modified="2024-03-18 13:07:31" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:40:23" modified="2024-07-23 11:45:17" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -6828,6 +7624,7 @@
 					<Dependency xmi:id="EAID_33DE10B8_8226_4476_84EC_09212E39E584" start="EAID_A055DBBD_DFB0_481c_8A60_5F8E32E52187" end="EAID_26558DD7_F7F2_428a_9639_C6126EF61343"/>
 					<Generalization xmi:id="EAID_3F8437A0_516C_4b2e_89DC_B3689DBDE53E" start="EAID_A055DBBD_DFB0_481c_8A60_5F8E32E52187" end="EAID_17662AEF_1321_446a_AE42_0583F7417A79"/>
 					<Generalization xmi:id="EAID_0733A1C6_CC3D_446f_8E8A_A963D1E6D504" start="EAID_2350D8D8_DBC1_4710_A2D0_9E80046D6F70" end="EAID_A055DBBD_DFB0_481c_8A60_5F8E32E52187"/>
+					<Generalization xmi:id="EAID_40F0FF83_FA54_4eb1_93E2_2C730C732867" start="EAID_B6AAD0B0_AC78_46dd_A2BB_15ABCBF61F8B" end="EAID_A055DBBD_DFB0_481c_8A60_5F8E32E52187"/>
 					<Generalization xmi:id="EAID_76F210FA_5489_47b7_8FD9_2F861B44B724" start="EAID_7C815E00_5AB7_4221_9673_417A43FCEAF3" end="EAID_A055DBBD_DFB0_481c_8A60_5F8E32E52187"/>
 					<Generalization xmi:id="EAID_B027C297_9F8F_4fe5_BE8D_F948E5020DDC" start="EAID_F5BD72AB_5FF0_48bc_9464_2B2F2DA07EF0" end="EAID_A055DBBD_DFB0_481c_8A60_5F8E32E52187"/>
 				</links>
@@ -6835,7 +7632,7 @@
 			<element xmi:idref="EAID_A31D0982_B460_4636_82B7_C2AF2C92D0B7" xmi:type="uml:Class" name="epo-not:PINOnlyNotice" scope="public">
 				<model package="EAPK_0563EFBC_65FF_4c3c_B917_DBB607993A77" tpos="0" ea_localid="1092" ea_eleType="element"/>
 				<properties documentation="PriorInformationNotice" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 11:59:59" modified="2024-03-18 13:07:22" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 11:59:59" modified="2024-07-23 11:45:10" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -6844,6 +7641,7 @@
 				<links>
 					<Dependency xmi:id="EAID_13EDE5F0_D982_41fc_823C_F5D9AA3AB829" start="EAID_A31D0982_B460_4636_82B7_C2AF2C92D0B7" end="EAID_A28E85B5_919D_438c_AD5D_BCC5C9355C2F"/>
 					<Generalization xmi:id="EAID_AF1D7C6F_AE8A_4b59_AB06_244F1F3F1AC2" start="EAID_A31D0982_B460_4636_82B7_C2AF2C92D0B7" end="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B"/>
+					<Generalization xmi:id="EAID_093A00FE_8C02_46c0_BF3D_F4067DB0161C" start="EAID_20A35C8C_4895_4aef_AE94_63C59C948D5D" end="EAID_A31D0982_B460_4636_82B7_C2AF2C92D0B7"/>
 					<Generalization xmi:id="EAID_4D75816A_997C_42ba_AC94_51FB591352A8" start="EAID_F4FA5525_AA4D_46bb_A4DB_AFA624268215" end="EAID_A31D0982_B460_4636_82B7_C2AF2C92D0B7"/>
 					<Generalization xmi:id="EAID_81C15491_9561_4a4b_B24C_6B2EC6A04EE7" start="EAID_77B7A553_E803_4004_BBDD_E7E6A2ED7E06" end="EAID_A31D0982_B460_4636_82B7_C2AF2C92D0B7"/>
 					<Generalization xmi:id="EAID_8DDCEAA8_CB1F_4102_A652_453D48B0CA7E" start="EAID_64AABC7B_6677_49c0_B157_A0A97128A458" end="EAID_A31D0982_B460_4636_82B7_C2AF2C92D0B7"/>
@@ -6854,7 +7652,7 @@
 			<element xmi:idref="EAID_9A9E6106_6655_4d55_9343_6884F40C1496" xmi:type="uml:Class" name="epo-not:PINProfileNotice" scope="public">
 				<model package="EAPK_0563EFBC_65FF_4c3c_B917_DBB607993A77" tpos="0" ea_localid="1091" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 11:59:57" modified="2024-03-18 13:07:22" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 11:59:57" modified="2024-07-23 11:45:10" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -6874,7 +7672,7 @@
 			<element xmi:idref="EAID_7B308DB7_0AC5_45c9_8E6F_0D46097D2C9C" xmi:type="uml:Class" name="epo-not:PINTimeLimitNotice" scope="public">
 				<model package="EAPK_0563EFBC_65FF_4c3c_B917_DBB607993A77" tpos="0" ea_localid="1093" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:00:02" modified="2024-03-18 13:07:22" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:00:02" modified="2024-07-23 11:45:10" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -6886,6 +7684,7 @@
 					<Generalization xmi:id="EAID_06373BCB_0958_4fd0_A740_659AD96A0318" start="EAID_B93D8CB9_6FE5_4bba_8CDE_31AFE57E2AFD" end="EAID_7B308DB7_0AC5_45c9_8E6F_0D46097D2C9C"/>
 					<Generalization xmi:id="EAID_A2552EE8_A41E_4e28_8C74_B27EB1903597" start="EAID_378A0219_58F3_4bbb_A19B_0E19C7D6814B" end="EAID_7B308DB7_0AC5_45c9_8E6F_0D46097D2C9C"/>
 					<Generalization xmi:id="EAID_A45DA829_86D2_43bb_9F1F_EBC0920A6385" start="EAID_6D9C7E13_E718_4e10_9C31_E8824BB859C5" end="EAID_7B308DB7_0AC5_45c9_8E6F_0D46097D2C9C"/>
+					<Generalization xmi:id="EAID_C0AEC9E0_776E_47ad_B97E_C65FBB995AB7" start="EAID_4B4AA994_6B56_421a_80D0_CE346536A2B9" end="EAID_7B308DB7_0AC5_45c9_8E6F_0D46097D2C9C"/>
 					<Generalization xmi:id="EAID_DE1E6E6D_F92C_4af1_B5E3_EDE10941DF91" start="EAID_85A3677C_D922_4169_BDDC_6D4FA8F74EE4" end="EAID_7B308DB7_0AC5_45c9_8E6F_0D46097D2C9C"/>
 					<Generalization xmi:id="EAID_EB529402_EAC3_46fb_846D_2858010D4357" start="EAID_0A917C15_D52D_40b0_AD31_1089680BFBDF" end="EAID_7B308DB7_0AC5_45c9_8E6F_0D46097D2C9C"/>
 				</links>
@@ -6912,22 +7711,23 @@
 			</element>
 			<element xmi:idref="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03" xmi:type="uml:Class" name="epo-not:PreMarketConsultationNotice" scope="public">
 				<model package="EAPK_0563EFBC_65FF_4c3c_B917_DBB607993A77" tpos="0" ea_localid="3078" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-06-29 16:43:42" modified="2023-06-29 16:45:27" complexity="1" status="Proposed"/>
+				<properties documentation="Announcement of a pre-market consultation. &#xA;&#xA;Additional information:&#xA;A pre-market consultation is not a call for competition and no procurement documents are available at the time of consultation. A consultation may or may not be followed by a future competition.&#xA;&#xA;WG approval 02/05/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-06-29 16:43:42" modified="2024-05-02 17:25:39" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="classes"/>
 				<links>
-					<Generalization xmi:id="EAID_5217DA2B_F336_4793_85E1_6829959E93BB" start="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03" end="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
+					<Generalization xmi:id="EAID_A1DC6D24_EABE_467c_80DC_91F8A4D3F0DE" start="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03" end="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
 					<Dependency xmi:id="EAID_C0F50A97_3E33_43bb_8F4A_B5B2C763463B" start="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03" end="EAID_53C53D83_424B_4038_AF6F_5B9C6F71226D"/>
+					<Generalization xmi:id="EAID_251F0F6E_D0B5_4304_8962_DC4613C4041F" start="EAID_F0DE3A34_0F67_47af_914A_82A0C222723C" end="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_C04A3529_BA24_4b09_BA1E_34917AA6433D" xmi:type="uml:Class" name="epo-not:QSNotice" scope="public">
 				<model package="EAPK_0563EFBC_65FF_4c3c_B917_DBB607993A77" tpos="0" ea_localid="1123" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:40:27" modified="2024-03-18 13:07:31" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:40:27" modified="2024-07-23 11:45:17" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -6971,7 +7771,7 @@
 			<element xmi:idref="EAID_4E444B8E_FC46_42b6_9A28_4F03AE4B456A" xmi:type="uml:Class" name="epo-not:SubcontractNotice" scope="public">
 				<model package="EAPK_0563EFBC_65FF_4c3c_B917_DBB607993A77" tpos="0" ea_localid="1125" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:40:33" modified="2024-03-18 13:07:31" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:40:33" modified="2024-07-23 11:45:17" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -6987,7 +7787,7 @@
 			<element xmi:idref="EAID_19F4A072_85E4_452f_92A7_5CB32D4CB70B" xmi:type="uml:Class" name="epo-not:VoluntaryEx-AnteTransparencyNotice" scope="public">
 				<model package="EAPK_0563EFBC_65FF_4c3c_B917_DBB607993A77" tpos="0" ea_localid="1118" ea_eleType="element"/>
 				<properties documentation="A Notice informing of the intention to award  a Contract without prior publication of a Contract Notice.&#xA;&#xA;Additional Information:&#xA;&#xA;For European Notices above the threshold&#xA;&#xA;&quot;A means of advertising the intention to award the Contract without opening it up to formal Competition. A Contracting Authority may decide that a Contract does not require prior publication through a Contract Notice in the O.J.E.U. A reason for this decision may be that the Contract meets the exceptional conditions described in Article 31 of Directive 2004/18/EC. In a recent V.E.A.T notice the reason was listed as “extreme urgency brought about by events unforeseeable by the Contracting Entity and in accordance with the strict conditions stated in the Directive” .&#xA;&quot;Voluntary Ex-Ante Transparency Notice&quot; (VEAT) where a Contracting Authority deems that a Contract does not require prior publication of a Contract Notice in the European Journal (OJEU). This may apply, for example, if the Contract meets the exceptional conditions justifying direct award of contracts.&#xA;&#xA;&lt;b&gt;This definition is still to be worked on.&lt;/b&gt;&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:34:38" modified="2024-03-18 13:07:35" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-09 12:34:38" modified="2024-07-23 11:45:22" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7006,10 +7806,10 @@
 					<Generalization xmi:id="EAID_D60CA345_0235_4f18_BAE4_2BF9B7A91B34" start="EAID_92794986_A7F2_435b_97E1_C04AC81E72AA" end="EAID_19F4A072_85E4_452f_92A7_5CB32D4CB70B"/>
 				</links>
 			</element>
-			<element xmi:idref="EAPK_4598E8FA_C77D_403a_8325_C8AB063FA836" xmi:type="uml:Package" name="controlled vocabularies" scope="public">
-				<model package2="EAID_4598E8FA_C77D_403a_8325_C8AB063FA836" package="EAPK_BD23B8EE_A621_4d1e_A562_7BA554221AA8" tpos="3" ea_localid="261" ea_eleType="package"/>
+			<element xmi:idref="EAPK_7DDD5D61_100A_4406_AB81_8ADBCB0DD163" xmi:type="uml:Package" name="controlled vocabularies" scope="public">
+				<model package2="EAID_7DDD5D61_100A_4406_AB81_8ADBCB0DD163" package="EAPK_BD23B8EE_A621_4d1e_A562_7BA554221AA8" tpos="3" ea_localid="250" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 13:10:59" modified="2024-03-18 13:11:02" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:45:58" modified="2024-07-23 11:45:58" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7017,13 +7817,13 @@
 				<extendedProperties tagged="0" package_name="notice core"/>
 				<packageproperties version="1.0" tpos="3"/>
 				<paths/>
-				<times created="2024-03-18 13:10:59" modified="2024-03-18 13:10:59"/>
+				<times created="2024-07-23 11:45:58" modified="2024-07-23 11:45:58"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAPK_FC6F39EE_8F56_4cac_BD56_FB56D97C19AA" xmi:type="uml:Package" name="notice types" scope="public">
-				<model package2="EAID_FC6F39EE_8F56_4cac_BD56_FB56D97C19AA" package="EAPK_4598E8FA_C77D_403a_8325_C8AB063FA836" tpos="4" ea_localid="56" ea_eleType="package"/>
+				<model package2="EAID_FC6F39EE_8F56_4cac_BD56_FB56D97C19AA" package="EAPK_7DDD5D61_100A_4406_AB81_8ADBCB0DD163" tpos="4" ea_localid="56" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-08 17:34:40" modified="2024-03-18 13:11:09" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-08 17:34:40" modified="2024-07-23 11:46:04" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7300,9 +8100,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAPK_823ACA8D_1707_4059_8C14_B89FD6B5DAD2" xmi:type="uml:Package" name="legal basis" scope="public">
-				<model package2="EAID_823ACA8D_1707_4059_8C14_B89FD6B5DAD2" package="EAPK_4598E8FA_C77D_403a_8325_C8AB063FA836" tpos="5" ea_localid="57" ea_eleType="package"/>
+				<model package2="EAID_823ACA8D_1707_4059_8C14_B89FD6B5DAD2" package="EAPK_7DDD5D61_100A_4406_AB81_8ADBCB0DD163" tpos="5" ea_localid="57" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-08 17:35:06" modified="2024-03-18 13:11:09" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-08 17:35:06" modified="2024-07-23 11:46:04" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7313,6 +8113,35 @@
 				<times created="2021-12-08 17:35:06" modified="2021-12-08 17:35:06"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
+			<element xmi:idref="EAID_C0E81714_CC78_4bd5_B8F5_31F967E74257" xmi:type="uml:Object" name="Regulation 1370" scope="public" classifier="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66">
+				<model package="EAPK_823ACA8D_1707_4059_8C14_B89FD6B5DAD2" tpos="0" ea_localid="3651" ea_eleType="element"/>
+				<properties isSpecification="false" sType="Object" nType="0" classname="at-voc:legal-basis" scope="public" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-18 17:22:29" modified="2024-07-18 17:23:11" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="legal basis"/>
+				<links>
+					<Realisation xmi:id="EAID_3452502E_9900_4175_9794_D484025607E7" start="EAID_C0E81714_CC78_4bd5_B8F5_31F967E74257" end="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66"/>
+					<Dependency xmi:id="EAID_01E7319D_7EE6_4b79_94C5_251FABA00729" start="EAID_B93F6450_B2DC_42d5_AB43_7ACC411B4F0F" end="EAID_C0E81714_CC78_4bd5_B8F5_31F967E74257"/>
+					<Dependency xmi:id="EAID_22448738_74AC_444e_AA46_30FE9C0CC404" start="EAID_4B4AA994_6B56_421a_80D0_CE346536A2B9" end="EAID_C0E81714_CC78_4bd5_B8F5_31F967E74257"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_64AA7AC6_F248_4162_BC6F_4434B8DC0F67" xmi:type="uml:Object" name="Regulation 1046" scope="public" classifier="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66">
+				<model package="EAPK_823ACA8D_1707_4059_8C14_B89FD6B5DAD2" tpos="0" ea_localid="3650" ea_eleType="element"/>
+				<properties isSpecification="false" sType="Object" nType="0" classname="at-voc:legal-basis" scope="public" isAbstract="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-18 17:22:26" modified="2024-07-18 17:23:03" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="legal basis"/>
+				<links>
+					<Realisation xmi:id="EAID_4F2CCAB3_E0D4_434a_869E_D874CC918E17" start="EAID_64AA7AC6_F248_4162_BC6F_4434B8DC0F67" end="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66"/>
+					<Dependency xmi:id="EAID_39D76FBC_915F_4506_BBA5_1BAA08D19F04" start="EAID_B6AAD0B0_AC78_46dd_A2BB_15ABCBF61F8B" end="EAID_64AA7AC6_F248_4162_BC6F_4434B8DC0F67"/>
+				</links>
+			</element>
 			<element xmi:idref="EAID_6C334A58_89F2_4d3e_98F6_902667A49E71" xmi:type="uml:Object" name="(EU) 2019/1780" scope="public" classifier="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66">
 				<model package="EAPK_823ACA8D_1707_4059_8C14_B89FD6B5DAD2" tpos="0" ea_localid="1277" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Object" nType="0" classname="at-voc:legal-basis" scope="public" isAbstract="false"/>
@@ -7484,10 +8313,10 @@
 				<times created="2021-12-10 10:18:54" modified="2021-12-10 10:19:46"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
 			</element>
-			<element xmi:idref="EAPK_8B2689E9_AC38_4c4e_880C_C7FC553D1616" xmi:type="uml:Package" name="diagrams" scope="public">
-				<model package2="EAID_8B2689E9_AC38_4c4e_880C_C7FC553D1616" package="EAPK_CD52EB08_1B60_47ee_B9F2_7D5904FA89A1" tpos="1" ea_localid="262" ea_eleType="package"/>
+			<element xmi:idref="EAPK_F9A451BC_D24F_4ed4_8497_24F21DD2B6C3" xmi:type="uml:Package" name="diagrams" scope="public">
+				<model package2="EAID_F9A451BC_D24F_4ed4_8497_24F21DD2B6C3" package="EAPK_CD52EB08_1B60_47ee_B9F2_7D5904FA89A1" tpos="1" ea_localid="251" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 13:11:29" modified="2024-03-18 13:11:29" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:46:21" modified="2024-07-23 11:46:21" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7495,97 +8324,110 @@
 				<extendedProperties tagged="0" package_name="eFormsNotices"/>
 				<packageproperties version="1.0" tpos="1"/>
 				<paths/>
-				<times created="2024-03-18 13:11:29" modified="2024-03-18 13:11:29"/>
+				<times created="2024-07-23 11:46:21" modified="2024-07-23 11:46:21"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAPK_6970E353_92B6_44dc_8D54_27EE50616607" xmi:type="uml:Package" name="planning subtype notices" scope="public">
-				<model package2="EAID_6970E353_92B6_44dc_8D54_27EE50616607" package="EAPK_8B2689E9_AC38_4c4e_880C_C7FC553D1616" tpos="3" ea_localid="73" ea_eleType="package"/>
+				<model package2="EAID_6970E353_92B6_44dc_8D54_27EE50616607" package="EAPK_F9A451BC_D24F_4ed4_8497_24F21DD2B6C3" tpos="1" ea_localid="73" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:55:48" modified="2024-03-18 13:12:32" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:55:48" modified="2024-07-23 11:47:40" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
-				<packageproperties version="1.0" tpos="3"/>
+				<packageproperties version="1.0" tpos="1"/>
 				<paths/>
 				<times created="2021-12-10 12:55:48" modified="2021-12-10 12:55:48"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAPK_B67F8633_2079_4127_BD4D_86B7F8DBC6AA" xmi:type="uml:Package" name="competition subtype notices" scope="public">
-				<model package2="EAID_B67F8633_2079_4127_BD4D_86B7F8DBC6AA" package="EAPK_8B2689E9_AC38_4c4e_880C_C7FC553D1616" tpos="4" ea_localid="71" ea_eleType="package"/>
+				<model package2="EAID_B67F8633_2079_4127_BD4D_86B7F8DBC6AA" package="EAPK_F9A451BC_D24F_4ed4_8497_24F21DD2B6C3" tpos="2" ea_localid="71" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 10:22:25" modified="2024-03-18 13:12:32" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 10:22:25" modified="2024-07-23 11:47:40" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
-				<packageproperties version="1.0" tpos="4"/>
+				<packageproperties version="1.0" tpos="2"/>
 				<paths/>
 				<times created="2021-12-10 10:22:25" modified="2021-12-10 12:56:07"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAPK_FB5DC6CC_1C70_4f3c_946C_F4B0A08D9192" xmi:type="uml:Package" name="DAP subtype notices" scope="public">
-				<model package2="EAID_FB5DC6CC_1C70_4f3c_946C_F4B0A08D9192" package="EAPK_8B2689E9_AC38_4c4e_880C_C7FC553D1616" tpos="5" ea_localid="74" ea_eleType="package"/>
+				<model package2="EAID_FB5DC6CC_1C70_4f3c_946C_F4B0A08D9192" package="EAPK_F9A451BC_D24F_4ed4_8497_24F21DD2B6C3" tpos="3" ea_localid="74" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:15:23" modified="2024-03-18 13:12:32" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:15:23" modified="2024-07-23 11:47:40" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
-				<packageproperties version="1.0" tpos="5"/>
+				<packageproperties version="1.0" tpos="3"/>
 				<paths/>
 				<times created="2021-12-10 13:15:23" modified="2021-12-10 13:15:23"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAPK_B775C397_9DD7_4b60_8DF5_BD1A1119F341" xmi:type="uml:Package" name="result subtype notices" scope="public">
-				<model package2="EAID_B775C397_9DD7_4b60_8DF5_BD1A1119F341" package="EAPK_8B2689E9_AC38_4c4e_880C_C7FC553D1616" tpos="6" ea_localid="75" ea_eleType="package"/>
+				<model package2="EAID_B775C397_9DD7_4b60_8DF5_BD1A1119F341" package="EAPK_F9A451BC_D24F_4ed4_8497_24F21DD2B6C3" tpos="4" ea_localid="75" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:19:25" modified="2024-03-18 13:12:32" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:19:25" modified="2024-07-23 11:47:40" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
-				<packageproperties version="1.0" tpos="6"/>
+				<packageproperties version="1.0" tpos="4"/>
 				<paths/>
 				<times created="2021-12-10 13:19:25" modified="2021-12-10 13:19:35"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAPK_C7DD7F9D_C549_4bd0_AC8A_D079586C69E5" xmi:type="uml:Package" name="contract modification subtype notices" scope="public">
-				<model package2="EAID_C7DD7F9D_C549_4bd0_AC8A_D079586C69E5" package="EAPK_8B2689E9_AC38_4c4e_880C_C7FC553D1616" tpos="7" ea_localid="72" ea_eleType="package"/>
+				<model package2="EAID_C7DD7F9D_C549_4bd0_AC8A_D079586C69E5" package="EAPK_F9A451BC_D24F_4ed4_8497_24F21DD2B6C3" tpos="5" ea_localid="72" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:47:48" modified="2024-03-18 13:12:32" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:47:48" modified="2024-07-23 11:47:40" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
-				<packageproperties version="1.0" tpos="7"/>
+				<packageproperties version="1.0" tpos="5"/>
 				<paths/>
 				<times created="2021-12-10 12:47:48" modified="2021-12-10 12:47:48"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAPK_F92ADA51_C0C0_408e_A6E8_EA20B8C21EAD" xmi:type="uml:Package" name="completion subtype notices" scope="public">
-				<model package2="EAID_F92ADA51_C0C0_408e_A6E8_EA20B8C21EAD" package="EAPK_8B2689E9_AC38_4c4e_880C_C7FC553D1616" tpos="8" ea_localid="76" ea_eleType="package"/>
+				<model package2="EAID_F92ADA51_C0C0_408e_A6E8_EA20B8C21EAD" package="EAPK_F9A451BC_D24F_4ed4_8497_24F21DD2B6C3" tpos="6" ea_localid="76" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:32:58" modified="2024-03-18 13:12:32" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:32:58" modified="2024-07-23 11:47:40" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
-				<packageproperties version="1.0" tpos="8"/>
+				<packageproperties version="1.0" tpos="6"/>
 				<paths/>
 				<times created="2021-12-10 13:32:58" modified="2021-12-10 13:32:58"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
-			<element xmi:idref="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" xmi:type="uml:Package" name="classes" scope="public">
-				<model package2="EAID_151D85FC_A8FE_41af_A695_C90B004F875A" package="EAPK_CD52EB08_1B60_47ee_B9F2_7D5904FA89A1" tpos="2" ea_localid="263" ea_eleType="package"/>
+			<element xmi:idref="EAID_F72A2F1B_E855_4fd5_85C1_44FFF7302FAA" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_F92ADA51_C0C0_408e_A6E8_EA20B8C21EAD" tpos="0" ea_localid="3646" ea_eleType="element"/>
+				<properties documentation="what form type?&#xA;" isSpecification="false" sType="Note" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-18 13:25:07" modified="2024-07-18 13:25:17" complexity="1" status="Proposed"/>
+				<code gentype="&lt;none&gt;"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="completion subtype notices"/>
+				<links>
+					<NoteLink xmi:id="EAID_211F10EB_36BF_46b2_900A_DFA61A369012" start="EAID_F72A2F1B_E855_4fd5_85C1_44FFF7302FAA" end="EAID_137272D3_D36E_4bc8_BB25_DB95F670222F"/>
+				</links>
+			</element>
+			<element xmi:idref="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" xmi:type="uml:Package" name="classes" scope="public">
+				<model package2="EAID_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" package="EAPK_CD52EB08_1B60_47ee_B9F2_7D5904FA89A1" tpos="2" ea_localid="252" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 13:11:39" modified="2024-03-18 13:11:39" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:46:33" modified="2024-07-23 11:48:15" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7593,13 +8435,13 @@
 				<extendedProperties tagged="0" package_name="eFormsNotices"/>
 				<packageproperties version="1.0" tpos="2"/>
 				<paths/>
-				<times created="2024-03-18 13:11:39" modified="2024-03-18 13:11:39"/>
+				<times created="2024-07-23 11:46:33" modified="2024-07-23 11:46:33"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" xmi:type="uml:Class" name="epo-not:eFormsNotice" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1283" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1283" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-20 15:35:25" modified="2024-03-18 13:12:23" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-20 15:35:25" modified="2024-07-23 11:47:30" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7608,6 +8450,8 @@
 				<links>
 					<Dependency xmi:id="EAID_D4E69FBD_0972_491c_89CA_686B0CAFECBF" start="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" end="EAID_6C334A58_89F2_4d3e_98F6_902667A49E71"/>
 					<Generalization xmi:id="EAID_0BDDE5E5_5E2D_438f_900E_43985FC6F4D3" start="EAID_2A716878_4D7B_473c_A793_4F4CB4AAA00E" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
+					<Generalization xmi:id="EAID_10DA1E5E_EB3E_4f82_AB74_84EC9AB0AF8D" start="EAID_20A35C8C_4895_4aef_AE94_63C59C948D5D" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
+					<Generalization xmi:id="EAID_25F1119B_B9A1_4e00_81DE_AB87104E2971" start="EAID_12A00248_5E3C_489e_88B4_ABEF21E72261" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<Generalization xmi:id="EAID_287B91EE_C9D0_4b5a_B824_CA7FBF189C7D" start="EAID_E3E1C02A_989B_432d_9EDC_EB166766150C" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<Generalization xmi:id="EAID_2B3454E9_DDE4_4458_B276_3E5F1210A7CC" start="EAID_4280D6D9_1C83_445d_B9BA_C83F761767C3" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<Generalization xmi:id="EAID_2CB2CFE5_7A21_4a1d_B422_A7E2EF4D9832" start="EAID_378A0219_58F3_4bbb_A19B_0E19C7D6814B" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
@@ -7618,6 +8462,7 @@
 					<Generalization xmi:id="EAID_5F7A4A22_8891_4306_8497_C6A0E6A1DF10" start="EAID_95A5493E_AB63_497a_B38E_96B488D39429" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<Generalization xmi:id="EAID_60240524_13B2_46c0_9B7B_4607821ACD3D" start="EAID_61E6D7F3_02F4_4fe3_9A81_0609FB33A070" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<Generalization xmi:id="EAID_6095DC52_29EC_44bb_8960_5273E4E77A46" start="EAID_77B7A553_E803_4004_BBDD_E7E6A2ED7E06" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
+					<Generalization xmi:id="EAID_6589DF3C_F8AF_4060_9294_0DA799BDC3D9" start="EAID_B6AAD0B0_AC78_46dd_A2BB_15ABCBF61F8B" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<Generalization xmi:id="EAID_6B3143BA_4F2F_4588_9069_661C90DA98AA" start="EAID_53A92E92_9CAF_4d77_A25C_5BE7FADB130C" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<Generalization xmi:id="EAID_6CD94385_E981_431b_A7A8_96CEBBA34430" start="EAID_B0688B55_49B2_4d49_B3A8_16E8DC1B426C" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<Generalization xmi:id="EAID_726794CC_9E6F_4ef1_90FE_E09A19EA8365" start="EAID_85A3677C_D922_4169_BDDC_6D4FA8F74EE4" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
@@ -7626,18 +8471,23 @@
 					<Generalization xmi:id="EAID_84CB7ABD_1AEF_47ce_A6E5_919F4F518F2D" start="EAID_961635DD_1E69_4907_B7A8_D2D05116023F" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<Generalization xmi:id="EAID_882F7772_3F8D_4698_81C0_4EA85548792A" start="EAID_6019482D_1758_4997_9E94_54C4E5AD26F2" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<Generalization xmi:id="EAID_88411C51_17C6_4b79_B119_259EE8D70E63" start="EAID_7C815E00_5AB7_4221_9673_417A43FCEAF3" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
+					<Generalization xmi:id="EAID_8CD40BAD_1B19_4e5e_B3AC_E2C7CB4138B9" start="EAID_B93F6450_B2DC_42d5_AB43_7ACC411B4F0F" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<Generalization xmi:id="EAID_8D822444_2ABC_4032_ACDA_D8B62A04195A" start="EAID_BFA7907E_8FB6_49ba_B11E_EBCC5F1EDA23" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<Generalization xmi:id="EAID_93FD0771_35EB_41f8_8A61_A6C3C9EF8A1D" start="EAID_BDB13855_F3DD_4561_A018_D5E4E2B01404" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<Generalization xmi:id="EAID_958ED0F3_DFB5_4b75_8BA3_B0DFD962D332" start="EAID_78885FA2_A0A3_41bb_AB51_461D20C1E74E" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<Generalization xmi:id="EAID_A1F15800_0C40_46da_8C06_C88509A7ADAE" start="EAID_60BE7698_3371_4fef_94A7_1536255B4CDF" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
+					<Generalization xmi:id="EAID_AF8B2993_D45B_4d65_BCC9_641769FA2898" start="EAID_137272D3_D36E_4bc8_BB25_DB95F670222F" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<Generalization xmi:id="EAID_B08538A4_702A_4149_8C5D_43CDF93181B9" start="EAID_AA33DDB3_015E_422f_9700_767D093EA6DE" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<Generalization xmi:id="EAID_BB097A39_C442_4e37_80B3_72438C82C716" start="EAID_84FDBA35_4628_4956_AB0B_DC9B7C2BA31E" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<Generalization xmi:id="EAID_BB107D66_398C_4fff_9B95_9DDAEFE54292" start="EAID_B8491411_E302_450a_8C43_283BEAED93F3" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<Generalization xmi:id="EAID_CD75AD4C_9D67_425c_9AF5_104892C66F82" start="EAID_92794986_A7F2_435b_97E1_C04AC81E72AA" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<Generalization xmi:id="EAID_CD99C8BD_DC6F_4d30_8016_828165F11C86" start="EAID_9534CCE2_2925_49a9_8149_B4372990E2A4" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
+					<Generalization xmi:id="EAID_CE524DE2_7EA2_4088_82A8_10147B85EC4A" start="EAID_F0DE3A34_0F67_47af_914A_82A0C222723C" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<Generalization xmi:id="EAID_D0FFBE63_C48C_4d65_9C41_4399E6C4FC47" start="EAID_64AABC7B_6677_49c0_B157_A0A97128A458" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
+					<Generalization xmi:id="EAID_D150D8BA_9E5C_46d7_88B7_B524DAE70854" start="EAID_1A622AA7_D176_418b_84D4_6FB3AAC4A4F9" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<Generalization xmi:id="EAID_D8F5A0A7_8441_4207_B3AA_82C96EDCD5CD" start="EAID_406DCE49_EA4F_4aa6_BD32_93632614BD58" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<Generalization xmi:id="EAID_DAA1840F_3F32_4a86_956C_70B806F38B9A" start="EAID_82F083DA_42A3_4d07_A10E_D0CBB81A811D" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
+					<Generalization xmi:id="EAID_DDE54F6E_927C_4aa6_A9DE_D600878A0184" start="EAID_4B4AA994_6B56_421a_80D0_CE346536A2B9" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<Generalization xmi:id="EAID_DDFD9DA4_A0FD_4feb_B02F_A6F4616B8667" start="EAID_53B59A9E_0F19_4d91_A276_C93E14F56BF8" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<Generalization xmi:id="EAID_DEE25A7F_C1D4_4311_9F74_D7999167F030" start="EAID_F4FA5525_AA4D_46bb_A4DB_AFA624268215" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
 					<Generalization xmi:id="EAID_E5DF6970_5414_4f87_B0D8_BC329006B679" start="EAID_7D67416B_0D52_49d1_BBD8_A2EE61B6F060" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
@@ -7650,9 +8500,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_8A9B11CE_AE42_4569_AC97_B7125F25083F" xmi:type="uml:Class" name="epo-not:Notice1" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1165" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1165" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:03:38" modified="2024-03-18 13:11:48" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:03:38" modified="2024-07-23 11:46:45" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7666,9 +8516,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_F5BD72AB_5FF0_48bc_9464_2B2F2DA07EF0" xmi:type="uml:Class" name="epo-not:Notice10" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1144" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1144" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:11:32" modified="2024-03-18 13:11:57" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:11:32" modified="2024-07-23 11:46:57" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7682,9 +8532,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_7C815E00_5AB7_4221_9673_417A43FCEAF3" xmi:type="uml:Class" name="epo-not:Notice11" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1145" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1145" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:12:16" modified="2024-03-18 13:11:57" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:12:16" modified="2024-07-23 11:46:57" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7698,9 +8548,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_E3E1C02A_989B_432d_9EDC_EB166766150C" xmi:type="uml:Class" name="epo-not:Notice12" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1146" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1146" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:12:28" modified="2024-03-18 13:11:57" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:12:28" modified="2024-07-23 11:46:57" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7714,9 +8564,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_2A716878_4D7B_473c_A793_4F4CB4AAA00E" xmi:type="uml:Class" name="epo-not:Notice13" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1147" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1147" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:19:47" modified="2024-03-18 13:11:57" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:19:47" modified="2024-07-23 11:46:57" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7730,9 +8580,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_B0688B55_49B2_4d49_B3A8_16E8DC1B426C" xmi:type="uml:Class" name="epo-not:Notice14" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1148" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1148" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:20:12" modified="2024-03-18 13:11:57" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:20:12" modified="2024-07-23 11:46:57" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7746,9 +8596,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_B8491411_E302_450a_8C43_283BEAED93F3" xmi:type="uml:Class" name="epo-not:Notice15" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1149" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1149" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:20:21" modified="2024-03-18 13:11:57" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:20:21" modified="2024-07-23 11:46:57" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7762,9 +8612,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_82F083DA_42A3_4d07_A10E_D0CBB81A811D" xmi:type="uml:Class" name="epo-not:Notice16" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1150" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1150" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:20:28" modified="2024-03-18 13:11:57" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:20:28" modified="2024-07-23 11:46:57" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7778,9 +8628,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_60BE7698_3371_4fef_94A7_1536255B4CDF" xmi:type="uml:Class" name="epo-not:Notice17" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1151" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1151" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:20:52" modified="2024-03-18 13:11:57" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:20:52" modified="2024-07-23 11:46:57" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7794,9 +8644,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_3FC83BCD_6B25_4180_B697_6D64E2AF9220" xmi:type="uml:Class" name="epo-not:Notice18" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1152" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1152" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:21:09" modified="2024-03-18 13:11:57" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:21:09" modified="2024-07-23 11:46:57" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7810,9 +8660,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_95A5493E_AB63_497a_B38E_96B488D39429" xmi:type="uml:Class" name="epo-not:Notice19" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1153" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1153" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:21:18" modified="2024-03-18 13:11:57" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:21:18" modified="2024-07-23 11:46:57" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7826,9 +8676,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_0D9421F2_620D_43ab_BB41_193BFE8F5B8E" xmi:type="uml:Class" name="epo-not:Notice2" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1166" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1166" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:03:43" modified="2024-03-18 13:11:48" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:03:43" modified="2024-07-23 11:46:45" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7842,9 +8692,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_459BFB03_27E6_42e5_814A_F4CDA161B12A" xmi:type="uml:Class" name="epo-not:Notice20" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1154" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1154" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:21:25" modified="2024-03-18 13:11:57" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:21:25" modified="2024-07-23 11:46:57" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7858,9 +8708,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_53A92E92_9CAF_4d77_A25C_5BE7FADB130C" xmi:type="uml:Class" name="epo-not:Notice21" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1155" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1155" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:21:34" modified="2024-03-18 13:11:57" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:21:34" modified="2024-07-23 11:46:57" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7874,9 +8724,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_1D9B79BD_930F_4444_8C1F_45A560037124" xmi:type="uml:Class" name="epo-not:Notice22" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1156" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1156" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:21:39" modified="2024-03-18 13:11:57" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:21:39" modified="2024-07-23 11:46:57" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7890,9 +8740,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_53B59A9E_0F19_4d91_A276_C93E14F56BF8" xmi:type="uml:Class" name="epo-not:Notice23" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1157" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1157" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:21:43" modified="2024-03-18 13:11:57" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:21:43" modified="2024-07-23 11:46:57" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7906,9 +8756,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_BFA7907E_8FB6_49ba_B11E_EBCC5F1EDA23" xmi:type="uml:Class" name="epo-not:Notice24" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1158" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1158" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:21:48" modified="2024-03-18 13:11:57" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:21:48" modified="2024-07-23 11:46:57" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7922,9 +8772,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_7D67416B_0D52_49d1_BBD8_A2EE61B6F060" xmi:type="uml:Class" name="epo-not:Notice25" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1176" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1176" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:16:20" modified="2024-03-18 13:12:03" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:16:20" modified="2024-07-23 11:47:04" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7938,9 +8788,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_D70EAC9A_8725_48c8_81FB_7132B8627C6A" xmi:type="uml:Class" name="epo-not:Notice26" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1177" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1177" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:16:27" modified="2024-03-18 13:12:03" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:16:27" modified="2024-07-23 11:47:04" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7954,9 +8804,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_D433A9D5_8DF2_427f_AA5C_AF579979A24B" xmi:type="uml:Class" name="epo-not:Notice27" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1178" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1178" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:16:35" modified="2024-03-18 13:12:03" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:16:35" modified="2024-07-23 11:47:04" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7970,9 +8820,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_92794986_A7F2_435b_97E1_C04AC81E72AA" xmi:type="uml:Class" name="epo-not:Notice28" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1179" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1179" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:16:43" modified="2024-03-18 13:12:03" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:16:43" modified="2024-07-23 11:47:04" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -7986,9 +8836,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_61E6D7F3_02F4_4fe3_9A81_0609FB33A070" xmi:type="uml:Class" name="epo-not:Notice29" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1181" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1181" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:22:38" modified="2024-03-18 13:12:12" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:22:38" modified="2024-07-23 11:47:14" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8002,9 +8852,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_BE2F39AF_CFBF_4b97_A258_2F777FE65124" xmi:type="uml:Class" name="epo-not:Notice3" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1167" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1167" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:03:48" modified="2024-03-18 13:11:48" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:03:48" modified="2024-07-23 11:46:45" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8018,9 +8868,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_961635DD_1E69_4907_B7A8_D2D05116023F" xmi:type="uml:Class" name="epo-not:Notice30" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1182" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1182" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:22:46" modified="2024-03-18 13:12:12" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:22:46" modified="2024-07-23 11:47:14" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8034,9 +8884,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_275E786B_A6CB_4f7d_8A46_523230F3EEE0" xmi:type="uml:Class" name="epo-not:Notice31" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1183" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1183" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:22:53" modified="2024-03-18 13:12:12" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:22:53" modified="2024-07-23 11:47:14" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8050,9 +8900,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_6019482D_1758_4997_9E94_54C4E5AD26F2" xmi:type="uml:Class" name="epo-not:Notice32" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1184" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1184" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:23:01" modified="2024-03-18 13:12:12" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:23:01" modified="2024-07-23 11:47:14" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8066,9 +8916,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_1B4364F6_9CFF_4697_9C06_ACF3001ADED8" xmi:type="uml:Class" name="epo-not:Notice33" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1185" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1185" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:23:11" modified="2024-03-18 13:12:12" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:23:11" modified="2024-07-23 11:47:14" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8082,9 +8932,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_AA33DDB3_015E_422f_9700_767D093EA6DE" xmi:type="uml:Class" name="epo-not:Notice34" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1186" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1186" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:23:29" modified="2024-03-18 13:12:12" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:23:29" modified="2024-07-23 11:47:14" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8098,9 +8948,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_BDB13855_F3DD_4561_A018_D5E4E2B01404" xmi:type="uml:Class" name="epo-not:Notice35" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1187" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1187" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:23:35" modified="2024-03-18 13:12:12" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:23:35" modified="2024-07-23 11:47:14" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8114,9 +8964,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_406DCE49_EA4F_4aa6_BD32_93632614BD58" xmi:type="uml:Class" name="epo-not:Notice36" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1188" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1188" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:23:40" modified="2024-03-18 13:12:12" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:23:40" modified="2024-07-23 11:47:14" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8130,9 +8980,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_9534CCE2_2925_49a9_8149_B4372990E2A4" xmi:type="uml:Class" name="epo-not:Notice37" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1189" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1189" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:23:45" modified="2024-03-18 13:12:12" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:23:45" modified="2024-07-23 11:47:14" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8146,9 +8996,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_84FDBA35_4628_4956_AB0B_DC9B7C2BA31E" xmi:type="uml:Class" name="epo-not:Notice38" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1160" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1160" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:52:41" modified="2024-03-18 13:12:18" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:52:41" modified="2024-07-23 11:47:20" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8162,9 +9012,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_78885FA2_A0A3_41bb_AB51_461D20C1E74E" xmi:type="uml:Class" name="epo-not:Notice39" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1161" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1161" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:52:49" modified="2024-03-18 13:12:18" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:52:49" modified="2024-07-23 11:47:20" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8178,9 +9028,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_F4FA5525_AA4D_46bb_A4DB_AFA624268215" xmi:type="uml:Class" name="epo-not:Notice4" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1168" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1168" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:03:56" modified="2024-03-18 13:11:48" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:03:56" modified="2024-07-23 11:46:45" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8194,9 +9044,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_4280D6D9_1C83_445d_B9BA_C83F761767C3" xmi:type="uml:Class" name="epo-not:Notice40" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1162" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1162" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:52:55" modified="2024-03-18 13:12:18" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 12:52:55" modified="2024-07-23 11:47:20" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8210,9 +9060,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_77B7A553_E803_4004_BBDD_E7E6A2ED7E06" xmi:type="uml:Class" name="epo-not:Notice5" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1169" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1169" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:04:03" modified="2024-03-18 13:11:48" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:04:03" modified="2024-07-23 11:46:45" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8226,9 +9076,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_64AABC7B_6677_49c0_B157_A0A97128A458" xmi:type="uml:Class" name="epo-not:Notice6" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1170" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1170" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:04:09" modified="2024-03-18 13:11:48" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:04:09" modified="2024-07-23 11:46:45" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8242,9 +9092,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_85A3677C_D922_4169_BDDC_6D4FA8F74EE4" xmi:type="uml:Class" name="epo-not:Notice7" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1171" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1171" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:04:14" modified="2024-03-18 13:11:48" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:04:14" modified="2024-07-23 11:46:45" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8258,9 +9108,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_0A917C15_D52D_40b0_AD31_1089680BFBDF" xmi:type="uml:Class" name="epo-not:Notice8" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1172" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1172" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:04:19" modified="2024-03-18 13:11:48" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:04:19" modified="2024-07-23 11:46:45" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8274,9 +9124,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_378A0219_58F3_4bbb_A19B_0E19C7D6814B" xmi:type="uml:Class" name="epo-not:Notice9" scope="public">
-				<model package="EAPK_151D85FC_A8FE_41af_A695_C90B004F875A" tpos="0" ea_localid="1173" ea_eleType="element"/>
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="1173" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:04:24" modified="2024-03-18 13:11:48" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:04:24" modified="2024-07-23 11:46:45" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8289,33 +9139,156 @@
 					<Dependency xmi:id="EAID_E24F0453_58DF_4fce_8815_666C9CD92900" start="EAID_378A0219_58F3_4bbb_A19B_0E19C7D6814B" end="EAID_89668AB6_A244_441e_B851_9289BD4E15F3"/>
 				</links>
 			</element>
-			<element xmi:idref="EAPK_6129E5F4_1A87_4a7e_A49A_C299842662DE" xmi:type="uml:Package" name="controlled vocabularies" scope="public">
-				<model package2="EAID_6129E5F4_1A87_4a7e_A49A_C299842662DE" package="EAPK_CD52EB08_1B60_47ee_B9F2_7D5904FA89A1" tpos="3" ea_localid="264" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 13:12:48" modified="2024-03-18 13:12:48" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_B6AAD0B0_AC78_46dd_A2BB_15ABCBF61F8B" xmi:type="uml:Class" name="epo-not:NoticeCEI" scope="public">
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="3641" ea_eleType="element"/>
+				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-18 13:16:16" modified="2024-07-23 11:46:57" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="eFormsNotices"/>
-				<packageproperties version="1.0" tpos="3"/>
-				<paths/>
-				<times created="2024-03-18 13:12:48" modified="2024-03-18 13:12:48"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<links>
+					<Dependency xmi:id="EAID_39D76FBC_915F_4506_BBA5_1BAA08D19F04" start="EAID_B6AAD0B0_AC78_46dd_A2BB_15ABCBF61F8B" end="EAID_64AA7AC6_F248_4162_BC6F_4434B8DC0F67"/>
+					<Generalization xmi:id="EAID_40F0FF83_FA54_4eb1_93E2_2C730C732867" start="EAID_B6AAD0B0_AC78_46dd_A2BB_15ABCBF61F8B" end="EAID_A055DBBD_DFB0_481c_8A60_5F8E32E52187"/>
+					<Generalization xmi:id="EAID_6589DF3C_F8AF_4060_9294_0DA799BDC3D9" start="EAID_B6AAD0B0_AC78_46dd_A2BB_15ABCBF61F8B" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
+					<Dependency xmi:id="EAID_70B69CB3_7E46_46fb_A6C2_A6B376E78B1B" start="EAID_B6AAD0B0_AC78_46dd_A2BB_15ABCBF61F8B" end="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC"/>
+				</links>
 			</element>
-			<element xmi:idref="EAPK_F410A1D5_B857_4503_97DC_821E366EF608" xmi:type="uml:Package" name="eFormTypes" scope="public">
-				<model package2="EAID_F410A1D5_B857_4503_97DC_821E366EF608" package="EAPK_6129E5F4_1A87_4a7e_A49A_C299842662DE" tpos="4" ea_localid="55" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-08 17:34:25" modified="2024-03-18 13:12:54" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_F0DE3A34_0F67_47af_914A_82A0C222723C" xmi:type="uml:Class" name="epo-not:NoticeE1" scope="public">
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="3638" ea_eleType="element"/>
+				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-18 13:09:39" modified="2024-07-23 11:46:45" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="controlled vocabularies"/>
-				<packageproperties version="1.0" tpos="4"/>
-				<paths/>
-				<times created="2021-12-08 17:34:25" modified="2021-12-23 14:51:13"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<links>
+					<Dependency xmi:id="EAID_23426D44_9964_443a_A184_0605456C2FEF" start="EAID_F0DE3A34_0F67_47af_914A_82A0C222723C" end="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E"/>
+					<Generalization xmi:id="EAID_251F0F6E_D0B5_4304_8962_DC4613C4041F" start="EAID_F0DE3A34_0F67_47af_914A_82A0C222723C" end="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03"/>
+					<Generalization xmi:id="EAID_CE524DE2_7EA2_4088_82A8_10147B85EC4A" start="EAID_F0DE3A34_0F67_47af_914A_82A0C222723C" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_20A35C8C_4895_4aef_AE94_63C59C948D5D" xmi:type="uml:Class" name="epo-not:NoticeE2" scope="public">
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="3639" ea_eleType="element"/>
+				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-18 13:11:26" modified="2024-07-23 11:46:45" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<links>
+					<Generalization xmi:id="EAID_093A00FE_8C02_46c0_BF3D_F4067DB0161C" start="EAID_20A35C8C_4895_4aef_AE94_63C59C948D5D" end="EAID_A31D0982_B460_4636_82B7_C2AF2C92D0B7"/>
+					<Generalization xmi:id="EAID_10DA1E5E_EB3E_4f82_AB74_84EC9AB0AF8D" start="EAID_20A35C8C_4895_4aef_AE94_63C59C948D5D" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
+					<Dependency xmi:id="EAID_F7FF5756_985F_42b8_B881_CE0D3C6C7822" start="EAID_20A35C8C_4895_4aef_AE94_63C59C948D5D" end="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_12A00248_5E3C_489e_88B4_ABEF21E72261" xmi:type="uml:Class" name="epo-not:NoticeE3" scope="public">
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="3642" ea_eleType="element"/>
+				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-18 13:18:22" modified="2024-07-23 11:46:57" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<links>
+					<Generalization xmi:id="EAID_25F1119B_B9A1_4e00_81DE_AB87104E2971" start="EAID_12A00248_5E3C_489e_88B4_ABEF21E72261" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
+					<Dependency xmi:id="EAID_7226E575_9BF3_4599_A33E_E62EFF274606" start="EAID_12A00248_5E3C_489e_88B4_ABEF21E72261" end="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC"/>
+					<Generalization xmi:id="EAID_E4877D84_62DD_4b49_93E9_B9CDDC757DFE" start="EAID_12A00248_5E3C_489e_88B4_ABEF21E72261" end="EAID_5DE4BBA5_24F3_4e6e_823C_BFF3401A979F"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_1A622AA7_D176_418b_84D4_6FB3AAC4A4F9" xmi:type="uml:Class" name="epo-not:NoticeE4" scope="public">
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="3643" ea_eleType="element"/>
+				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-18 13:20:22" modified="2024-07-23 11:47:14" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<links>
+					<Dependency xmi:id="EAID_8E5E0D60_1F11_4dc5_8F6F_6DAB4A8EF634" start="EAID_1A622AA7_D176_418b_84D4_6FB3AAC4A4F9" end="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5"/>
+					<Generalization xmi:id="EAID_CD899FA2_16BF_440c_9BBF_0C20785CB74C" start="EAID_1A622AA7_D176_418b_84D4_6FB3AAC4A4F9" end="EAID_83474E52_0601_44c6_9D61_AD99797CBD13"/>
+					<Generalization xmi:id="EAID_D150D8BA_9E5C_46d7_88B7_B524DAE70854" start="EAID_1A622AA7_D176_418b_84D4_6FB3AAC4A4F9" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_137272D3_D36E_4bc8_BB25_DB95F670222F" xmi:type="uml:Class" name="epo-not:NoticeE5" scope="public">
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="3645" ea_eleType="element"/>
+				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-18 13:22:58" modified="2024-07-23 11:47:25" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<links>
+					<Generalization xmi:id="EAID_08F5FCE9_9B75_4d80_AD87_6CDE7E017303" start="EAID_137272D3_D36E_4bc8_BB25_DB95F670222F" end="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524"/>
+					<Generalization xmi:id="EAID_AF8B2993_D45B_4d65_BCC9_641769FA2898" start="EAID_137272D3_D36E_4bc8_BB25_DB95F670222F" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
+					<NoteLink xmi:id="EAID_211F10EB_36BF_46b2_900A_DFA61A369012" start="EAID_F72A2F1B_E855_4fd5_85C1_44FFF7302FAA" end="EAID_137272D3_D36E_4bc8_BB25_DB95F670222F"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_4B4AA994_6B56_421a_80D0_CE346536A2B9" xmi:type="uml:Class" name="epo-not:NoticeT01" scope="public">
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="3640" ea_eleType="element"/>
+				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-18 13:14:04" modified="2024-07-23 11:46:45" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<links>
+					<Dependency xmi:id="EAID_09317411_46CE_4072_BBAE_0E80F1DB23E4" start="EAID_4B4AA994_6B56_421a_80D0_CE346536A2B9" end="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E"/>
+					<Dependency xmi:id="EAID_22448738_74AC_444e_AA46_30FE9C0CC404" start="EAID_4B4AA994_6B56_421a_80D0_CE346536A2B9" end="EAID_C0E81714_CC78_4bd5_B8F5_31F967E74257"/>
+					<Generalization xmi:id="EAID_C0AEC9E0_776E_47ad_B97E_C65FBB995AB7" start="EAID_4B4AA994_6B56_421a_80D0_CE346536A2B9" end="EAID_7B308DB7_0AC5_45c9_8E6F_0D46097D2C9C"/>
+					<Generalization xmi:id="EAID_DDE54F6E_927C_4aa6_A9DE_D600878A0184" start="EAID_4B4AA994_6B56_421a_80D0_CE346536A2B9" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_B93F6450_B2DC_42d5_AB43_7ACC411B4F0F" xmi:type="uml:Class" name="epo-not:NoticeT02" scope="public">
+				<model package="EAPK_7324ADCC_E7A6_4179_B3B7_BADB9E7AFDB6" tpos="0" ea_localid="3644" ea_eleType="element"/>
+				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-18 13:21:43" modified="2024-07-23 11:47:14" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<links>
+					<Dependency xmi:id="EAID_01E7319D_7EE6_4b79_94C5_251FABA00729" start="EAID_B93F6450_B2DC_42d5_AB43_7ACC411B4F0F" end="EAID_C0E81714_CC78_4bd5_B8F5_31F967E74257"/>
+					<Dependency xmi:id="EAID_092B4BA8_26FC_40e9_B172_6F9C6045CFC9" start="EAID_B93F6450_B2DC_42d5_AB43_7ACC411B4F0F" end="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5"/>
+					<Generalization xmi:id="EAID_8CD40BAD_1B19_4e5e_B3AC_E2C7CB4138B9" start="EAID_B93F6450_B2DC_42d5_AB43_7ACC411B4F0F" end="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647"/>
+					<Generalization xmi:id="EAID_FF4E869D_E24B_4c77_9DA7_6869F03D59F3" start="EAID_B93F6450_B2DC_42d5_AB43_7ACC411B4F0F" end="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1"/>
+				</links>
+			</element>
+			<element xmi:idref="EAPK_49AEE875_C0E9_48f4_807C_9A6D07EE70EB" xmi:type="uml:Package" name="controlled vocabularies" scope="public">
+				<model package2="EAID_49AEE875_C0E9_48f4_807C_9A6D07EE70EB" package="EAPK_CD52EB08_1B60_47ee_B9F2_7D5904FA89A1" tpos="3" ea_localid="253" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:47:55" modified="2024-07-23 11:47:55" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="eFormsNotices"/>
+				<packageproperties version="1.0" tpos="3"/>
+				<paths/>
+				<times created="2024-07-23 11:47:55" modified="2024-07-23 11:47:55"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+			</element>
+			<element xmi:idref="EAPK_F410A1D5_B857_4503_97DC_821E366EF608" xmi:type="uml:Package" name="eFormTypes" scope="public">
+				<model package2="EAID_F410A1D5_B857_4503_97DC_821E366EF608" package="EAPK_49AEE875_C0E9_48f4_807C_9A6D07EE70EB" tpos="4" ea_localid="55" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-08 17:34:25" modified="2024-07-23 11:47:59" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="controlled vocabularies"/>
+				<packageproperties version="1.0" tpos="4"/>
+				<paths/>
+				<times created="2021-12-08 17:34:25" modified="2021-12-23 14:51:13"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAID_615A685A_1B92_4dc4_BE13_02E5C83D1818" xmi:type="uml:Object" name="bri" scope="public" classifier="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A">
 				<model package="EAPK_F410A1D5_B857_4503_97DC_821E366EF608" tpos="0" ea_localid="3023" ea_eleType="element"/>
@@ -8370,12 +9343,14 @@
 				<extendedProperties tagged="0" package_name="eFormTypes"/>
 				<links>
 					<Realisation xmi:id="EAID_48528BAE_46A8_4718_8763_FC7CE1AE3572" start="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5" end="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A"/>
+					<Dependency xmi:id="EAID_092B4BA8_26FC_40e9_B172_6F9C6045CFC9" start="EAID_B93F6450_B2DC_42d5_AB43_7ACC411B4F0F" end="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5"/>
 					<Dependency xmi:id="EAID_3A176A7E_6EAC_4714_8B83_7E96F8F27796" start="EAID_406DCE49_EA4F_4aa6_BD32_93632614BD58" end="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5"/>
 					<Dependency xmi:id="EAID_42611760_184B_41b9_967E_E21B2767CCE7" start="EAID_1B4364F6_9CFF_4697_9C06_ACF3001ADED8" end="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5"/>
 					<Dependency xmi:id="EAID_42AA0D6A_27A6_4fc3_8C73_04DB39B171EA" start="EAID_961635DD_1E69_4907_B7A8_D2D05116023F" end="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5"/>
 					<Dependency xmi:id="EAID_45889F4C_DDD6_45a7_9578_FA3BF570A314" start="EAID_275E786B_A6CB_4f7d_8A46_523230F3EEE0" end="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5"/>
 					<Dependency xmi:id="EAID_6926B6AE_BEA0_4f27_9388_71D77D79C7B7" start="EAID_AA33DDB3_015E_422f_9700_767D093EA6DE" end="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5"/>
 					<Dependency xmi:id="EAID_85E80E5D_F364_4763_8F5D_5203FC4612DB" start="EAID_61E6D7F3_02F4_4fe3_9A81_0609FB33A070" end="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5"/>
+					<Dependency xmi:id="EAID_8E5E0D60_1F11_4dc5_8F6F_6DAB4A8EF634" start="EAID_1A622AA7_D176_418b_84D4_6FB3AAC4A4F9" end="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5"/>
 					<Dependency xmi:id="EAID_A84907C9_3C78_4400_88C7_3C5CF97F6EFF" start="EAID_BDB13855_F3DD_4561_A018_D5E4E2B01404" end="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5"/>
 					<Dependency xmi:id="EAID_F7CC5A3E_F7E9_4f76_B68A_8AE98592729E" start="EAID_9534CCE2_2925_49a9_8149_B4372990E2A4" end="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5"/>
 					<Dependency xmi:id="EAID_FE5B42CB_B903_40b0_AB95_EB7BA3114932" start="EAID_6019482D_1758_4997_9E94_54C4E5AD26F2" end="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5"/>
@@ -8415,6 +9390,8 @@
 					<Dependency xmi:id="EAID_42FCF429_74A4_44dd_BBD9_C09B9510F1FE" start="EAID_F5BD72AB_5FF0_48bc_9464_2B2F2DA07EF0" end="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC"/>
 					<Dependency xmi:id="EAID_45B5738D_C570_4834_8D2E_727F543D2A9D" start="EAID_E3E1C02A_989B_432d_9EDC_EB166766150C" end="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC"/>
 					<Dependency xmi:id="EAID_49BC96B7_CB04_420a_9BBB_86D95D89F26A" start="EAID_7C815E00_5AB7_4221_9673_417A43FCEAF3" end="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC"/>
+					<Dependency xmi:id="EAID_70B69CB3_7E46_46fb_A6C2_A6B376E78B1B" start="EAID_B6AAD0B0_AC78_46dd_A2BB_15ABCBF61F8B" end="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC"/>
+					<Dependency xmi:id="EAID_7226E575_9BF3_4599_A33E_E62EFF274606" start="EAID_12A00248_5E3C_489e_88B4_ABEF21E72261" end="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC"/>
 					<Dependency xmi:id="EAID_816FEADA_9E37_4958_91D4_3991E8968B23" start="EAID_2A716878_4D7B_473c_A793_4F4CB4AAA00E" end="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC"/>
 					<Dependency xmi:id="EAID_8F0FD8B2_F185_4e94_B2DD_947CBECD8265" start="EAID_459BFB03_27E6_42e5_814A_F4CDA161B12A" end="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC"/>
 					<Dependency xmi:id="EAID_A7D7A61A_07D4_482e_BB2D_248727FBEE52" start="EAID_B8491411_E302_450a_8C43_283BEAED93F3" end="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC"/>
@@ -8438,13 +9415,16 @@
 				<links>
 					<Realisation xmi:id="EAID_765FB2B0_AE50_45c4_9615_1F0D6407D00D" start="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" end="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A"/>
 					<Dependency xmi:id="EAID_00420D59_9F5A_4c97_A1E8_B94BF00B0FD7" start="EAID_0D9421F2_620D_43ab_BB41_193BFE8F5B8E" end="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E"/>
+					<Dependency xmi:id="EAID_09317411_46CE_4072_BBAE_0E80F1DB23E4" start="EAID_4B4AA994_6B56_421a_80D0_CE346536A2B9" end="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E"/>
 					<Dependency xmi:id="EAID_182C7BFF_7991_4a8e_AA3B_C4F232F7574F" start="EAID_BE2F39AF_CFBF_4b97_A258_2F777FE65124" end="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E"/>
+					<Dependency xmi:id="EAID_23426D44_9964_443a_A184_0605456C2FEF" start="EAID_F0DE3A34_0F67_47af_914A_82A0C222723C" end="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E"/>
 					<Dependency xmi:id="EAID_4A3E5F63_E2CC_4dde_A0D3_9DE895E13057" start="EAID_64AABC7B_6677_49c0_B157_A0A97128A458" end="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E"/>
 					<Dependency xmi:id="EAID_6C23590C_DC5E_499c_8A1F_9A3D6F23B10A" start="EAID_0A917C15_D52D_40b0_AD31_1089680BFBDF" end="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E"/>
 					<Dependency xmi:id="EAID_7861D5F9_24A5_4cdc_8C15_332EAC4B3904" start="EAID_85A3677C_D922_4169_BDDC_6D4FA8F74EE4" end="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E"/>
 					<Dependency xmi:id="EAID_BD4D35AF_F4C0_470f_B185_99AC7779C464" start="EAID_378A0219_58F3_4bbb_A19B_0E19C7D6814B" end="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E"/>
 					<Dependency xmi:id="EAID_D134E775_11C7_4793_8C65_7C72BF9EF936" start="EAID_F4FA5525_AA4D_46bb_A4DB_AFA624268215" end="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E"/>
 					<Dependency xmi:id="EAID_D6275E44_62A9_4afe_B5B5_A66923BD84D9" start="EAID_8A9B11CE_AE42_4569_AC97_B7125F25083F" end="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E"/>
+					<Dependency xmi:id="EAID_F7FF5756_985F_42b8_B881_CE0D3C6C7822" start="EAID_20A35C8C_4895_4aef_AE94_63C59C948D5D" end="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E"/>
 					<Dependency xmi:id="EAID_FB2BB349_DFDB_4132_89B8_9848E326CEF8" start="EAID_77B7A553_E803_4004_BBDD_E7E6A2ED7E06" end="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E"/>
 				</links>
 			</element>
@@ -8462,10 +9442,10 @@
 				<times created="2021-12-10 13:36:14" modified="2021-12-10 13:36:14"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
 			</element>
-			<element xmi:idref="EAPK_C8716BFF_C5FE_40c2_BF04_C2A97B06669D" xmi:type="uml:Package" name="diagrams" scope="public">
-				<model package2="EAID_C8716BFF_C5FE_40c2_BF04_C2A97B06669D" package="EAPK_F7A28F29_B6B3_4ef5_B254_66971D0FDA1E" tpos="1" ea_localid="265" ea_eleType="package"/>
+			<element xmi:idref="EAPK_CB52574B_A99F_4805_91CB_5CF174945B4A" xmi:type="uml:Package" name="diagrams" scope="public">
+				<model package2="EAID_CB52574B_A99F_4805_91CB_5CF174945B4A" package="EAPK_F7A28F29_B6B3_4ef5_B254_66971D0FDA1E" tpos="1" ea_localid="254" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 13:13:01" modified="2024-03-18 13:13:01" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:48:29" modified="2024-07-23 11:48:29" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8473,19 +9453,19 @@
 				<extendedProperties tagged="0" package_name="standardFormsNotices"/>
 				<packageproperties version="1.0" tpos="1"/>
 				<paths/>
-				<times created="2024-03-18 13:13:01" modified="2024-03-18 13:13:01"/>
+				<times created="2024-07-23 11:48:29" modified="2024-07-23 11:48:29"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAPK_3CD96646_E93F_42b0_8C0C_A8EF063DC2D6" xmi:type="uml:Package" name="phaseOrganisation" scope="public">
-				<model package2="EAID_3CD96646_E93F_42b0_8C0C_A8EF063DC2D6" package="EAPK_C8716BFF_C5FE_40c2_BF04_C2A97B06669D" tpos="0" ea_localid="85" ea_eleType="package"/>
+				<model package2="EAID_3CD96646_E93F_42b0_8C0C_A8EF063DC2D6" package="EAPK_CB52574B_A99F_4805_91CB_5CF174945B4A" tpos="3" ea_localid="85" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-17 10:42:27" modified="2024-03-18 13:13:07" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-17 10:42:27" modified="2024-07-23 11:48:48" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
-				<packageproperties version="1.0"/>
+				<packageproperties version="1.0" tpos="3"/>
 				<paths/>
 				<times created="2021-12-17 10:42:27" modified="2021-12-17 10:42:27"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
@@ -8517,15 +9497,15 @@
 				</links>
 			</element>
 			<element xmi:idref="EAPK_41758E09_5BDA_49ad_B999_154BA8DEF341" xmi:type="uml:Package" name="standardFormsDirectives" scope="public">
-				<model package2="EAID_41758E09_5BDA_49ad_B999_154BA8DEF341" package="EAPK_C8716BFF_C5FE_40c2_BF04_C2A97B06669D" tpos="3" ea_localid="80" ea_eleType="package"/>
+				<model package2="EAID_41758E09_5BDA_49ad_B999_154BA8DEF341" package="EAPK_CB52574B_A99F_4805_91CB_5CF174945B4A" tpos="4" ea_localid="80" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 11:26:08" modified="2024-03-18 13:14:05" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 11:26:08" modified="2024-07-23 11:50:15" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
-				<packageproperties version="1.0" tpos="3"/>
+				<packageproperties version="1.0" tpos="4"/>
 				<paths/>
 				<times created="2021-12-15 11:26:08" modified="2021-12-15 11:26:08"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
@@ -8627,10 +9607,10 @@
 					<NoteLink xmi:id="EAID_D1F816AC_8873_48e3_BDD1_DD7EC3E86611" start="EAID_04646C48_82A3_4f6c_878D_1A70FCD4008F" end="EAID_62BC6E77_C6D0_486d_9D7A_55EAF63E862E"/>
 				</links>
 			</element>
-			<element xmi:idref="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" xmi:type="uml:Package" name="classes" scope="public">
-				<model package2="EAID_4E7AAC15_4076_4713_9B78_4D8023F6014F" package="EAPK_F7A28F29_B6B3_4ef5_B254_66971D0FDA1E" tpos="2" ea_localid="266" ea_eleType="package"/>
+			<element xmi:idref="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" xmi:type="uml:Package" name="classes" scope="public">
+				<model package2="EAID_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" package="EAPK_F7A28F29_B6B3_4ef5_B254_66971D0FDA1E" tpos="2" ea_localid="255" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 13:13:15" modified="2024-03-18 13:13:15" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:48:38" modified="2024-07-23 11:48:38" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8638,13 +9618,13 @@
 				<extendedProperties tagged="0" package_name="standardFormsNotices"/>
 				<packageproperties version="1.0" tpos="2"/>
 				<paths/>
-				<times created="2024-03-18 13:13:15" modified="2024-03-18 13:13:15"/>
+				<times created="2024-07-23 11:48:38" modified="2024-07-23 11:48:38"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAID_72275865_220D_4dc8_A878_5A05130DFF7C" xmi:type="uml:Class" name="epo-not:CANDefence-D81" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1269" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1269" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 18:26:23" modified="2024-03-18 13:13:49" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 18:26:23" modified="2024-07-23 11:49:56" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8659,9 +9639,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_113DDCB2_9CFB_463f_B52D_593AA876BC0C" xmi:type="uml:Class" name="epo-not:CANSocial-D25" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1244" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1244" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 13:46:07" modified="2024-03-18 13:13:42" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 13:46:07" modified="2024-07-23 11:49:22" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8675,9 +9655,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_39F63CA6_7D3A_4db4_B378_92656D0F3452" xmi:type="uml:Class" name="epo-not:CANSocialNotice-D25" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1641" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1641" ea_eleType="element"/>
 				<properties documentation="Additional information:&#xA;Social and other specific services – utilities&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-03-10 17:43:51" modified="2024-03-18 13:13:42" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-03-10 17:43:51" modified="2024-07-23 11:49:22" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8691,9 +9671,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_1E3043E1_90A9_43f7_9009_1E46C1451F8D" xmi:type="uml:Class" name="epo-not:CANStandard-D24" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1232" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1232" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 12:36:06" modified="2024-03-18 13:13:32" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 12:36:06" modified="2024-07-23 11:49:03" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8707,9 +9687,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_04DF90EB_539D_4b7b_99E9_531E349C4858" xmi:type="uml:Class" name="epo-not:CNDefence-D81" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1268" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1268" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 18:25:42" modified="2024-03-18 13:13:49" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 18:25:42" modified="2024-07-23 11:49:56" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8723,9 +9703,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_610E4076_96CC_4663_B7BE_2DAD4419DD3B" xmi:type="uml:Class" name="epo-not:CNSocial-D25" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1243" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1243" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 13:45:49" modified="2024-03-18 13:13:42" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 13:45:49" modified="2024-07-23 11:49:22" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8739,9 +9719,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_48DAF146_53BF_4ad3_A51A_8B8492F6CD27" xmi:type="uml:Class" name="epo-not:CNSocialNotice-D25" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1640" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1640" ea_eleType="element"/>
 				<properties documentation="Additional information:&#xA;Social and other specific services – utilities&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-03-10 17:43:20" modified="2024-03-18 13:13:42" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-03-10 17:43:20" modified="2024-07-23 11:49:22" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8755,9 +9735,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_05BD5904_CDFC_48bf_B90A_B606950BAFBE" xmi:type="uml:Class" name="epo-not:CNStandard-D24" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1231" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1231" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 12:35:46" modified="2024-03-18 13:13:32" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 12:35:46" modified="2024-07-23 11:49:03" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8771,9 +9751,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_48E53179_7827_491f_A9A6_3150EE7A7284" xmi:type="uml:Class" name="epo-not:ConcessionAwardNotice-D23" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1262" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1262" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 17:23:09" modified="2024-03-18 13:13:23" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 17:23:09" modified="2024-07-23 11:48:55" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8787,9 +9767,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_3DC3D97F_0B9E_4e27_9517_BE6A05BD53DB" xmi:type="uml:Class" name="epo-not:ConcessionNotice-D23" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1261" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1261" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 17:22:27" modified="2024-03-18 13:13:23" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 17:22:27" modified="2024-07-23 11:48:55" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8803,9 +9783,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_F334DEFA_94CA_47a3_A7E5_1F01767DC198" xmi:type="uml:Class" name="epo-not:DesignContest-D24" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1234" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1234" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 12:54:53" modified="2024-03-18 13:13:32" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 12:54:53" modified="2024-07-23 11:49:03" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8819,9 +9799,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_2C402EC0_6FBB_4350_9A7C_7F37A654DD7C" xmi:type="uml:Class" name="epo-not:DesignContest-D25" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1247" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1247" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 13:47:56" modified="2024-03-18 13:13:42" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 13:47:56" modified="2024-07-23 11:49:22" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8835,9 +9815,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_91F9184C_163F_44b1_8DB3_AAB786CC7A7F" xmi:type="uml:Class" name="epo-not:DesignContestResult-D24" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1235" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1235" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 12:56:16" modified="2024-03-18 13:13:32" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 12:56:16" modified="2024-07-23 11:49:03" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8851,9 +9831,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_3F49209D_A4BF_4f91_AD92_25B3ECFF8CFD" xmi:type="uml:Class" name="epo-not:DesignContestResult-D25" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1248" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1248" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 13:48:07" modified="2024-03-18 13:13:42" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 13:48:07" modified="2024-07-23 11:49:22" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8867,9 +9847,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_796CCFF1_5EA3_47b3_B698_82EAB4D2DB67" xmi:type="uml:Class" name="epo-not:Modification-D23" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1259" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1259" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 17:19:53" modified="2024-03-18 13:13:23" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 17:19:53" modified="2024-07-23 11:48:55" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8883,9 +9863,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_3DB624C1_5C1E_4074_8E81_896C4B115B30" xmi:type="uml:Class" name="epo-not:Modification-D24" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1237" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1237" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 12:57:24" modified="2024-03-18 13:13:32" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 12:57:24" modified="2024-07-23 11:49:03" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8899,9 +9879,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_4E479267_0022_44b8_9544_E22EC1595786" xmi:type="uml:Class" name="epo-not:Modification-D25" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1250" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1250" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 13:48:41" modified="2024-03-18 13:13:42" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 13:48:41" modified="2024-07-23 11:49:22" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8915,9 +9895,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_9B0B1D6E_9F7E_4924_B2BD_5A43C75C8689" xmi:type="uml:Class" name="epo-not:PIN-CFCSocial-D25" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1255" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1255" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 16:51:18" modified="2024-03-18 13:13:42" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 16:51:18" modified="2024-07-23 11:49:22" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8931,9 +9911,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_429F6081_95FD_4921_BB2F_21180D41A0CE" xmi:type="uml:Class" name="epo-not:PIN-CFCSocialNotice-D25" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1251" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1251" ea_eleType="element"/>
 				<properties documentation="Additional information:&#xA;Social and other specific services – utilities&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 13:49:10" modified="2024-03-18 13:13:42" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 13:49:10" modified="2024-07-23 11:49:22" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8947,9 +9927,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_2350D8D8_DBC1_4710_A2D0_9E80046D6F70" xmi:type="uml:Class" name="epo-not:PIN-CFCStandard-D24" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1253" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1253" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 16:39:39" modified="2024-03-18 13:13:32" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 16:39:39" modified="2024-07-23 11:49:03" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8963,9 +9943,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_6D9C7E13_E718_4e10_9C31_E8824BB859C5" xmi:type="uml:Class" name="epo-not:PIN-RTL-D24" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1252" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1252" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 16:38:55" modified="2024-03-18 13:13:32" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 16:38:55" modified="2024-07-23 11:49:03" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8979,9 +9959,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_B93D8CB9_6FE5_4bba_8CDE_31AFE57E2AFD" xmi:type="uml:Class" name="epo-not:PIN-RTL-D25" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1254" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1254" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 16:50:45" modified="2024-03-18 13:13:42" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 16:50:45" modified="2024-07-23 11:49:22" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -8995,9 +9975,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_62BC6E77_C6D0_486d_9D7A_55EAF63E862E" xmi:type="uml:Class" name="epo-not:PINDefence-D81" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1267" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1267" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 18:24:49" modified="2024-03-18 13:13:49" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 18:24:49" modified="2024-07-23 11:49:56" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -9011,9 +9991,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_18BFC971_414D_4702_B2D9_9C29E3718338" xmi:type="uml:Class" name="epo-not:PINOnly-D24" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1230" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1230" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 12:35:26" modified="2024-03-18 13:13:32" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 12:35:26" modified="2024-07-23 11:49:03" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -9027,9 +10007,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_7F969C06_935A_4ea7_BDE4_22B758D2E63A" xmi:type="uml:Class" name="epo-not:PINOnly-D25" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1242" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1242" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 13:45:36" modified="2024-03-18 13:13:42" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 13:45:36" modified="2024-07-23 11:49:22" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -9043,9 +10023,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_1010223C_B7B3_47b5_B282_08232B08A26D" xmi:type="uml:Class" name="epo-not:PINProfile-D24" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1233" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1233" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 12:54:23" modified="2024-03-18 13:13:32" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 12:54:23" modified="2024-07-23 11:49:04" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -9059,9 +10039,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_541A016F_93DF_45bb_A808_CF288F788802" xmi:type="uml:Class" name="epo-not:PINProfile-D25" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1246" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1246" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 13:47:05" modified="2024-03-18 13:13:42" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 13:47:05" modified="2024-07-23 11:49:22" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -9075,9 +10055,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_773D1D42_CB4D_4511_97CB_BF374C076D5D" xmi:type="uml:Class" name="epo-not:PINProfile-D81" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1265" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1265" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 18:24:09" modified="2024-03-18 13:13:49" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 18:24:09" modified="2024-07-23 11:49:56" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -9091,9 +10071,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_05D6E861_2F0F_4162_AAAF_CAD5AA908468" xmi:type="uml:Class" name="epo-not:QS-D25" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1245" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1245" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 13:46:31" modified="2024-03-18 13:13:42" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 13:46:31" modified="2024-07-23 11:49:22" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -9107,9 +10087,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_2FB3CA69_C603_4109_8EC9_08A64BFE6FAE" xmi:type="uml:Class" name="epo-not:QSNotice-D25" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1639" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1639" ea_eleType="element"/>
 				<properties documentation="Additional information:&#xA;Social and other specific services – utilities&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-03-10 17:42:38" modified="2024-03-18 13:13:42" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-03-10 17:42:38" modified="2024-07-23 11:49:22" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -9123,9 +10103,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_1F07BD1C_0323_4222_BBB8_D6BFEE65BD54" xmi:type="uml:Class" name="epo-not:SocialAndOtherSpecificServices-D23" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1260" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1260" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 17:20:17" modified="2024-03-18 13:13:23" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 17:20:17" modified="2024-07-23 11:48:55" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -9139,9 +10119,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_FF3BC849_1B47_4c67_A4AD_CE8A93197154" xmi:type="uml:Class" name="epo-not:SocialAndOtherSpecificServices-D24" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1238" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1238" ea_eleType="element"/>
 				<properties documentation="public contracts" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 12:57:53" modified="2024-03-18 13:13:32" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 12:57:53" modified="2024-07-23 11:49:04" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -9155,9 +10135,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_5321A697_558C_4b3b_B049_4B01BA23BD53" xmi:type="uml:Class" name="epo-not:StandardFormsNotice" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1278" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1278" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-17 11:08:58" modified="2024-03-18 13:14:00" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-17 11:08:58" modified="2024-07-23 11:50:09" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -9204,9 +10184,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_BAF3F1B7_C07A_4162_B103_FE254A08620D" xmi:type="uml:Class" name="epo-not:Subcontract-D81" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1270" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1270" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 18:28:40" modified="2024-03-18 13:13:49" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 18:28:40" modified="2024-07-23 11:49:56" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -9220,9 +10200,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_D3BEE2B3_D288_4eac_98E2_38DA92F1E0AF" xmi:type="uml:Class" name="epo-not:VEAT-D23" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1258" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1258" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 17:19:39" modified="2024-03-18 13:13:23" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 17:19:39" modified="2024-07-23 11:48:55" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -9236,9 +10216,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_70256FFA_F8BB_40b5_A604_FC6B5A80079C" xmi:type="uml:Class" name="epo-not:VEAT-D24" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1236" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1236" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 12:57:05" modified="2024-03-18 13:13:32" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 12:57:05" modified="2024-07-23 11:49:04" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -9252,9 +10232,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_B6704C38_06AD_4a1b_A15C_7998FF2E40C1" xmi:type="uml:Class" name="epo-not:VEAT-D25" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1249" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1249" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 13:48:31" modified="2024-03-18 13:13:42" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 13:48:31" modified="2024-07-23 11:49:22" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -9268,9 +10248,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_3AD7C381_B519_40f0_B5AA_C5F5A46D503B" xmi:type="uml:Class" name="epo-not:VEAT-D81" scope="public">
-				<model package="EAPK_4E7AAC15_4076_4713_9B78_4D8023F6014F" tpos="0" ea_localid="1266" ea_eleType="element"/>
+				<model package="EAPK_A75C7E9F_EBE1_4493_88C0_F0E6DD4D249A" tpos="0" ea_localid="1266" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 18:24:26" modified="2024-03-18 13:13:49" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-15 18:24:26" modified="2024-07-23 11:49:56" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -9283,10 +10263,10 @@
 					<Generalization xmi:id="EAID_45376445_33F2_4666_A6E4_331FD5549ACD" start="EAID_3AD7C381_B519_40f0_B5AA_C5F5A46D503B" end="EAID_5321A697_558C_4b3b_B049_4B01BA23BD53"/>
 				</links>
 			</element>
-			<element xmi:idref="EAPK_44FA1B9F_512D_4707_A498_D5A3C1BB479E" xmi:type="uml:Package" name="controlled vocabularies" scope="public">
-				<model package2="EAID_44FA1B9F_512D_4707_A498_D5A3C1BB479E" package="EAPK_F7A28F29_B6B3_4ef5_B254_66971D0FDA1E" tpos="3" ea_localid="267" ea_eleType="package"/>
+			<element xmi:idref="EAPK_C5F44697_4600_4fa0_86E3_0E2AB9267396" xmi:type="uml:Package" name="controlled vocabularies" scope="public">
+				<model package2="EAID_C5F44697_4600_4fa0_86E3_0E2AB9267396" package="EAPK_F7A28F29_B6B3_4ef5_B254_66971D0FDA1E" tpos="3" ea_localid="256" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 13:14:15" modified="2024-03-18 13:14:15" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:50:25" modified="2024-07-23 11:50:25" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -9294,13 +10274,13 @@
 				<extendedProperties tagged="0" package_name="standardFormsNotices"/>
 				<packageproperties version="1.0" tpos="3"/>
 				<paths/>
-				<times created="2024-03-18 13:14:15" modified="2024-03-18 13:14:15"/>
+				<times created="2024-07-23 11:50:25" modified="2024-07-23 11:50:25"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAPK_713AE691_88C4_408b_8D74_DE4AA0F299D0" xmi:type="uml:Package" name="standardFormTypes" scope="public">
-				<model package2="EAID_713AE691_88C4_408b_8D74_DE4AA0F299D0" package="EAPK_44FA1B9F_512D_4707_A498_D5A3C1BB479E" tpos="4" ea_localid="78" ea_eleType="package"/>
+				<model package2="EAID_713AE691_88C4_408b_8D74_DE4AA0F299D0" package="EAPK_C5F44697_4600_4fa0_86E3_0E2AB9267396" tpos="4" ea_localid="78" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:36:47" modified="2024-03-18 13:14:23" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-10 13:36:47" modified="2024-07-23 11:50:29" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -9787,42 +10767,42 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F68B7543_9FB7_4a53_A12D_3B9DB56D9AD2">
-				<source xmi:idref="EAID_6B960963_83B6_4496_956C_AC7B8E5E9891">
-					<model ea_localid="2071" type="ProxyConnector" name="ProxyConnector"/>
-					<role visibility="Public"/>
-					<type aggregation="none"/>
+			<connector xmi:idref="EAID_C56014E3_B90C_4023_BFE9_EFC9B42720F4">
+				<source xmi:idref="EAID_08C84AC0_E262_46e1_9EC6_644AFF8D9561">
+					<model ea_localid="3670" type="ProxyConnector" name="ProxyConnector"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="AllowDuplicates=0;Derived=0;Union=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_47C8E7DE_AC4A_4d3a_B612_6364BFB42020">
-					<model ea_localid="2075" type="ProxyConnector" name="ProxyConnector"/>
-					<role visibility="Public"/>
-					<type aggregation="none"/>
+				<target xmi:idref="EAID_17272E7E_FAA6_4f11_BBB3_457706068099">
+					<model ea_localid="3671" type="ProxyConnector" name="ProxyConnector"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="AllowDuplicates=0;Derived=0;Union=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3340"/>
+				<model ea_localid="5495"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels/>
-				<extendedProperties/>
+				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_36806876_C16C_4dc1_BD29_58E4B7187783">
-				<source xmi:idref="EAID_5AE64A69_B9E1_4007_8268_679A87B91611">
-					<model ea_localid="1279" type="Note"/>
+			<connector xmi:idref="EAID_87A13B98_6E29_4694_AA8F_DE5A3705B3A2">
+				<source xmi:idref="EAID_39DBC436_506A_46a4_9670_9A00EC98EC62">
+					<model ea_localid="3666" type="ProxyConnector" name="ProxyConnector"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -9832,8 +10812,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_C07688A9_AAC8_4f60_A2CC_FA90C006C282">
-					<model ea_localid="1096" type="Enumeration" name="at-voc:notice-type"/>
+				<target xmi:idref="EAID_8944D0F2_D657_4ce9_B2E9_DEBFBA9394DE">
+					<model ea_localid="3667" type="ProxyConnector" name="ProxyConnector"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -9843,9 +10823,8 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2104"/>
-				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="5493"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels/>
@@ -9854,9 +10833,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_72F9467C_3D0D_4b12_8FA6_A01D070F8819">
-				<source xmi:idref="EAID_AC8CC935_389B_479b_B0EA_B6FB8B5C8EB6">
-					<model ea_localid="1784" type="ProxyConnector" name="ProxyConnector"/>
+			<connector xmi:idref="EAID_8B06B92A_4560_49c7_9EFF_FF8FC578D4D1">
+				<source xmi:idref="EAID_3CA58BCF_C8DB_4609_9044_CFAA473152BE">
+					<model ea_localid="3674" type="ProxyConnector" name="ProxyConnector"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -9866,8 +10845,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_6288458C_4439_46bc_A898_C99A5E4A62D6">
-					<model ea_localid="1785" type="ProxyConnector" name="ProxyConnector"/>
+				<target xmi:idref="EAID_D51DF83F_EDA1_4cfa_94A2_34A940C86AB6">
+					<model ea_localid="3675" type="ProxyConnector" name="ProxyConnector"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -9877,7 +10856,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2993"/>
+				<model ea_localid="5497"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
@@ -9887,9 +10866,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_E00978F6_EFF6_47d8_84D3_E0EDCB7DC006">
-				<source xmi:idref="EAID_7BE947BB_A71B_4e7a_AA2B_BE7308712695">
-					<model ea_localid="1391" type="Note"/>
+			<connector xmi:idref="EAID_CFE865BE_F277_4169_ABC1_9D68D997C916">
+				<source xmi:idref="EAID_E6FB12CB_F678_4ec8_98CD_608C5E762EE9">
+					<model ea_localid="3662" type="ProxyConnector" name="ProxyConnector"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -9899,8 +10878,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B">
-					<model ea_localid="1074" type="Class" name="epo-not:PlanningNotice"/>
+				<target xmi:idref="EAID_44910AF1_0738_4bac_B8E3_2BC8677D2EC1">
+					<model ea_localid="3663" type="ProxyConnector" name="ProxyConnector"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -9910,9 +10889,8 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2345"/>
-				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="5491"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels/>
@@ -9921,43 +10899,42 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_6070C1A3_A5F5_4b53_9AAE_48C9E1FDC23C">
-				<source xmi:idref="EAID_8633DF60_DBCB_4ca7_AA83_B82252A1F6D6">
-					<model ea_localid="1280" type="Note"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+			<connector xmi:idref="EAID_F68B7543_9FB7_4a53_A12D_3B9DB56D9AD2">
+				<source xmi:idref="EAID_6B960963_83B6_4496_956C_AC7B8E5E9891">
+					<model ea_localid="2071" type="ProxyConnector" name="ProxyConnector"/>
+					<role visibility="Public"/>
+					<type aggregation="none"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="AllowDuplicates=0;Derived=0;Union=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A">
-					<model ea_localid="1006" type="Enumeration" name="at-voc:form-type"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_47C8E7DE_AC4A_4d3a_B612_6364BFB42020">
+					<model ea_localid="2075" type="ProxyConnector" name="ProxyConnector"/>
+					<role visibility="Public"/>
+					<type aggregation="none"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="AllowDuplicates=0;Derived=0;Union=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2105"/>
-				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3340"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels/>
-				<extendedProperties virtualInheritance="0"/>
+				<extendedProperties/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_8A689597_C8A3_475b_AD2A_EA61AB152656">
-				<source xmi:idref="EAID_A7E3EEA1_BBD5_409a_9717_8E5FF181CF7E">
-					<model ea_localid="2983" type="Note"/>
+			<connector xmi:idref="EAID_90E37548_02F8_4227_8C75_04FFB21501B2">
+				<source xmi:idref="EAID_E47E3B9A_672A_4b82_BA0F_A1B9C0D14B8E">
+					<model ea_localid="3664" type="ProxyConnector" name="ProxyConnector"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -9967,8 +10944,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A">
-					<model ea_localid="917" type="Class" name="epo:PlannedProcurementPart"/>
+				<target xmi:idref="EAID_4A97DCFA_BAC8_4f54_BADE_E2E47352BDD6">
+					<model ea_localid="3665" type="ProxyConnector" name="ProxyConnector"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -9978,9 +10955,8 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4560"/>
-				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="5492"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels/>
@@ -9989,9 +10965,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_19D21EDF_4A27_44be_96F5_5066D75785F4">
-				<source xmi:idref="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1">
-					<model ea_localid="1130" type="Class" name="epo-not:CANSocialNotice"/>
+			<connector xmi:idref="EAID_A70D66E1_34C3_4d44_949F_426C768D6C8B">
+				<source xmi:idref="EAID_E65922A8_EFDF_48e3_B6C2_16B9FF224BE8">
+					<model ea_localid="3660" type="ProxyConnector" name="ProxyConnector"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -10001,8 +10977,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2">
-					<model ea_localid="1077" type="Class" name="epo-not:ResultNotice"/>
+				<target xmi:idref="EAID_5046F705_8CB4_4b61_9F99_4575710393BB">
+					<model ea_localid="3661" type="ProxyConnector" name="ProxyConnector"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -10012,9 +10988,8 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1838"/>
+				<model ea_localid="5490"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels/>
@@ -10023,42 +10998,43 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_2D938066_2305_4e4e_8DB1_BF836E5B5466">
-				<source xmi:idref="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1">
-					<model ea_localid="1130" type="Class" name="epo-not:CANSocialNotice"/>
+			<connector xmi:idref="EAID_36806876_C16C_4dc1_BD29_58E4B7187783">
+				<source xmi:idref="EAID_5AE64A69_B9E1_4007_8268_679A87B91611">
+					<model ea_localid="1279" type="Note"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_6848E7DC_0D07_4ab1_AF37_52AE370DCFEF">
-					<model ea_localid="1101" type="Object" name="can-social"/>
-					<role name="epo:hasNoticeType" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_C07688A9_AAC8_4f60_A2CC_FA90C006C282">
+					<model ea_localid="1096" type="Enumeration" name="at-voc:notice-type"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1841"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="2104"/>
+				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:hasNoticeType"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_2470BB20_3107_4023_9A95_1F387AB2B926">
-				<source xmi:idref="EAID_1B4364F6_9CFF_4697_9C06_ACF3001ADED8">
-					<model ea_localid="1185" type="Class" name="epo-not:Notice33"/>
+			<connector xmi:idref="EAID_72F9467C_3D0D_4b12_8FA6_A01D070F8819">
+				<source xmi:idref="EAID_AC8CC935_389B_479b_B0EA_B6FB8B5C8EB6">
+					<model ea_localid="1784" type="ProxyConnector" name="ProxyConnector"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -10068,8 +11044,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1">
-					<model ea_localid="1130" type="Class" name="epo-not:CANSocialNotice"/>
+				<target xmi:idref="EAID_6288458C_4439_46bc_A898_C99A5E4A62D6">
+					<model ea_localid="1785" type="ProxyConnector" name="ProxyConnector"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -10079,9 +11055,8 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1919"/>
+				<model ea_localid="2993"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels/>
@@ -10090,9 +11065,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_3985F1FE_6224_4301_BBE6_A6EDF1CECF51">
-				<source xmi:idref="EAID_113DDCB2_9CFB_463f_B52D_593AA876BC0C">
-					<model ea_localid="1244" type="Class" name="epo-not:CANSocial-D25"/>
+			<connector xmi:idref="EAID_73A6FC03_1825_4ec1_A784_BF1C55F72910">
+				<source xmi:idref="EAID_70B80546_7629_40c6_9316_F91D7B17B474">
+					<model ea_localid="3678" type="ProxyConnector" name="ProxyConnector"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -10102,8 +11077,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1">
-					<model ea_localid="1130" type="Class" name="epo-not:CANSocialNotice"/>
+				<target xmi:idref="EAID_E8E280AD_7469_4b14_ABEA_60317F90ACC4">
+					<model ea_localid="3679" type="ProxyConnector" name="ProxyConnector"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -10113,9 +11088,8 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2090"/>
+				<model ea_localid="5499"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels/>
@@ -10124,9 +11098,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_3E955EE8_380D_40d3_A11F_7EEDF94928AC">
-				<source xmi:idref="EAID_BDB13855_F3DD_4561_A018_D5E4E2B01404">
-					<model ea_localid="1187" type="Class" name="epo-not:Notice35"/>
+			<connector xmi:idref="EAID_D85B5D9D_A0A9_4ed4_B03A_DD6F59C0BCAC">
+				<source xmi:idref="EAID_A854A4CB_76B3_4887_9781_EB2D19B4D00D">
+					<model ea_localid="3668" type="ProxyConnector" name="ProxyConnector"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -10136,8 +11110,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1">
-					<model ea_localid="1130" type="Class" name="epo-not:CANSocialNotice"/>
+				<target xmi:idref="EAID_74DCC56E_7AA8_41a1_80A0_62B66243936F">
+					<model ea_localid="3669" type="ProxyConnector" name="ProxyConnector"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -10147,9 +11121,8 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1921"/>
+				<model ea_localid="5494"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels/>
@@ -10158,9 +11131,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_52CC333D_FE06_4af4_AEA3_4DBE039892DA">
-				<source xmi:idref="EAID_39F63CA6_7D3A_4db4_B378_92656D0F3452">
-					<model ea_localid="1641" type="Class" name="epo-not:CANSocialNotice-D25"/>
+			<connector xmi:idref="EAID_E00978F6_EFF6_47d8_84D3_E0EDCB7DC006">
+				<source xmi:idref="EAID_7BE947BB_A71B_4e7a_AA2B_BE7308712695">
+					<model ea_localid="1391" type="Note"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -10170,8 +11143,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1">
-					<model ea_localid="1130" type="Class" name="epo-not:CANSocialNotice"/>
+				<target xmi:idref="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B">
+					<model ea_localid="1074" type="Class" name="epo-not:PlanningNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -10181,9 +11154,9 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2766"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
+				<model ea_localid="2345"/>
+				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels/>
@@ -10192,9 +11165,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_6B05B709_B9D0_446e_ADF9_6954786BECD9">
-				<source xmi:idref="EAID_AA33DDB3_015E_422f_9700_767D093EA6DE">
-					<model ea_localid="1186" type="Class" name="epo-not:Notice34"/>
+			<connector xmi:idref="EAID_6070C1A3_A5F5_4b53_9AAE_48C9E1FDC23C">
+				<source xmi:idref="EAID_8633DF60_DBCB_4ca7_AA83_B82252A1F6D6">
+					<model ea_localid="1280" type="Note"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -10204,8 +11177,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1">
-					<model ea_localid="1130" type="Class" name="epo-not:CANSocialNotice"/>
+				<target xmi:idref="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A">
+					<model ea_localid="1006" type="Enumeration" name="at-voc:form-type"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -10215,9 +11188,380 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1920"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
+				<model ea_localid="2105"/>
+				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_71F00BB4_9962_4462_99B5_9349107595CF">
+				<source xmi:idref="EAID_D5AE1A66_594D_488f_AFDF_6C8C5D111A0F">
+					<model ea_localid="3676" type="ProxyConnector" name="ProxyConnector"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_9680588B_831E_4f03_8AD7_7E2899D2520E">
+					<model ea_localid="3677" type="ProxyConnector" name="ProxyConnector"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5498"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_4033C88B_B08F_4630_93FD_457E67FB5F58">
+				<source xmi:idref="EAID_A08BABBB_DF17_46af_8086_EFFD7222CAFF">
+					<model ea_localid="3672" type="ProxyConnector" name="ProxyConnector"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_D08F9431_D68C_497b_BC8C_B22259E469A9">
+					<model ea_localid="3673" type="ProxyConnector" name="ProxyConnector"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5496"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_8A689597_C8A3_475b_AD2A_EA61AB152656">
+				<source xmi:idref="EAID_A7E3EEA1_BBD5_409a_9717_8E5FF181CF7E">
+					<model ea_localid="2983" type="Note"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A">
+					<model ea_localid="917" type="Class" name="epo:PlannedProcurementPart"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4560"/>
+				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_19D21EDF_4A27_44be_96F5_5066D75785F4">
+				<source xmi:idref="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1">
+					<model ea_localid="1130" type="Class" name="epo-not:CANSocialNotice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2">
+					<model ea_localid="1077" type="Class" name="epo-not:ResultNotice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="1838"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_2D938066_2305_4e4e_8DB1_BF836E5B5466">
+				<source xmi:idref="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1">
+					<model ea_localid="1130" type="Class" name="epo-not:CANSocialNotice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_6848E7DC_0D07_4ab1_AF37_52AE370DCFEF">
+					<model ea_localid="1101" type="Object" name="can-social"/>
+					<role name="epo:hasNoticeType" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="1841"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo:hasNoticeType"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_2470BB20_3107_4023_9A95_1F387AB2B926">
+				<source xmi:idref="EAID_1B4364F6_9CFF_4697_9C06_ACF3001ADED8">
+					<model ea_localid="1185" type="Class" name="epo-not:Notice33"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1">
+					<model ea_localid="1130" type="Class" name="epo-not:CANSocialNotice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="1919"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_3985F1FE_6224_4301_BBE6_A6EDF1CECF51">
+				<source xmi:idref="EAID_113DDCB2_9CFB_463f_B52D_593AA876BC0C">
+					<model ea_localid="1244" type="Class" name="epo-not:CANSocial-D25"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1">
+					<model ea_localid="1130" type="Class" name="epo-not:CANSocialNotice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="2090"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_3E955EE8_380D_40d3_A11F_7EEDF94928AC">
+				<source xmi:idref="EAID_BDB13855_F3DD_4561_A018_D5E4E2B01404">
+					<model ea_localid="1187" type="Class" name="epo-not:Notice35"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1">
+					<model ea_localid="1130" type="Class" name="epo-not:CANSocialNotice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="1921"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_52CC333D_FE06_4af4_AEA3_4DBE039892DA">
+				<source xmi:idref="EAID_39F63CA6_7D3A_4db4_B378_92656D0F3452">
+					<model ea_localid="1641" type="Class" name="epo-not:CANSocialNotice-D25"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1">
+					<model ea_localid="1130" type="Class" name="epo-not:CANSocialNotice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="2766"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_6B05B709_B9D0_446e_ADF9_6954786BECD9">
+				<source xmi:idref="EAID_AA33DDB3_015E_422f_9700_767D093EA6DE">
+					<model ea_localid="1186" type="Class" name="epo-not:Notice34"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1">
+					<model ea_localid="1130" type="Class" name="epo-not:CANSocialNotice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="1920"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_FF4E869D_E24B_4c77_9DA7_6869F03D59F3">
+				<source xmi:idref="EAID_B93F6450_B2DC_42d5_AB43_7ACC411B4F0F">
+					<model ea_localid="3644" type="Class" name="epo-not:NoticeT02"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1">
+					<model ea_localid="1130" type="Class" name="epo-not:CANSocialNotice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5461"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels/>
@@ -10429,6 +11773,40 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_CD899FA2_16BF_440c_9BBF_0C20785CB74C">
+				<source xmi:idref="EAID_1A622AA7_D176_418b_84D4_6FB3AAC4A4F9">
+					<model ea_localid="3643" type="Class" name="epo-not:NoticeE4"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_83474E52_0601_44c6_9D61_AD99797CBD13">
+					<model ea_localid="1129" type="Class" name="epo-not:CANStandardNotice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5459"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_D60668CB_4565_4f10_8EA3_14B93254E757">
 				<source xmi:idref="EAID_61E6D7F3_02F4_4fe3_9A81_0609FB33A070">
 					<model ea_localid="1181" type="Class" name="epo-not:Notice29"/>
@@ -10903,6 +12281,40 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_E4877D84_62DD_4b49_93E9_B9CDDC757DFE">
+				<source xmi:idref="EAID_12A00248_5E3C_489e_88B4_ABEF21E72261">
+					<model ea_localid="3642" type="Class" name="epo-not:NoticeE3"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_5DE4BBA5_24F3_4e6e_823C_BFF3401A979F">
+					<model ea_localid="1124" type="Class" name="epo-not:CNStandardNotice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5457"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_55B64699_B98C_49f8_AAA8_01BAEEF0DD49">
 				<source xmi:idref="EAID_17662AEF_1321_446a_AE42_0583F7417A79">
 					<model ea_localid="1075" type="Class" name="epo-not:CompetitionNotice"/>
@@ -11664,6 +13076,40 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_08F5FCE9_9B75_4d80_AD87_6CDE7E017303">
+				<source xmi:idref="EAID_137272D3_D36E_4bc8_BB25_DB95F670222F">
+					<model ea_localid="3645" type="Class" name="epo-not:NoticeE5"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524">
+					<model ea_localid="1079" type="Class" name="epo-not:CompletionNotice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5463"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_05C9AA43_1AE1_4dbd_8080_CCC8C1824CB7">
 				<source xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257">
 					<model ea_localid="1078" type="Class" name="epo-not:ContractModificationNotice"/>
@@ -13275,6 +14721,40 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_40F0FF83_FA54_4eb1_93E2_2C730C732867">
+				<source xmi:idref="EAID_B6AAD0B0_AC78_46dd_A2BB_15ABCBF61F8B">
+					<model ea_localid="3641" type="Class" name="epo-not:NoticeCEI"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_A055DBBD_DFB0_481c_8A60_5F8E32E52187">
+					<model ea_localid="1121" type="Class" name="epo-not:PIN-CFCStandardNotice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5455"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_76F210FA_5489_47b7_8FD9_2F861B44B724">
 				<source xmi:idref="EAID_7C815E00_5AB7_4221_9673_417A43FCEAF3">
 					<model ea_localid="1145" type="Class" name="epo-not:Notice11"/>
@@ -13410,6 +14890,40 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_093A00FE_8C02_46c0_BF3D_F4067DB0161C">
+				<source xmi:idref="EAID_20A35C8C_4895_4aef_AE94_63C59C948D5D">
+					<model ea_localid="3639" type="Class" name="epo-not:NoticeE2"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_A31D0982_B460_4636_82B7_C2AF2C92D0B7">
+					<model ea_localid="1092" type="Class" name="epo-not:PINOnlyNotice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5451"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_4D75816A_997C_42ba_AC94_51FB591352A8">
 				<source xmi:idref="EAID_F4FA5525_AA4D_46bb_A4DB_AFA624268215">
 					<model ea_localid="1168" type="Class" name="epo-not:Notice4"/>
@@ -14020,6 +15534,40 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_C0AEC9E0_776E_47ad_B97E_C65FBB995AB7">
+				<source xmi:idref="EAID_4B4AA994_6B56_421a_80D0_CE346536A2B9">
+					<model ea_localid="3640" type="Class" name="epo-not:NoticeT01"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_7B308DB7_0AC5_45c9_8E6F_0D46097D2C9C">
+					<model ea_localid="1093" type="Class" name="epo-not:PINTimeLimitNotice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5453"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_DE1E6E6D_F92C_4af1_B5E3_EDE10941DF91">
 				<source xmi:idref="EAID_85A3677C_D922_4169_BDDC_6D4FA8F74EE4">
 					<model ea_localid="1171" type="Class" name="epo-not:Notice7"/>
@@ -14226,7 +15774,7 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_5217DA2B_F336_4793_85E1_6829959E93BB">
+			<connector xmi:idref="EAID_A1DC6D24_EABE_467c_80DC_91F8A4D3F0DE">
 				<source xmi:idref="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03">
 					<model ea_localid="3078" type="Class" name="epo-not:PreMarketConsultationNotice"/>
 					<role visibility="Public" targetScope="instance"/>
@@ -14249,7 +15797,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4725"/>
+				<model ea_localid="5448"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -14272,22 +15820,56 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_53C53D83_424B_4038_AF6F_5B9C6F71226D">
-					<model ea_localid="1982" type="Object" name="pmc"/>
-					<role name="epo:hasNoticeType" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_53C53D83_424B_4038_AF6F_5B9C6F71226D">
+					<model ea_localid="1982" type="Object" name="pmc"/>
+					<role name="epo:hasNoticeType" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3232"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo:hasNoticeType"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_251F0F6E_D0B5_4304_8962_DC4613C4041F">
+				<source xmi:idref="EAID_F0DE3A34_0F67_47af_914A_82A0C222723C">
+					<model ea_localid="3638" type="Class" name="epo-not:NoticeE1"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03">
+					<model ea_localid="3078" type="Class" name="epo-not:PreMarketConsultationNotice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3232"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="5449"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:hasNoticeType"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -15898,6 +17480,173 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_3452502E_9900_4175_9794_D484025607E7">
+				<source xmi:idref="EAID_C0E81714_CC78_4bd5_B8F5_31F967E74257">
+					<model ea_localid="3651" type="Object" name="Regulation 1370"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66">
+					<model ea_localid="977" type="Enumeration" name="at-voc:legal-basis"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5479"/>
+				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_01E7319D_7EE6_4b79_94C5_251FABA00729">
+				<source xmi:idref="EAID_B93F6450_B2DC_42d5_AB43_7ACC411B4F0F">
+					<model ea_localid="3644" type="Class" name="epo-not:NoticeT02"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_C0E81714_CC78_4bd5_B8F5_31F967E74257">
+					<model ea_localid="3651" type="Object" name="Regulation 1370"/>
+					<role name="epo:hasLegalBasis" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5482"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:hasLegalBasis"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_22448738_74AC_444e_AA46_30FE9C0CC404">
+				<source xmi:idref="EAID_4B4AA994_6B56_421a_80D0_CE346536A2B9">
+					<model ea_localid="3640" type="Class" name="epo-not:NoticeT01"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_C0E81714_CC78_4bd5_B8F5_31F967E74257">
+					<model ea_localid="3651" type="Object" name="Regulation 1370"/>
+					<role name="epo:hasLegalBasis" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5480"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:hasLegalBasis"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_4F2CCAB3_E0D4_434a_869E_D874CC918E17">
+				<source xmi:idref="EAID_64AA7AC6_F248_4162_BC6F_4434B8DC0F67">
+					<model ea_localid="3650" type="Object" name="Regulation 1046"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66">
+					<model ea_localid="977" type="Enumeration" name="at-voc:legal-basis"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5478"/>
+				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_39D76FBC_915F_4506_BBA5_1BAA08D19F04">
+				<source xmi:idref="EAID_B6AAD0B0_AC78_46dd_A2BB_15ABCBF61F8B">
+					<model ea_localid="3641" type="Class" name="epo-not:NoticeCEI"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_64AA7AC6_F248_4162_BC6F_4434B8DC0F67">
+					<model ea_localid="3650" type="Object" name="Regulation 1046"/>
+					<role name="epo:hasLegalBasis" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5481"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:hasLegalBasis"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_D3C680D4_3CB0_40f5_9D98_ED0E9C28B950">
 				<source xmi:idref="EAID_6C334A58_89F2_4d3e_98F6_902667A49E71">
 					<model ea_localid="1277" type="Object" name="(EU) 2019/1780"/>
@@ -18610,108 +20359,210 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_CBCE3552_B146_4279_A4B9_A66D475D4D8C">
-				<source xmi:idref="EAID_92794986_A7F2_435b_97E1_C04AC81E72AA">
-					<model ea_localid="1179" type="Class" name="epo-not:Notice28"/>
+			<connector xmi:idref="EAID_CBCE3552_B146_4279_A4B9_A66D475D4D8C">
+				<source xmi:idref="EAID_92794986_A7F2_435b_97E1_C04AC81E72AA">
+					<model ea_localid="1179" type="Class" name="epo-not:Notice28"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_8E4FF705_88E9_4b3e_A98F_ACC159CC13C2">
+					<model ea_localid="1113" type="Object" name="Directive 23"/>
+					<role name="epo:hasLegalBasis" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="1914"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:hasLegalBasis"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_D9EAF265_1622_466d_94E4_FBEFCDDD2599">
+				<source xmi:idref="EAID_1F07BD1C_0323_4222_BBB8_D6BFEE65BD54">
+					<model ea_localid="1260" type="Class" name="epo-not:SocialAndOtherSpecificServices-D23"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_8E4FF705_88E9_4b3e_A98F_ACC159CC13C2">
+					<model ea_localid="1113" type="Object" name="Directive 23"/>
+					<role name="epo:hasLegalBasis" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="2049"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:hasLegalBasis"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_FA228CBB_BF55_48ad_AB67_DC0C864CEE43">
+				<source xmi:idref="EAID_B0688B55_49B2_4d49_B3A8_16E8DC1B426C">
+					<model ea_localid="1148" type="Class" name="epo-not:Notice14"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_8E4FF705_88E9_4b3e_A98F_ACC159CC13C2">
+					<model ea_localid="1113" type="Object" name="Directive 23"/>
+					<role name="epo:hasLegalBasis" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="1863"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:hasLegalBasis"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_211F10EB_36BF_46b2_900A_DFA61A369012">
+				<source xmi:idref="EAID_F72A2F1B_E855_4fd5_85C1_44FFF7302FAA">
+					<model ea_localid="3646" type="Note"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_8E4FF705_88E9_4b3e_A98F_ACC159CC13C2">
-					<model ea_localid="1113" type="Object" name="Directive 23"/>
-					<role name="epo:hasLegalBasis" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_137272D3_D36E_4bc8_BB25_DB95F670222F">
+					<model ea_localid="3645" type="Class" name="epo-not:NoticeE5"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1914"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="5464"/>
+				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasLegalBasis"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D9EAF265_1622_466d_94E4_FBEFCDDD2599">
-				<source xmi:idref="EAID_1F07BD1C_0323_4222_BBB8_D6BFEE65BD54">
-					<model ea_localid="1260" type="Class" name="epo-not:SocialAndOtherSpecificServices-D23"/>
+			<connector xmi:idref="EAID_0BDDE5E5_5E2D_438f_900E_43985FC6F4D3">
+				<source xmi:idref="EAID_2A716878_4D7B_473c_A793_4F4CB4AAA00E">
+					<model ea_localid="1147" type="Class" name="epo-not:Notice13"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_8E4FF705_88E9_4b3e_A98F_ACC159CC13C2">
-					<model ea_localid="1113" type="Object" name="Directive 23"/>
-					<role name="epo:hasLegalBasis" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647">
+					<model ea_localid="1283" type="Class" name="epo-not:eFormsNotice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2049"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="2162"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasLegalBasis"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_FA228CBB_BF55_48ad_AB67_DC0C864CEE43">
-				<source xmi:idref="EAID_B0688B55_49B2_4d49_B3A8_16E8DC1B426C">
-					<model ea_localid="1148" type="Class" name="epo-not:Notice14"/>
+			<connector xmi:idref="EAID_10DA1E5E_EB3E_4f82_AB74_84EC9AB0AF8D">
+				<source xmi:idref="EAID_20A35C8C_4895_4aef_AE94_63C59C948D5D">
+					<model ea_localid="3639" type="Class" name="epo-not:NoticeE2"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_8E4FF705_88E9_4b3e_A98F_ACC159CC13C2">
-					<model ea_localid="1113" type="Object" name="Directive 23"/>
-					<role name="epo:hasLegalBasis" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647">
+					<model ea_localid="1283" type="Class" name="epo-not:eFormsNotice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1863"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="5471"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasLegalBasis"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_0BDDE5E5_5E2D_438f_900E_43985FC6F4D3">
-				<source xmi:idref="EAID_2A716878_4D7B_473c_A793_4F4CB4AAA00E">
-					<model ea_localid="1147" type="Class" name="epo-not:Notice13"/>
+			<connector xmi:idref="EAID_25F1119B_B9A1_4e00_81DE_AB87104E2971">
+				<source xmi:idref="EAID_12A00248_5E3C_489e_88B4_ABEF21E72261">
+					<model ea_localid="3642" type="Class" name="epo-not:NoticeE3"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -18732,7 +20583,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2162"/>
+				<model ea_localid="5466"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -19083,6 +20934,40 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_6589DF3C_F8AF_4060_9294_0DA799BDC3D9">
+				<source xmi:idref="EAID_B6AAD0B0_AC78_46dd_A2BB_15ABCBF61F8B">
+					<model ea_localid="3641" type="Class" name="epo-not:NoticeCEI"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647">
+					<model ea_localid="1283" type="Class" name="epo-not:eFormsNotice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5467"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_6B3143BA_4F2F_4588_9069_661C90DA98AA">
 				<source xmi:idref="EAID_53A92E92_9CAF_4d77_A25C_5BE7FADB130C">
 					<model ea_localid="1155" type="Class" name="epo-not:Notice21"/>
@@ -19355,6 +21240,40 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_8CD40BAD_1B19_4e5e_B3AC_E2C7CB4138B9">
+				<source xmi:idref="EAID_B93F6450_B2DC_42d5_AB43_7ACC411B4F0F">
+					<model ea_localid="3644" type="Class" name="epo-not:NoticeT02"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647">
+					<model ea_localid="1283" type="Class" name="epo-not:eFormsNotice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5468"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_8D822444_2ABC_4032_ACDA_D8B62A04195A">
 				<source xmi:idref="EAID_BFA7907E_8FB6_49ba_B11E_EBCC5F1EDA23">
 					<model ea_localid="1158" type="Class" name="epo-not:Notice24"/>
@@ -19491,6 +21410,40 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_AF8B2993_D45B_4d65_BCC9_641769FA2898">
+				<source xmi:idref="EAID_137272D3_D36E_4bc8_BB25_DB95F670222F">
+					<model ea_localid="3645" type="Class" name="epo-not:NoticeE5"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647">
+					<model ea_localid="1283" type="Class" name="epo-not:eFormsNotice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5470"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_B08538A4_702A_4149_8C5D_43CDF93181B9">
 				<source xmi:idref="EAID_AA33DDB3_015E_422f_9700_767D093EA6DE">
 					<model ea_localid="1186" type="Class" name="epo-not:Notice34"/>
@@ -19627,9 +21580,111 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_CD99C8BD_DC6F_4d30_8016_828165F11C86">
-				<source xmi:idref="EAID_9534CCE2_2925_49a9_8149_B4372990E2A4">
-					<model ea_localid="1189" type="Class" name="epo-not:Notice37"/>
+			<connector xmi:idref="EAID_CD99C8BD_DC6F_4d30_8016_828165F11C86">
+				<source xmi:idref="EAID_9534CCE2_2925_49a9_8149_B4372990E2A4">
+					<model ea_localid="1189" type="Class" name="epo-not:Notice37"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647">
+					<model ea_localid="1283" type="Class" name="epo-not:eFormsNotice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="2185"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_CE524DE2_7EA2_4088_82A8_10147B85EC4A">
+				<source xmi:idref="EAID_F0DE3A34_0F67_47af_914A_82A0C222723C">
+					<model ea_localid="3638" type="Class" name="epo-not:NoticeE1"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647">
+					<model ea_localid="1283" type="Class" name="epo-not:eFormsNotice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5465"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_D0FFBE63_C48C_4d65_9C41_4399E6C4FC47">
+				<source xmi:idref="EAID_64AABC7B_6677_49c0_B157_A0A97128A458">
+					<model ea_localid="1170" type="Class" name="epo-not:Notice6"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647">
+					<model ea_localid="1283" type="Class" name="epo-not:eFormsNotice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="2154"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_D150D8BA_9E5C_46d7_88B7_B524DAE70854">
+				<source xmi:idref="EAID_1A622AA7_D176_418b_84D4_6FB3AAC4A4F9">
+					<model ea_localid="3643" type="Class" name="epo-not:NoticeE4"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -19650,7 +21705,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2185"/>
+				<model ea_localid="5469"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -19661,9 +21716,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D0FFBE63_C48C_4d65_9C41_4399E6C4FC47">
-				<source xmi:idref="EAID_64AABC7B_6677_49c0_B157_A0A97128A458">
-					<model ea_localid="1170" type="Class" name="epo-not:Notice6"/>
+			<connector xmi:idref="EAID_D8F5A0A7_8441_4207_B3AA_82C96EDCD5CD">
+				<source xmi:idref="EAID_406DCE49_EA4F_4aa6_BD32_93632614BD58">
+					<model ea_localid="1188" type="Class" name="epo-not:Notice36"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -19684,7 +21739,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2154"/>
+				<model ea_localid="2184"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -19695,9 +21750,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D8F5A0A7_8441_4207_B3AA_82C96EDCD5CD">
-				<source xmi:idref="EAID_406DCE49_EA4F_4aa6_BD32_93632614BD58">
-					<model ea_localid="1188" type="Class" name="epo-not:Notice36"/>
+			<connector xmi:idref="EAID_DAA1840F_3F32_4a86_956C_70B806F38B9A">
+				<source xmi:idref="EAID_82F083DA_42A3_4d07_A10E_D0CBB81A811D">
+					<model ea_localid="1150" type="Class" name="epo-not:Notice16"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -19718,7 +21773,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2184"/>
+				<model ea_localid="2165"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -19729,9 +21784,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_DAA1840F_3F32_4a86_956C_70B806F38B9A">
-				<source xmi:idref="EAID_82F083DA_42A3_4d07_A10E_D0CBB81A811D">
-					<model ea_localid="1150" type="Class" name="epo-not:Notice16"/>
+			<connector xmi:idref="EAID_DDE54F6E_927C_4aa6_A9DE_D600878A0184">
+				<source xmi:idref="EAID_4B4AA994_6B56_421a_80D0_CE346536A2B9">
+					<model ea_localid="3640" type="Class" name="epo-not:NoticeT01"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -19752,7 +21807,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2165"/>
+				<model ea_localid="5472"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -20917,7 +22972,238 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2390"/>
+				<model ea_localid="2390"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:hasFormType"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_42611760_184B_41b9_967E_E21B2767CCE7">
+				<source xmi:idref="EAID_1B4364F6_9CFF_4697_9C06_ACF3001ADED8">
+					<model ea_localid="1185" type="Class" name="epo-not:Notice33"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5">
+					<model ea_localid="1994" type="Object" name="result"/>
+					<role name="epo:hasFormType" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="2391"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:hasFormType"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_6926B6AE_BEA0_4f27_9388_71D77D79C7B7">
+				<source xmi:idref="EAID_AA33DDB3_015E_422f_9700_767D093EA6DE">
+					<model ea_localid="1186" type="Class" name="epo-not:Notice34"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5">
+					<model ea_localid="1994" type="Object" name="result"/>
+					<role name="epo:hasFormType" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="2392"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:hasFormType"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_A84907C9_3C78_4400_88C7_3C5CF97F6EFF">
+				<source xmi:idref="EAID_BDB13855_F3DD_4561_A018_D5E4E2B01404">
+					<model ea_localid="1187" type="Class" name="epo-not:Notice35"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5">
+					<model ea_localid="1994" type="Object" name="result"/>
+					<role name="epo:hasFormType" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="2393"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:hasFormType"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_3A176A7E_6EAC_4714_8B83_7E96F8F27796">
+				<source xmi:idref="EAID_406DCE49_EA4F_4aa6_BD32_93632614BD58">
+					<model ea_localid="1188" type="Class" name="epo-not:Notice36"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5">
+					<model ea_localid="1994" type="Object" name="result"/>
+					<role name="epo:hasFormType" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="2394"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:hasFormType"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_F7CC5A3E_F7E9_4f76_B68A_8AE98592729E">
+				<source xmi:idref="EAID_9534CCE2_2925_49a9_8149_B4372990E2A4">
+					<model ea_localid="1189" type="Class" name="epo-not:Notice37"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5">
+					<model ea_localid="1994" type="Object" name="result"/>
+					<role name="epo:hasFormType" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="2395"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:hasFormType"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_FCBD7949_00CD_443b_B39D_FDF3765EA891">
+				<source xmi:idref="EAID_84FDBA35_4628_4956_AB0B_DC9B7C2BA31E">
+					<model ea_localid="1160" type="Class" name="epo-not:Notice38"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_E1A66893_1AEF_40f4_A0B4_6F131D298E9A">
+					<model ea_localid="1995" type="Object" name="cont-modif"/>
+					<role name="epo:hasFormType" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="2396"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:hasFormType"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_42A851CF_862F_4e14_854D_D0AD754C07F6">
+				<source xmi:idref="EAID_78885FA2_A0A3_41bb_AB51_461D20C1E74E">
+					<model ea_localid="1161" type="Class" name="epo-not:Notice39"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_E1A66893_1AEF_40f4_A0B4_6F131D298E9A">
+					<model ea_localid="1995" type="Object" name="cont-modif"/>
+					<role name="epo:hasFormType" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="2397"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
@@ -20927,9 +23213,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_42611760_184B_41b9_967E_E21B2767CCE7">
-				<source xmi:idref="EAID_1B4364F6_9CFF_4697_9C06_ACF3001ADED8">
-					<model ea_localid="1185" type="Class" name="epo-not:Notice33"/>
+			<connector xmi:idref="EAID_D134E775_11C7_4793_8C65_7C72BF9EF936">
+				<source xmi:idref="EAID_F4FA5525_AA4D_46bb_A4DB_AFA624268215">
+					<model ea_localid="1168" type="Class" name="epo-not:Notice4"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -20939,8 +23225,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5">
-					<model ea_localid="1994" type="Object" name="result"/>
+				<target xmi:idref="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E">
+					<model ea_localid="1991" type="Object" name="planning"/>
 					<role name="epo:hasFormType" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -20950,7 +23236,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2391"/>
+				<model ea_localid="2339"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
@@ -20960,9 +23246,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_6926B6AE_BEA0_4f27_9388_71D77D79C7B7">
-				<source xmi:idref="EAID_AA33DDB3_015E_422f_9700_767D093EA6DE">
-					<model ea_localid="1186" type="Class" name="epo-not:Notice34"/>
+			<connector xmi:idref="EAID_FA13CC2D_2D40_4919_9D40_F9C7070CAA76">
+				<source xmi:idref="EAID_4280D6D9_1C83_445d_B9BA_C83F761767C3">
+					<model ea_localid="1162" type="Class" name="epo-not:Notice40"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -20972,8 +23258,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5">
-					<model ea_localid="1994" type="Object" name="result"/>
+				<target xmi:idref="EAID_E1A66893_1AEF_40f4_A0B4_6F131D298E9A">
+					<model ea_localid="1995" type="Object" name="cont-modif"/>
 					<role name="epo:hasFormType" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -20983,7 +23269,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2392"/>
+				<model ea_localid="2398"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
@@ -20993,9 +23279,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A84907C9_3C78_4400_88C7_3C5CF97F6EFF">
-				<source xmi:idref="EAID_BDB13855_F3DD_4561_A018_D5E4E2B01404">
-					<model ea_localid="1187" type="Class" name="epo-not:Notice35"/>
+			<connector xmi:idref="EAID_FB2BB349_DFDB_4132_89B8_9848E326CEF8">
+				<source xmi:idref="EAID_77B7A553_E803_4004_BBDD_E7E6A2ED7E06">
+					<model ea_localid="1169" type="Class" name="epo-not:Notice5"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -21005,8 +23291,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5">
-					<model ea_localid="1994" type="Object" name="result"/>
+				<target xmi:idref="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E">
+					<model ea_localid="1991" type="Object" name="planning"/>
 					<role name="epo:hasFormType" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -21016,7 +23302,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2393"/>
+				<model ea_localid="2340"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
@@ -21026,9 +23312,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_3A176A7E_6EAC_4714_8B83_7E96F8F27796">
-				<source xmi:idref="EAID_406DCE49_EA4F_4aa6_BD32_93632614BD58">
-					<model ea_localid="1188" type="Class" name="epo-not:Notice36"/>
+			<connector xmi:idref="EAID_4A3E5F63_E2CC_4dde_A0D3_9DE895E13057">
+				<source xmi:idref="EAID_64AABC7B_6677_49c0_B157_A0A97128A458">
+					<model ea_localid="1170" type="Class" name="epo-not:Notice6"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -21038,8 +23324,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5">
-					<model ea_localid="1994" type="Object" name="result"/>
+				<target xmi:idref="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E">
+					<model ea_localid="1991" type="Object" name="planning"/>
 					<role name="epo:hasFormType" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -21049,7 +23335,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2394"/>
+				<model ea_localid="2341"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
@@ -21059,9 +23345,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F7CC5A3E_F7E9_4f76_B68A_8AE98592729E">
-				<source xmi:idref="EAID_9534CCE2_2925_49a9_8149_B4372990E2A4">
-					<model ea_localid="1189" type="Class" name="epo-not:Notice37"/>
+			<connector xmi:idref="EAID_7861D5F9_24A5_4cdc_8C15_332EAC4B3904">
+				<source xmi:idref="EAID_85A3677C_D922_4169_BDDC_6D4FA8F74EE4">
+					<model ea_localid="1171" type="Class" name="epo-not:Notice7"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -21071,8 +23357,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5">
-					<model ea_localid="1994" type="Object" name="result"/>
+				<target xmi:idref="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E">
+					<model ea_localid="1991" type="Object" name="planning"/>
 					<role name="epo:hasFormType" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -21082,7 +23368,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2395"/>
+				<model ea_localid="2342"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
@@ -21092,9 +23378,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_FCBD7949_00CD_443b_B39D_FDF3765EA891">
-				<source xmi:idref="EAID_84FDBA35_4628_4956_AB0B_DC9B7C2BA31E">
-					<model ea_localid="1160" type="Class" name="epo-not:Notice38"/>
+			<connector xmi:idref="EAID_6C23590C_DC5E_499c_8A1F_9A3D6F23B10A">
+				<source xmi:idref="EAID_0A917C15_D52D_40b0_AD31_1089680BFBDF">
+					<model ea_localid="1172" type="Class" name="epo-not:Notice8"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -21104,8 +23390,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_E1A66893_1AEF_40f4_A0B4_6F131D298E9A">
-					<model ea_localid="1995" type="Object" name="cont-modif"/>
+				<target xmi:idref="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E">
+					<model ea_localid="1991" type="Object" name="planning"/>
 					<role name="epo:hasFormType" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -21115,7 +23401,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2396"/>
+				<model ea_localid="2343"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
@@ -21125,9 +23411,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_42A851CF_862F_4e14_854D_D0AD754C07F6">
-				<source xmi:idref="EAID_78885FA2_A0A3_41bb_AB51_461D20C1E74E">
-					<model ea_localid="1161" type="Class" name="epo-not:Notice39"/>
+			<connector xmi:idref="EAID_BD4D35AF_F4C0_470f_B185_99AC7779C464">
+				<source xmi:idref="EAID_378A0219_58F3_4bbb_A19B_0E19C7D6814B">
+					<model ea_localid="1173" type="Class" name="epo-not:Notice9"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -21137,8 +23423,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_E1A66893_1AEF_40f4_A0B4_6F131D298E9A">
-					<model ea_localid="1995" type="Object" name="cont-modif"/>
+				<target xmi:idref="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E">
+					<model ea_localid="1991" type="Object" name="planning"/>
 					<role name="epo:hasFormType" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -21148,7 +23434,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2397"/>
+				<model ea_localid="2344"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
@@ -21158,9 +23444,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D134E775_11C7_4793_8C65_7C72BF9EF936">
-				<source xmi:idref="EAID_F4FA5525_AA4D_46bb_A4DB_AFA624268215">
-					<model ea_localid="1168" type="Class" name="epo-not:Notice4"/>
+			<connector xmi:idref="EAID_70B69CB3_7E46_46fb_A6C2_A6B376E78B1B">
+				<source xmi:idref="EAID_B6AAD0B0_AC78_46dd_A2BB_15ABCBF61F8B">
+					<model ea_localid="3641" type="Class" name="epo-not:NoticeCEI"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -21170,8 +23456,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E">
-					<model ea_localid="1991" type="Object" name="planning"/>
+				<target xmi:idref="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC">
+					<model ea_localid="1992" type="Object" name="competition"/>
 					<role name="epo:hasFormType" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -21181,7 +23467,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2339"/>
+				<model ea_localid="5456"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
@@ -21191,9 +23477,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_FA13CC2D_2D40_4919_9D40_F9C7070CAA76">
-				<source xmi:idref="EAID_4280D6D9_1C83_445d_B9BA_C83F761767C3">
-					<model ea_localid="1162" type="Class" name="epo-not:Notice40"/>
+			<connector xmi:idref="EAID_23426D44_9964_443a_A184_0605456C2FEF">
+				<source xmi:idref="EAID_F0DE3A34_0F67_47af_914A_82A0C222723C">
+					<model ea_localid="3638" type="Class" name="epo-not:NoticeE1"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -21203,8 +23489,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_E1A66893_1AEF_40f4_A0B4_6F131D298E9A">
-					<model ea_localid="1995" type="Object" name="cont-modif"/>
+				<target xmi:idref="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E">
+					<model ea_localid="1991" type="Object" name="planning"/>
 					<role name="epo:hasFormType" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -21214,7 +23500,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2398"/>
+				<model ea_localid="5450"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
@@ -21224,9 +23510,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_FB2BB349_DFDB_4132_89B8_9848E326CEF8">
-				<source xmi:idref="EAID_77B7A553_E803_4004_BBDD_E7E6A2ED7E06">
-					<model ea_localid="1169" type="Class" name="epo-not:Notice5"/>
+			<connector xmi:idref="EAID_F7FF5756_985F_42b8_B881_CE0D3C6C7822">
+				<source xmi:idref="EAID_20A35C8C_4895_4aef_AE94_63C59C948D5D">
+					<model ea_localid="3639" type="Class" name="epo-not:NoticeE2"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -21247,7 +23533,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2340"/>
+				<model ea_localid="5452"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
@@ -21257,9 +23543,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_4A3E5F63_E2CC_4dde_A0D3_9DE895E13057">
-				<source xmi:idref="EAID_64AABC7B_6677_49c0_B157_A0A97128A458">
-					<model ea_localid="1170" type="Class" name="epo-not:Notice6"/>
+			<connector xmi:idref="EAID_7226E575_9BF3_4599_A33E_E62EFF274606">
+				<source xmi:idref="EAID_12A00248_5E3C_489e_88B4_ABEF21E72261">
+					<model ea_localid="3642" type="Class" name="epo-not:NoticeE3"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -21269,8 +23555,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E">
-					<model ea_localid="1991" type="Object" name="planning"/>
+				<target xmi:idref="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC">
+					<model ea_localid="1992" type="Object" name="competition"/>
 					<role name="epo:hasFormType" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -21280,7 +23566,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2341"/>
+				<model ea_localid="5458"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
@@ -21290,9 +23576,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7861D5F9_24A5_4cdc_8C15_332EAC4B3904">
-				<source xmi:idref="EAID_85A3677C_D922_4169_BDDC_6D4FA8F74EE4">
-					<model ea_localid="1171" type="Class" name="epo-not:Notice7"/>
+			<connector xmi:idref="EAID_8E5E0D60_1F11_4dc5_8F6F_6DAB4A8EF634">
+				<source xmi:idref="EAID_1A622AA7_D176_418b_84D4_6FB3AAC4A4F9">
+					<model ea_localid="3643" type="Class" name="epo-not:NoticeE4"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -21302,8 +23588,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E">
-					<model ea_localid="1991" type="Object" name="planning"/>
+				<target xmi:idref="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5">
+					<model ea_localid="1994" type="Object" name="result"/>
 					<role name="epo:hasFormType" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -21313,7 +23599,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2342"/>
+				<model ea_localid="5460"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
@@ -21323,9 +23609,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_6C23590C_DC5E_499c_8A1F_9A3D6F23B10A">
-				<source xmi:idref="EAID_0A917C15_D52D_40b0_AD31_1089680BFBDF">
-					<model ea_localid="1172" type="Class" name="epo-not:Notice8"/>
+			<connector xmi:idref="EAID_09317411_46CE_4072_BBAE_0E80F1DB23E4">
+				<source xmi:idref="EAID_4B4AA994_6B56_421a_80D0_CE346536A2B9">
+					<model ea_localid="3640" type="Class" name="epo-not:NoticeT01"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -21346,7 +23632,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2343"/>
+				<model ea_localid="5454"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
@@ -21356,9 +23642,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_BD4D35AF_F4C0_470f_B185_99AC7779C464">
-				<source xmi:idref="EAID_378A0219_58F3_4bbb_A19B_0E19C7D6814B">
-					<model ea_localid="1173" type="Class" name="epo-not:Notice9"/>
+			<connector xmi:idref="EAID_092B4BA8_26FC_40e9_B172_6F9C6045CFC9">
+				<source xmi:idref="EAID_B93F6450_B2DC_42d5_AB43_7ACC411B4F0F">
+					<model ea_localid="3644" type="Class" name="epo-not:NoticeT02"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -21368,8 +23654,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E">
-					<model ea_localid="1991" type="Object" name="planning"/>
+				<target xmi:idref="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5">
+					<model ea_localid="1994" type="Object" name="result"/>
 					<role name="epo:hasFormType" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -21379,7 +23665,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2344"/>
+				<model ea_localid="5462"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
@@ -25065,16 +27351,16 @@
 		<profiles/>
 		<diagrams>
 			<diagram xmi:id="EAID_6785F76B_98DE_4cc5_9184_059956F5BBE9">
-				<model package="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" localID="127" owner="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" tpos="1"/>
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" localID="127" owner="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="1"/>
 				<properties name="notice and cv mapping" type="Logical"/>
-				<project author="andreea" version="1.0" created="2021-12-08 17:25:02" modified="2023-09-11 18:17:19"/>
+				<project author="andreea" version="1.0" created="2021-12-08 17:25:02" modified="2024-07-18 16:44:10"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=40C949DA;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=B06159C1;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=104;Top=601;Right=274;Bottom=645;" subject="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03" seqno="1" style="DUID=EBB7A485;"/>
+					<element geometry="Left=154;Top=601;Right=324;Bottom=645;" subject="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03" seqno="1" style="DUID=EBB7A485;"/>
 					<element geometry="Left=930;Top=601;Right=1101;Bottom=645;" subject="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" seqno="2" style="DUID=698BF75E;"/>
 					<element geometry="Left=1238;Top=119;Right=1454;Bottom=259;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="3" style="BCol=-1;BFol=-1;DUID=8A977ADA;LCol=-1;LWth=-1;NSL=0;black=0;bold=0;charset=0;fontsz=0;italic=0;pitch=0;ul=0;"/>
 					<element geometry="Left=736;Top=601;Right=907;Bottom=645;" subject="EAID_D847D616_70DB_473a_A2A4_6665F938474C" seqno="4" style="DUID=5AC856AD;"/>
@@ -25094,7 +27380,7 @@
 					<element geometry="SX=-4;SY=-8;EX=24;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B825D1CD_744B_411b_A025_488C1781D353" style="Mode=3;EOID=ED8C0823;SOID=5AC856AD;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_36806876_C16C_4dc1_BD29_58E4B7187783" style="Mode=3;EOID=171D0CE8;SOID=DEA4DB37;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6070C1A3_A5F5_4b53_9AAE_48C9E1FDC23C" style="Mode=3;EOID=B31F5A34;SOID=9745C15E;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=4;SY=0;EX=0;EY=26;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=193:-468$;" subject="EAID_5217DA2B_F336_4793_85E1_6829959E93BB" style="Mode=3;EOID=ED8C0823;SOID=EBB7A485;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=10;SY=0;EX=0;EY=22;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=249:-472$;" subject="EAID_A1DC6D24_EABE_467c_80DC_91F8A4D3F0DE" style="Mode=3;EOID=ED8C0823;SOID=EBB7A485;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=92;SY=33;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=-9:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3AA2C83C_532C_460c_99CE_63F041A42F06" style="Mode=3;EOID=8A977ADA;SOID=AAEF67D5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=86;SY=-18;EX=-6;EY=-9;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=59:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1BEBAC59_19C6_4908_B93C_EED975A6974F" style="Mode=3;EOID=8A977ADA;SOID=AAEF67D5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=796;SCTR.TOP=-127;SCTR.RIGHT=853;SCTR.BOTTOM=-89;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=62:OY=-36:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=853:-107$853:-89$796:-89$796:-127$820:-127$;" subject="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9" style="Mode=3;EOID=AAEF67D5;SOID=AAEF67D5;Color=-1;LWidth=0;Hidden=0;"/>
@@ -25115,11 +27401,11 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_DA3F165E_E1C4_443d_B43F_8EBB9AD26F8C">
-				<model package="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" localID="448" owner="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" tpos="3"/>
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" localID="448" owner="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="3"/>
 				<properties name="planning notice relations" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-04-30 16:11:24" modified="2023-09-11 18:17:13"/>
+				<project author="andreea" version="1.0" created="2023-04-30 16:11:24" modified="2024-07-18 16:35:13"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=A3478D3E;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=9CCC2562;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
@@ -25128,7 +27414,7 @@
 					<element geometry="Left=766;Top=441;Right=998;Bottom=578;" subject="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" seqno="2" style="DUID=51E75163;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1126;Top=243;Right=1385;Bottom=354;" subject="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" seqno="3" style="DUID=8AD024A6;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=824;Top=103;Right=939;Bottom=190;" subject="EAID_A7E3EEA1_BBD5_409a_9717_8E5FF181CF7E" seqno="4" style="DUID=BD3CEE0A;"/>
-					<element geometry="Left=434;Top=395;Right=549;Bottom=505;" subject="EAID_7BE947BB_A71B_4e7a_AA2B_BE7308712695" seqno="5" style="DUID=83DF0833;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=434;Top=370;Right=549;Bottom=480;" subject="EAID_7BE947BB_A71B_4e7a_AA2B_BE7308712695" seqno="5" style="DUID=83DF0833;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=796;Top=263;Right=967;Bottom=333;" subject="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" seqno="6" style="DUID=2623424E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=128;Top=263;Right=299;Bottom=333;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" seqno="7" style="DUID=4D27ABEC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=406;Top=263;Right=577;Bottom=333;" subject="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" seqno="8" style="NSL=0;DUID=82CE8310;"/>
@@ -25147,21 +27433,27 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_B3CE5A4A_3421_4d83_835E_1908DA76EA1C">
-				<model package="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" localID="449" owner="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" tpos="4"/>
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" localID="449" owner="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="4"/>
 				<properties name="competition notice relations" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-04-30 16:14:11" modified="2023-09-11 18:17:29"/>
+				<project author="andreea" version="1.0" created="2023-04-30 16:14:11" modified="2024-07-23 10:24:17"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=A03EE3D7;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=35DEFD30;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=783;Top=242;Right=1061;Bottom=353;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="1" style="DUID=62616085;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=836;Top=551;Right=1007;Bottom=621;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="2" style="DUID=9B655F6C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=836;Top=406;Right=1007;Bottom=476;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="3" style="DUID=9A69CDBB;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=139;Top=253;Right=310;Bottom=323;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" seqno="4" style="DUID=4F5516A9;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=399;Top=52;Right=644;Bottom=215;" subject="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" seqno="5" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=04FBE2EE;"/>
-					<element geometry="Left=436;Top=253;Right=607;Bottom=323;" subject="EAID_17662AEF_1321_446a_AE42_0583F7417A79" seqno="6" style="NSL=0;DUID=AA72677B;"/>
+					<element geometry="Left=738;Top=70;Right=752;Bottom=84;" subject="EAID_17272E7E_FAA6_4f11_BBB3_457706068099" seqno="1" style="DUID=81D172EC;"/>
+					<element geometry="Left=737;Top=435;Right=751;Bottom=449;" subject="EAID_08C84AC0_E262_46e1_9EC6_644AFF8D9561" seqno="2" style="DUID=C93D3ED2;"/>
+					<element geometry="Left=702;Top=113;Right=716;Bottom=127;" subject="EAID_5046F705_8CB4_4b61_9F99_4575710393BB" seqno="3" style="DUID=EE073A75;"/>
+					<element geometry="Left=702;Top=281;Right=716;Bottom=295;" subject="EAID_E65922A8_EFDF_48e3_B6C2_16B9FF224BE8" seqno="4" style="DUID=A2B0A520;"/>
+					<element geometry="Left=783;Top=242;Right=1061;Bottom=353;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="5" style="DUID=62616085;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=836;Top=551;Right=1015;Bottom=621;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="6" style="DUID=9B655F6C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=836;Top=406;Right=1007;Bottom=476;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="7" style="DUID=9A69CDBB;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=139;Top=253;Right=310;Bottom=323;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" seqno="8" style="DUID=4F5516A9;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=399;Top=52;Right=644;Bottom=215;" subject="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" seqno="9" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=04FBE2EE;"/>
+					<element geometry="Left=436;Top=253;Right=607;Bottom=323;" subject="EAID_17662AEF_1321_446a_AE42_0583F7417A79" seqno="10" style="NSL=0;DUID=AA72677B;"/>
+					<element geometry="SX=-5;SY=-2;EX=-5;EY=-2;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C56014E3_B90C_4023_BFE9_EFC9B42720F4" style="Mode=3;EOID=81D172EC;SOID=C93D3ED2;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A70D66E1_34C3_4d44_949F_426C768D6C8B" style="Mode=3;EOID=EE073A75;SOID=A2B0A520;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=97:OY=-16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=9A69CDBB;SOID=62616085;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=76:OY=24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_20732599_332F_4f0e_BFE6_593632EDB11F" style="Mode=3;EOID=9A69CDBB;SOID=9B655F6C;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EX=4;EY=0;SX=0;SY=7;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=61:OY=-30:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=926:-120$;" subject="EAID_F955E894_651A_4a8b_A411_E8DA312BC449" style="Mode=3;EOID=62616085;SOID=04FBE2EE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -25175,122 +27467,138 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_9E08D249_06F2_4b3b_9417_CC0CE30D81A7">
-				<model package="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" localID="450" owner="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" tpos="6"/>
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" localID="450" owner="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="6"/>
 				<properties name="result notice relations" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-04-30 16:18:01" modified="2023-09-11 18:18:43"/>
+				<project author="andreea" version="1.0" created="2023-04-30 16:18:01" modified="2024-07-23 10:25:14"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=CCB06463;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=2FC79B61;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=363;Top=627;Right=579;Bottom=712;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="1" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=B919CC95;"/>
-					<element geometry="Left=793;Top=247;Right=1066;Bottom=317;" subject="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" seqno="2" style="DUID=7D911B16;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=824;Top=95;Right=1102;Bottom=206;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="3" style="DUID=AF5824C4;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=36;Top=446;Right=201;Bottom=516;" subject="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" seqno="4" style="DUID=9B6EE845;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=886;Top=585;Right=1042;Bottom=619;" subject="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" seqno="5" style="DUID=C8C7962D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=878;Top=483;Right=1049;Bottom=545;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="6" style="DUID=35BF613A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=912;Top=336;Right=1011;Bottom=430;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="7" style="DUID=89E0D5A8;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=53;Top=247;Right=224;Bottom=317;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" seqno="8" style="DUID=ED4C6B59;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=363;Top=243;Right=603;Bottom=322;" subject="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" seqno="9" style="NSL=0;DUID=85054196;"/>
-					<element geometry="Left=30;Top=64;Right=275;Bottom=227;" subject="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" seqno="10" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=AE196721;"/>
-					<element geometry="EX=0;EY=-11;SX=-72;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=165:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=411:-492$;" subject="EAID_F053A3B1_64BB_454a_8FCF_CE8415CE3F22" style="Mode=3;EOID=9B6EE845;SOID=85054196;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="Left=671;Top=65;Right=685;Bottom=79;" subject="EAID_9680588B_831E_4f03_8AD7_7E2899D2520E" seqno="1" style="DUID=EB6F23BF;"/>
+					<element geometry="Left=670;Top=374;Right=684;Bottom=388;" subject="EAID_D5AE1A66_594D_488f_AFDF_6C8C5D111A0F" seqno="2" style="DUID=7D7A6E7A;"/>
+					<element geometry="Left=594;Top=106;Right=608;Bottom=120;" subject="EAID_4A97DCFA_BAC8_4f54_BADE_E2E47352BDD6" seqno="3" style="DUID=4F1A3F25;"/>
+					<element geometry="Left=594;Top=152;Right=608;Bottom=166;" subject="EAID_E47E3B9A_672A_4b82_BA0F_A1B9C0D14B8E" seqno="4" style="DUID=DF0A76CB;"/>
+					<element geometry="Left=363;Top=627;Right=579;Bottom=712;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="5" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=B919CC95;"/>
+					<element geometry="Left=793;Top=247;Right=1066;Bottom=317;" subject="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" seqno="6" style="DUID=7D911B16;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=824;Top=95;Right=1102;Bottom=206;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="7" style="DUID=AF5824C4;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=36;Top=446;Right=201;Bottom=516;" subject="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" seqno="8" style="DUID=9B6EE845;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=886;Top=585;Right=1042;Bottom=619;" subject="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" seqno="9" style="DUID=C8C7962D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=878;Top=483;Right=1057;Bottom=558;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="10" style="DUID=35BF613A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=912;Top=336;Right=1011;Bottom=430;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="11" style="DUID=89E0D5A8;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=53;Top=247;Right=224;Bottom=317;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" seqno="12" style="DUID=ED4C6B59;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=363;Top=243;Right=603;Bottom=322;" subject="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" seqno="13" style="NSL=0;DUID=85054196;"/>
+					<element geometry="Left=30;Top=64;Right=275;Bottom=227;" subject="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" seqno="14" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=AE196721;"/>
+					<element geometry="SX=2;SY=-8;EX=2;EY=-8;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=126:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_5465A41A_7AD8_4020_9E57_C032F2801A7A" style="Mode=3;EOID=7D911B16;SOID=85054196;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=73;EX=0;EY=4;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=69:CY=14:OX=19:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1162:-72$1162:-379$;" subject="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF" style="Mode=3;EOID=89E0D5A8;SOID=AE196721;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=121;SY=0;EX=77;EY=0;SCTR=1;SCME=1;SCTR.LEFT=229;SCTR.TOP=-77;SCTR.RIGHT=273;SCTR.BOTTOM=-44;$LLB=;LLT=;LMT=;LMB=;LRT=CX=100:CY=14:OX=78:OY=-18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=273:-64$273:-44$229:-44$229:-64$;" subject="EAID_7EE70932_F57C_4861_BE52_91F3F7270840" style="Mode=3;EOID=AE196721;SOID=AE196721;Color=-1;LWidth=0;TREE=OS;Hidden=0;"/>
 					<element geometry="SX=-6;SY=28;EX=-11;EY=55;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F955E894_651A_4a8b_A411_E8DA312BC449" style="Mode=3;EOID=AF5824C4;SOID=AE196721;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-11;SY=1;EX=-11;EY=1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=100:CY=14:OX=40:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4A2A2E13_AE75_4b0d_B325_4443E0BF6A2D" style="Mode=3;EOID=B919CC95;SOID=85054196;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=1;SY=0;EX=0;EY=-9;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=-4:OY=-6:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=484:-159$;" subject="EAID_A5762169_952E_4db0_9FE7_6B4A895F2AF1" style="Mode=3;EOID=AF5824C4;SOID=85054196;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=0;EY=2;SX=99;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=69:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=582:-381$;" subject="EAID_7355842B_BD0C_4fab_8681_C210E308328D" style="Mode=3;EOID=89E0D5A8;SOID=85054196;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=17;EX=0;EY=18;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=100:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_91CB9CAD_CC6F_4c97_B4AA_B8C9088E4284" style="Mode=3;EOID=ED4C6B59;SOID=85054196;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=0;SY=0;EX=0;EY=-23;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=23:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1111:-669$1111:-406$;" subject="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7" style="Mode=3;EOID=89E0D5A8;SOID=B919CC95;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EX=0;EY=-2;SX=27;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=176:CY=14:OX=-27:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=510:-604$;" subject="EAID_FA76DFA8_9FC1_4db0_86FF_2CE55FF62AB6" style="Mode=3;EOID=C8C7962D;SOID=85054196;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EX=0;EY=39;SX=0;SY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=20:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1119:-150$1119:-344$;" subject="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=89E0D5A8;SOID=AF5824C4;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=2;SY=-8;EX=2;EY=-8;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=126:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_5465A41A_7AD8_4020_9E57_C032F2801A7A" style="Mode=3;EOID=7D911B16;SOID=85054196;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EX=0;EY=-11;SX=-72;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=165:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=411:-492$;" subject="EAID_F053A3B1_64BB_454a_8FCF_CE8415CE3F22" style="Mode=3;EOID=9B6EE845;SOID=85054196;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_71F00BB4_9962_4462_99B5_9349107595CF" style="Mode=3;EOID=EB6F23BF;SOID=7D7A6E7A;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EX=0;EY=5;SX=51;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=93:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=534:-509$;" subject="EAID_BCCB407C_08A7_467b_8826_322D82AB6DB0" style="Mode=3;EOID=35BF613A;SOID=85054196;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-55;SY=0;EX=0;EY=6;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=428:-139$;" subject="EAID_A87ED0E5_0C79_4015_8392_5BAE0E90B288" style="Mode=3;EOID=AE196721;SOID=85054196;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-3;SY=-17;EX=-3;EY=-16;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_49B0A22A_438E_4ee3_8C70_92C7E2AD60DC" style="Mode=3;EOID=ED4C6B59;SOID=85054196;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=69:OY=18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_20732599_332F_4f0e_BFE6_593632EDB11F" style="Mode=3;EOID=89E0D5A8;SOID=35BF613A;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=54:OY=15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4B36ABDE_C6FC_4a8d_93CA_CC7ACC63568D" style="Mode=3;EOID=35BF613A;SOID=C8C7962D;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=22;EX=-110;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=110:CY=14:OX=32:OY=23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=373:-459$;" subject="EAID_59564C5C_30DE_429b_AE68_D4CA3CC6E260" style="Mode=3;EOID=85054196;SOID=9B6EE845;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=17;EX=0;EY=18;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=100:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_91CB9CAD_CC6F_4c97_B4AA_B8C9088E4284" style="Mode=3;EOID=ED4C6B59;SOID=85054196;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EX=0;EY=39;SX=0;SY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=20:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1119:-150$1119:-344$;" subject="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=89E0D5A8;SOID=AF5824C4;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_90E37548_02F8_4227_8C75_04FFB21501B2" style="Mode=3;EOID=4F1A3F25;SOID=DF0A76CB;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EX=0;EY=-2;SX=27;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=176:CY=14:OX=-27:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=510:-604$;" subject="EAID_FA76DFA8_9FC1_4db0_86FF_2CE55FF62AB6" style="Mode=3;EOID=C8C7962D;SOID=85054196;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_FC576D8E_37E3_455d_A552_FC29948F779D">
-				<model package="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" localID="451" owner="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" tpos="5"/>
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" localID="451" owner="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="5"/>
 				<properties name="dap notice relations" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-04-30 16:39:29" modified="2023-09-11 18:18:17"/>
+				<project author="andreea" version="1.0" created="2023-04-30 16:39:29" modified="2024-07-23 10:24:33"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=EF8CD750;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=70479B37;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=254;Top=692;Right=470;Bottom=777;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="1" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=C1F6359C;"/>
-					<element geometry="Left=781;Top=161;Right=1054;Bottom=231;" subject="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" seqno="2" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=E2D62958;"/>
-					<element geometry="Left=53;Top=433;Right=179;Bottom=503;" subject="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" seqno="3" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=EFAB8201;"/>
-					<element geometry="Left=670;Top=659;Right=796;Bottom=729;" subject="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" seqno="4" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=D8E49E47;"/>
-					<element geometry="Left=833;Top=572;Right=1004;Bottom=642;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="5" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=9DA7ECE1;"/>
-					<element geometry="Left=869;Top=422;Right=968;Bottom=516;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="6" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=C7F50116;"/>
-					<element geometry="Left=34;Top=266;Right=205;Bottom=336;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" seqno="7" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=B6993400;"/>
-					<element geometry="Left=778;Top=245;Right=1056;Bottom=356;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="8" style="DUID=FF25CC99;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=344;Top=278;Right=541;Bottom=322;" subject="EAID_D847D616_70DB_473a_A2A4_6665F938474C" seqno="9" style="NSL=0;DUID=B113AED7;"/>
-					<element geometry="Left=34;Top=88;Right=279;Bottom=251;" subject="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" seqno="10" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=A8BC6BA3;"/>
-					<element geometry="SX=78;SY=0;EX=0;EY=2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=520:-467$;" subject="EAID_389050E1_4285_45aa_87A9_6A9BA62CD554" style="Mode=3;EOID=C7F50116;SOID=B113AED7;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="Left=558;Top=101;Right=572;Bottom=115;" subject="EAID_D08F9431_D68C_497b_BC8C_B22259E469A9" seqno="1" style="DUID=75494BA8;"/>
+					<element geometry="Left=557;Top=460;Right=571;Bottom=474;" subject="EAID_A08BABBB_DF17_46af_8086_EFFD7222CAFF" seqno="2" style="DUID=AA738DE3;"/>
+					<element geometry="Left=610;Top=133;Right=624;Bottom=147;" subject="EAID_44910AF1_0738_4bac_B8E3_2BC8677D2EC1" seqno="3" style="DUID=2E9A543F;"/>
+					<element geometry="Left=609;Top=293;Right=623;Bottom=307;" subject="EAID_E6FB12CB_F678_4ec8_98CD_608C5E762EE9" seqno="4" style="DUID=049ACA71;"/>
+					<element geometry="Left=254;Top=692;Right=470;Bottom=777;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="5" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=C1F6359C;"/>
+					<element geometry="Left=781;Top=161;Right=1054;Bottom=231;" subject="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" seqno="6" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=E2D62958;"/>
+					<element geometry="Left=53;Top=433;Right=179;Bottom=503;" subject="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" seqno="7" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=EFAB8201;"/>
+					<element geometry="Left=670;Top=659;Right=796;Bottom=729;" subject="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" seqno="8" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=D8E49E47;"/>
+					<element geometry="Left=833;Top=572;Right=1012;Bottom=642;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="9" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=9DA7ECE1;"/>
+					<element geometry="Left=869;Top=422;Right=968;Bottom=516;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="10" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=C7F50116;"/>
+					<element geometry="Left=34;Top=266;Right=205;Bottom=336;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" seqno="11" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=B6993400;"/>
+					<element geometry="Left=778;Top=245;Right=1056;Bottom=356;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="12" style="DUID=FF25CC99;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=344;Top=278;Right=541;Bottom=322;" subject="EAID_D847D616_70DB_473a_A2A4_6665F938474C" seqno="13" style="NSL=0;DUID=B113AED7;"/>
+					<element geometry="Left=34;Top=88;Right=279;Bottom=251;" subject="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" seqno="14" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=A8BC6BA3;"/>
+					<element geometry="SX=54;SY=0;EX=0;EY=19;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=496:-588$;" subject="EAID_C6F18DD0_9007_48f0_9959_5EE6A49DDD1B" style="Mode=3;EOID=9DA7ECE1;SOID=B113AED7;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=-13;EX=-50;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=192:CY=14:OX=200:OY=12:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=-38:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=392:-481$;" subject="EAID_38F70CB6_EA38_4786_82CF_5486AAD496C1" style="Mode=3;EOID=B113AED7;SOID=EFAB8201;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=0;SY=-20;EX=0;EY=-2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=23:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1078:-754$1078:-471$;" subject="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7" style="Mode=3;EOID=C7F50116;SOID=C1F6359C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=0;EY=26;SX=0;SY=61;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=69:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1163:-108$1163:-443$;" subject="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF" style="Mode=3;EOID=C7F50116;SOID=A8BC6BA3;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=121;SY=0;EX=77;EY=0;SCTR=1;SCME=1;SCTR.LEFT=233;SCTR.TOP=-101;SCTR.RIGHT=277;SCTR.BOTTOM=-68;$LLB=;LLT=;LMT=;LMB=;LRT=CX=100:CY=14:OX=84:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=277:-88$277:-68$233:-68$233:-88$;" subject="EAID_7EE70932_F57C_4861_BE52_91F3F7270840" style="Mode=3;EOID=A8BC6BA3;SOID=A8BC6BA3;Color=-1;LWidth=0;TREE=OS;Hidden=0;"/>
 					<element geometry="EX=0;EY=23;SX=0;SY=29;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1109:-140$1109:-277$;" subject="EAID_F955E894_651A_4a8b_A411_E8DA312BC449" style="Mode=3;EOID=FF25CC99;SOID=A8BC6BA3;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-92;SY=0;EX=0;EY=9;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=165:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=350:-459$;" subject="EAID_76074F10_F8BD_4e56_929F_478C3A0B8424" style="Mode=3;EOID=EFAB8201;SOID=B113AED7;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;SX=1;SY=0;EX=1;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=107:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B1307E49_0838_4569_819E_D05D699E0983" style="Mode=3;EOID=FF25CC99;SOID=B113AED7;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=2;SY=0;EX=0;EY=-20;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=-21:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=735:-627$;" subject="EAID_4B36ABDE_C6FC_4a8d_93CA_CC7ACC63568D" style="Mode=3;EOID=9DA7ECE1;SOID=D8E49E47;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-30;SY=0;EX=0;EY=6;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=412:-163$;" subject="EAID_B825D1CD_744B_411b_A025_488C1781D353" style="Mode=3;EOID=A8BC6BA3;SOID=B113AED7;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=69:OY=25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_20732599_332F_4f0e_BFE6_593632EDB11F" style="Mode=3;EOID=C7F50116;SOID=9DA7ECE1;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=54;SY=0;EX=0;EY=19;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=496:-588$;" subject="EAID_C6F18DD0_9007_48f0_9959_5EE6A49DDD1B" style="Mode=3;EOID=9DA7ECE1;SOID=B113AED7;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=78;SY=0;EX=0;EY=2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=520:-467$;" subject="EAID_389050E1_4285_45aa_87A9_6A9BA62CD554" style="Mode=3;EOID=C7F50116;SOID=B113AED7;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4033C88B_B08F_4630_93FD_457E67FB5F58" style="Mode=3;EOID=75494BA8;SOID=AA738DE3;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=34;SY=0;EX=0;EY=-1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=176:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=476:-695$;" subject="EAID_0A7EDA02_3460_4960_8D22_F25373156526" style="Mode=3;EOID=D8E49E47;SOID=B113AED7;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-7;SY=0;EX=-7;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=100:CY=14:OX=31:OY=-27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_37C1B1D3_F31C_482d_82B0_7ED4BAC17D43" style="Mode=3;EOID=C1F6359C;SOID=B113AED7;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=84:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_670AED44_E69C_416d_988A_2D1D02E4692C" style="Mode=3;EOID=B6993400;SOID=B113AED7;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=40;SY=0;EX=0;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=126:CY=14:OX=-18:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=482:-195$;" subject="EAID_EBAA0FEE_B552_4003_8B98_ADD4600E7BA1" style="Mode=3;EOID=E2D62958;SOID=B113AED7;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=0;EY=-10;SX=0;SY=-3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=90:OY=-34:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=C7F50116;SOID=FF25CC99;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=107:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B1307E49_0838_4569_819E_D05D699E0983" style="Mode=3;EOID=FF25CC99;SOID=B113AED7;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=69:OY=25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_20732599_332F_4f0e_BFE6_593632EDB11F" style="Mode=3;EOID=C7F50116;SOID=9DA7ECE1;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_CFE865BE_F277_4169_ABC1_9D68D997C916" style="Mode=3;EOID=2E9A543F;SOID=049ACA71;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-30;SY=0;EX=0;EY=6;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=412:-163$;" subject="EAID_B825D1CD_744B_411b_A025_488C1781D353" style="Mode=3;EOID=A8BC6BA3;SOID=B113AED7;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_2A14808D_69AA_430c_86C2_CDA04BE8C4F4">
-				<model package="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" localID="452" owner="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" tpos="7"/>
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" localID="452" owner="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="7"/>
 				<properties name="modification notice relations" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-04-30 16:46:29" modified="2023-09-11 18:20:40"/>
+				<project author="andreea" version="1.0" created="2023-04-30 16:46:29" modified="2024-07-23 10:24:46"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=41FE564A;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=29FB225D;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=419;Top=734;Right=552;Bottom=787;" subject="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F" seqno="1" style="DUID=8B6342C3;"/>
-					<element geometry="Left=124;Top=674;Right=331;Bottom=762;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="2" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=0FF36BBD;"/>
-					<element geometry="Left=94;Top=832;Right=362;Bottom=902;" subject="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7" seqno="3" style="DUID=F98D6D43;"/>
-					<element geometry="Left=183;Top=940;Right=273;Bottom=1000;" subject="EAID_C39641DF_A778_418a_94EE_8405EFE534AF" seqno="4" style="DUID=9E073AF0;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1077;Top=125;Right=1350;Bottom=195;" subject="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" seqno="5" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=A7F3956C;"/>
-					<element geometry="Left=374;Top=518;Right=532;Bottom=588;" subject="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" seqno="6" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=85BAEF9C;"/>
-					<element geometry="Left=977;Top=648;Right=1129;Bottom=718;" subject="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" seqno="7" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=64E74452;"/>
-					<element geometry="Left=1129;Top=547;Right=1300;Bottom=630;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="8" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=950FA32A;"/>
-					<element geometry="Left=1075;Top=218;Right=1353;Bottom=329;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="9" style="DUID=DEB89479;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1165;Top=395;Right=1264;Bottom=465;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="10" style="DUID=0062DCF4;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=676;Top=718;Right=892;Bottom=803;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="11" style="DUID=B652767C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=419;Top=395;Right=590;Bottom=465;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" seqno="12" style="DUID=56DAAEAF;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=698;Top=408;Right=869;Bottom=452;" subject="EAID_71373AFD_6871_4946_B921_97A716439257" seqno="13" style="DUID=9AF536AF;NSL=0;"/>
-					<element geometry="Left=382;Top=175;Right=627;Bottom=338;" subject="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" seqno="14" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=B0BAC890;"/>
-					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=84:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_67CCA39E_1E30_4142_9536_906052B9AABC" style="Mode=3;EOID=56DAAEAF;SOID=9AF536AF;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="Left=991;Top=78;Right=1005;Bottom=92;" subject="EAID_D51DF83F_EDA1_4cfa_94A2_34A940C86AB6" seqno="1" style="DUID=50368466;"/>
+					<element geometry="Left=991;Top=431;Right=1005;Bottom=445;" subject="EAID_3CA58BCF_C8DB_4609_9044_CFAA473152BE" seqno="2" style="DUID=CDB81CBA;"/>
+					<element geometry="Left=900;Top=111;Right=914;Bottom=125;" subject="EAID_8944D0F2_D657_4ce9_B2E9_DEBFBA9394DE" seqno="3" style="DUID=895666D1;"/>
+					<element geometry="Left=900;Top=263;Right=914;Bottom=277;" subject="EAID_39DBC436_506A_46a4_9670_9A00EC98EC62" seqno="4" style="DUID=E340993A;"/>
+					<element geometry="Left=419;Top=734;Right=552;Bottom=787;" subject="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F" seqno="5" style="DUID=8B6342C3;"/>
+					<element geometry="Left=124;Top=674;Right=331;Bottom=762;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="6" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=0FF36BBD;"/>
+					<element geometry="Left=94;Top=832;Right=362;Bottom=902;" subject="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7" seqno="7" style="DUID=F98D6D43;"/>
+					<element geometry="Left=183;Top=940;Right=273;Bottom=1000;" subject="EAID_C39641DF_A778_418a_94EE_8405EFE534AF" seqno="8" style="DUID=9E073AF0;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1077;Top=125;Right=1350;Bottom=195;" subject="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" seqno="9" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=A7F3956C;"/>
+					<element geometry="Left=374;Top=518;Right=532;Bottom=588;" subject="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" seqno="10" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=85BAEF9C;"/>
+					<element geometry="Left=977;Top=648;Right=1129;Bottom=718;" subject="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" seqno="11" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=64E74452;"/>
+					<element geometry="Left=1129;Top=547;Right=1300;Bottom=630;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="12" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=950FA32A;"/>
+					<element geometry="Left=1075;Top=218;Right=1353;Bottom=329;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="13" style="DUID=DEB89479;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1165;Top=395;Right=1264;Bottom=465;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="14" style="DUID=0062DCF4;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=676;Top=718;Right=892;Bottom=803;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="15" style="DUID=B652767C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=419;Top=395;Right=590;Bottom=465;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" seqno="16" style="DUID=56DAAEAF;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=698;Top=408;Right=869;Bottom=452;" subject="EAID_71373AFD_6871_4946_B921_97A716439257" seqno="17" style="DUID=9AF536AF;NSL=0;"/>
+					<element geometry="Left=382;Top=175;Right=627;Bottom=338;" subject="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" seqno="18" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=B0BAC890;"/>
+					<element geometry="SX=-78;SY=0;EX=0;EY=-4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=155:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=705:-557$;" subject="EAID_9C96E83D_792B_44cd_BDF4_F589B6CAC7A1" style="Mode=3;EOID=85BAEF9C;SOID=9AF536AF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=7;EX=8;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=85:OY=29:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=493:-860$;" subject="EAID_005EFF4E_D969_4688_8461_8385AB23B103" style="Mode=3;EOID=8B6342C3;SOID=F98D6D43;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=30;SY=-34;EX=-15;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=134:CY=14:OX=76:OY=-15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_E3F14E7C_46D7_4dec_BA75_DE0B948A3FD5" style="Mode=3;EOID=9E073AF0;SOID=F98D6D43;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=44;SY=-14;EX=1;EY=-13;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=-14:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7E9B4B6E_15E8_4ec4_876B_BEE9D986B4DA" style="Mode=3;EOID=B652767C;SOID=8B6342C3;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-1;SY=13;EX=0;EY=13;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_7787587B_6BE4_4863_801D_DFF3EA946B55" style="Mode=3;EOID=B652767C;SOID=8B6342C3;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EX=0;EY=15;SX=83;SY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=69:CY=14:OX=17:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=587:-109$1461:-109$1461:-415$;" subject="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF" style="Mode=3;EOID=0062DCF4;SOID=B0BAC890;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=0;EY=15;SX=83;SY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=69:CY=14:OX=17:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=587:-85$1461:-85$1461:-415$;" subject="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF" style="Mode=3;EOID=0062DCF4;SOID=B0BAC890;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;SCTR.LEFT=499;SCTR.TOP=-177;SCTR.RIGHT=573;SCTR.BOTTOM=-137;$LLB=;LLT=;LMT=;LMB=;LRT=CX=100:CY=14:OX=85:OY=-39:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=573:-175$573:-137$499:-137$499:-175$;" subject="EAID_7EE70932_F57C_4861_BE52_91F3F7270840" style="Mode=3;EOID=B0BAC890;SOID=B0BAC890;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=104;SY=0;EX=0;EY=27;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=608:-118$1405:-118$1405:-246$;" subject="EAID_F955E894_651A_4a8b_A411_E8DA312BC449" style="Mode=3;EOID=DEB89479;SOID=B0BAC890;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;EX=-27;EY=-18;SX=-27;SY=-18;$LLB=;LLT=;LMT=;LMB=;LRT=CX=146:CY=14:OX=75:OY=-15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_33EB6ABB_DB35_4b96_9E46_695F79EE21E5" style="Mode=3;EOID=B652767C;SOID=9AF536AF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-42;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=150:CY=14:OX=82:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=741:-647$485:-647$;" subject="EAID_F4410E27_20ED_475c_B079_4FE5372221E4" style="Mode=3;EOID=8B6342C3;SOID=9AF536AF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=60;SY=0;EX=0;EY=3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=-27:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=843:-270$;" subject="EAID_AEF23C3F_F74B_434a_AA2D_59AF706E79E6" style="Mode=3;EOID=DEB89479;SOID=9AF536AF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=4;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=152:CY=14:OX=84:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_774EE008_B895_41f1_B319_1174DD83D564" style="Mode=3;EOID=0FF36BBD;SOID=F98D6D43;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-73;SY=0;EX=0;EY=-43;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=710:-299$;" subject="EAID_05C9AA43_1AE1_4dbd_8080_CCC8C1824CB7" style="Mode=3;EOID=B0BAC890;SOID=9AF536AF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=2;SX=0;SY=-3;EX=5;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=52:OY=17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1219:-686$;" subject="EAID_4B36ABDE_C6FC_4a8d_93CA_CC7ACC63568D" style="Mode=3;EOID=950FA32A;SOID=64E74452;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-78;SY=0;EX=0;EY=-4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=155:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=705:-557$;" subject="EAID_9C96E83D_792B_44cd_BDF4_F589B6CAC7A1" style="Mode=3;EOID=85BAEF9C;SOID=9AF536AF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=84:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_67CCA39E_1E30_4142_9536_906052B9AABC" style="Mode=3;EOID=56DAAEAF;SOID=9AF536AF;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8B06B92A_4560_49c7_9EFF_FF8FC578D4D1" style="Mode=3;EOID=50368466;SOID=CDB81CBA;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=71;SY=0;EX=0;EY=7;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=93:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=854:-581$;" subject="EAID_17DACA2B_8A10_4516_8C96_D5EA3AE635E9" style="Mode=3;EOID=950FA32A;SOID=9AF536AF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=20;SY=0;EX=0;EY=2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=166:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=803:-681$;" subject="EAID_B6EB9836_FFEC_4652_9501_AB53057BAF53" style="Mode=3;EOID=64E74452;SOID=9AF536AF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=36;SY=0;EX=0;EY=-11;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=116:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=819:-171$;" subject="EAID_A1441146_4BC0_49e9_847D_7D2636FCB6FA" style="Mode=3;EOID=A7F3956C;SOID=9AF536AF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -25300,46 +27608,52 @@
 					<element geometry="EX=-27;EY=0;SX=0;SY=-14;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=105:CY=14:OX=60:OY=-16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=200:-602$;" subject="EAID_55771AD3_C775_4324_AEBA_EA277D05F7E8" style="Mode=3;EOID=0FF36BBD;SOID=950FA32A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=73:OY=16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_20732599_332F_4f0e_BFE6_593632EDB11F" style="Mode=3;EOID=0062DCF4;SOID=950FA32A;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;EX=75;EY=0;SX=0;SY=-32;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=42:OY=-13:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=302:-620$;" subject="EAID_608CC8C6_3A48_4541_8467_9DDA71E8D534" style="Mode=3;EOID=0FF36BBD;SOID=950FA32A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=60;SY=0;EX=0;EY=3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=-27:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=843:-270$;" subject="EAID_AEF23C3F_F74B_434a_AA2D_59AF706E79E6" style="Mode=3;EOID=DEB89479;SOID=9AF536AF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;SX=0;SY=-3;EX=5;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=52:OY=17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1219:-686$;" subject="EAID_4B36ABDE_C6FC_4a8d_93CA_CC7ACC63568D" style="Mode=3;EOID=950FA32A;SOID=64E74452;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_87A13B98_6E29_4694_AA8F_DE5A3705B3A2" style="Mode=3;EOID=895666D1;SOID=E340993A;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-73;SY=0;EX=0;EY=-43;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=710:-299$;" subject="EAID_05C9AA43_1AE1_4dbd_8080_CCC8C1824CB7" style="Mode=3;EOID=B0BAC890;SOID=9AF536AF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_A0AB8EC3_27DC_4836_9DDA_8F8D6021B5BF">
-				<model package="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" localID="453" owner="EAPK_C9E6BFC0_2905_4e67_986F_133338DDD7B1" tpos="8"/>
+				<model package="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" localID="453" owner="EAPK_62C803D9_1F9E_4da3_A181_F64426A1DB2B" tpos="8"/>
 				<properties name="completion notice relations" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-04-30 16:48:40" modified="2023-09-11 18:21:04"/>
+				<project author="andreea" version="1.0" created="2023-04-30 16:48:40" modified="2024-07-23 10:25:28"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=3D1A4C81;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=42CBCB68;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=234;Top=806;Right=472;Bottom=907;" subject="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" seqno="1" style="NSL=0;DUID=01868E67;"/>
-					<element geometry="Left=146;Top=695;Right=349;Bottom=775;" subject="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" seqno="2" style="NSL=0;DUID=2D137ADC;"/>
-					<element geometry="Left=39;Top=806;Right=213;Bottom=876;" subject="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" seqno="3" style="NSL=0;DUID=809303EF;"/>
-					<element geometry="Left=349;Top=398;Right=458;Bottom=432;" subject="EAID_BD2AF816_6D7A_4cf6_AD18_B2FA72E0240B" seqno="4" style="DUID=4048A809;"/>
-					<element geometry="Left=815;Top=193;Right=1088;Bottom=263;" subject="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" seqno="5" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=26506D2F;"/>
-					<element geometry="Left=188;Top=478;Right=314;Bottom=548;" subject="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" seqno="6" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=1DC70B9A;"/>
-					<element geometry="Left=872;Top=658;Right=1029;Bottom=707;" subject="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" seqno="7" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=230DD928;"/>
-					<element geometry="Left=865;Top=548;Right=1036;Bottom=610;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="8" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=34036C74;"/>
-					<element geometry="Left=902;Top=442;Right=1001;Bottom=503;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="9" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=BAE02C83;"/>
-					<element geometry="Left=166;Top=300;Right=337;Bottom=370;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" seqno="10" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=206042A6;"/>
-					<element geometry="Left=676;Top=727;Right=892;Bottom=812;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="11" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=917DDAF9;"/>
-					<element geometry="Left=812;Top=280;Right=1090;Bottom=391;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="12" style="DUID=2CA23E53;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=472;Top=313;Right=643;Bottom=357;" subject="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" seqno="13" style="DUID=18131C69;NSL=0;"/>
-					<element geometry="Left=166;Top=118;Right=411;Bottom=281;" subject="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" seqno="14" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=B45956DA;"/>
-					<element geometry="SX=26;SY=0;EX=0;EY=1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=166:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=583:-681$;" subject="EAID_9C6B2F1A_EF51_458e_A7C0_67100DC0E58E" style="Mode=3;EOID=230DD928;SOID=18131C69;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="Left=722;Top=136;Right=736;Bottom=150;" subject="EAID_E8E280AD_7469_4b14_ABEA_60317F90ACC4" seqno="1" style="DUID=537E556C;"/>
+					<element geometry="Left=723;Top=466;Right=737;Bottom=480;" subject="EAID_70B80546_7629_40c6_9316_F91D7B17B474" seqno="2" style="DUID=80E11EEF;"/>
+					<element geometry="Left=669;Top=166;Right=683;Bottom=180;" subject="EAID_74DCC56E_7AA8_41a1_80A0_62B66243936F" seqno="3" style="DUID=796AD16B;"/>
+					<element geometry="Left=668;Top=327;Right=682;Bottom=341;" subject="EAID_A854A4CB_76B3_4887_9781_EB2D19B4D00D" seqno="4" style="DUID=500309C0;"/>
+					<element geometry="Left=234;Top=806;Right=472;Bottom=907;" subject="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" seqno="5" style="NSL=0;DUID=01868E67;"/>
+					<element geometry="Left=146;Top=695;Right=349;Bottom=775;" subject="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" seqno="6" style="NSL=0;DUID=2D137ADC;"/>
+					<element geometry="Left=39;Top=806;Right=213;Bottom=876;" subject="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" seqno="7" style="NSL=0;DUID=809303EF;"/>
+					<element geometry="Left=349;Top=398;Right=458;Bottom=432;" subject="EAID_BD2AF816_6D7A_4cf6_AD18_B2FA72E0240B" seqno="8" style="DUID=4048A809;"/>
+					<element geometry="Left=815;Top=193;Right=1088;Bottom=263;" subject="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" seqno="9" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=26506D2F;"/>
+					<element geometry="Left=188;Top=478;Right=314;Bottom=548;" subject="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" seqno="10" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=1DC70B9A;"/>
+					<element geometry="Left=872;Top=658;Right=1029;Bottom=707;" subject="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" seqno="11" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=230DD928;"/>
+					<element geometry="Left=865;Top=548;Right=1036;Bottom=610;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="12" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=34036C74;"/>
+					<element geometry="Left=902;Top=442;Right=1001;Bottom=503;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="13" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=BAE02C83;"/>
+					<element geometry="Left=166;Top=300;Right=337;Bottom=370;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" seqno="14" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=206042A6;"/>
+					<element geometry="Left=676;Top=727;Right=892;Bottom=812;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="15" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=917DDAF9;"/>
+					<element geometry="Left=812;Top=280;Right=1090;Bottom=391;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="16" style="DUID=2CA23E53;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=472;Top=313;Right=643;Bottom=357;" subject="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" seqno="17" style="DUID=18131C69;NSL=0;"/>
+					<element geometry="Left=166;Top=118;Right=411;Bottom=281;" subject="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" seqno="18" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=B45956DA;"/>
+					<element geometry="SX=-50;SY=0;EX=0;EY=-2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=155:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=507:-515$;" subject="EAID_BBBA098A_C04A_4c7d_A8BE_2A965642DCD3" style="Mode=3;EOID=1DC70B9A;SOID=18131C69;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-3;SY=-1;EX=-3;EY=28;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=74:OY=16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_20732599_332F_4f0e_BFE6_593632EDB11F" style="Mode=3;EOID=BAE02C83;SOID=34036C74;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EX=0;EY=20;SX=0;SY=56;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=69:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1182:-143$1182:-452$;" subject="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF" style="Mode=3;EOID=BAE02C83;SOID=B45956DA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;SCTR.LEFT=287;SCTR.TOP=-134;SCTR.RIGHT=361;SCTR.BOTTOM=-94;$LLB=;LLT=;LMT=;LMB=;LRT=CX=100:CY=14:OX=89:OY=-24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=361:-118$361:-94$287:-94$287:-118$;" subject="EAID_7EE70932_F57C_4861_BE52_91F3F7270840" style="Mode=3;EOID=B45956DA;SOID=B45956DA;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EX=0;EY=9;SX=0;SY=26;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1149:-173$1149:-326$;" subject="EAID_F955E894_651A_4a8b_A411_E8DA312BC449" style="Mode=3;EOID=2CA23E53;SOID=B45956DA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=0;EY=9;SX=0;SY=26;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1148:-173$1148:-326$;" subject="EAID_F955E894_651A_4a8b_A411_E8DA312BC449" style="Mode=3;EOID=2CA23E53;SOID=B45956DA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-53;SY=0;EX=0;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=504:-201$;" subject="EAID_95EED5E2_B9B4_4812_B1E5_07E432421C63" style="Mode=3;EOID=B45956DA;SOID=18131C69;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=6;SY=0;EX=0;EY=-10;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=155:CY=14:OX=-9:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=563:-779$;" subject="EAID_1326915C_1564_403a_A96E_65DCEC3F641A" style="Mode=3;EOID=917DDAF9;SOID=18131C69;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F5AC099A_F1E0_4926_9F7B_6C2B6C33321B" style="Mode=3;EOID=2CA23E53;SOID=18131C69;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=1;EX=0;EY=1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F5AC099A_F1E0_4926_9F7B_6C2B6C33321B" style="Mode=3;EOID=2CA23E53;SOID=18131C69;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=44;SY=0;EX=0;EY=-10;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=116:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=601:-238$;" subject="EAID_2EC2BFAF_50AE_496d_A93E_27A2FA651CF4" style="Mode=3;EOID=26506D2F;SOID=18131C69;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=59;SY=0;EX=0;EY=-1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=69:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=616:-473$;" subject="EAID_3656734D_7238_4738_9F80_EC054ABA2E24" style="Mode=3;EOID=BAE02C83;SOID=18131C69;Color=-1;LWidth=0;TREE=OS;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=0;SY=0;EX=0;EY=-16;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=23:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1089:-769$1089:-488$;" subject="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7" style="Mode=3;EOID=BAE02C83;SOID=917DDAF9;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=44;SY=0;EX=0;EY=3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=93:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=601:-576$;" subject="EAID_DB36A935_6B61_49a0_A901_D1A6B9C4D5A7" style="Mode=3;EOID=34036C74;SOID=18131C69;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-23;SY=2;EX=55;EY=2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_2C3C6FFD_7F77_424c_B8A1_C090490D5878" style="Mode=3;EOID=2D137ADC;SOID=01868E67;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-50;SY=0;EX=0;EY=-2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=155:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=507:-515$;" subject="EAID_BBBA098A_C04A_4c7d_A8BE_2A965642DCD3" style="Mode=3;EOID=1DC70B9A;SOID=18131C69;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=26;SY=0;EX=0;EY=1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=166:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=583:-681$;" subject="EAID_9C6B2F1A_EF51_458e_A7C0_67100DC0E58E" style="Mode=3;EOID=230DD928;SOID=18131C69;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_73A6FC03_1825_4ec1_A784_BF1C55F72910" style="Mode=3;EOID=537E556C;SOID=80E11EEF;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=5;SY=10;EX=5;EY=10;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=74:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B82C6E19_FB7C_453e_9B40_0A74A0E00195" style="Mode=3;EOID=206042A6;SOID=18131C69;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=6;SY=-14;EX=6;EY=-14;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=84:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D19EA23B_3707_4f38_8E54_F2D9BE08A114" style="Mode=3;EOID=206042A6;SOID=18131C69;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-16;SY=0;EX=0;EY=20;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=122:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=541:-715$;" subject="EAID_6F34B051_9C2E_444e_83DD_D95F6EA9897B" style="Mode=3;EOID=2D137ADC;SOID=18131C69;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -25348,30 +27662,49 @@
 					<element geometry="SX=44;SY=0;EX=-77;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_7B3A32F2_68B4_4cca_AA0C_F4AAB1D0346B" style="Mode=3;EOID=2D137ADC;SOID=809303EF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9663763E_2F48_4952_926C_444F368462AA" style="Mode=3;EOID=01868E67;SOID=809303EF;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=238;SCTR.TOP=-712;SCTR.RIGHT=337;SCTR.BOTTOM=-657;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=337:-695$337:-657$238:-657$238:-695$;" subject="EAID_4C33CDC7_EDE9_461d_85E1_1ABB6B9E21EB" style="Mode=3;EOID=2D137ADC;SOID=2D137ADC;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SX=59;SY=0;EX=0;EY=-1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=69:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=616:-473$;" subject="EAID_3656734D_7238_4738_9F80_EC054ABA2E24" style="Mode=3;EOID=BAE02C83;SOID=18131C69;Color=-1;LWidth=0;TREE=OS;Hidden=0;"/>
+					<element geometry="SX=-23;SY=2;EX=55;EY=2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_2C3C6FFD_7F77_424c_B8A1_C090490D5878" style="Mode=3;EOID=2D137ADC;SOID=01868E67;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D85B5D9D_A0A9_4ed4_B03A_DD6F59C0BCAC" style="Mode=3;EOID=796AD16B;SOID=500309C0;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=44;SY=0;EX=0;EY=3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=93:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=601:-576$;" subject="EAID_DB36A935_6B61_49a0_A901_D1A6B9C4D5A7" style="Mode=3;EOID=34036C74;SOID=18131C69;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_1A0A7BB3_E871_4bc1_84D9_3203BA683A58">
 				<model package="EAPK_55622713_57C0_4aec_8ABA_05CE52DE1DE1" localID="473" owner="EAPK_55622713_57C0_4aec_8ABA_05CE52DE1DE1"/>
 				<properties name="premarket consultation notice" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-06-29 16:44:45" modified="2023-06-29 16:51:56"/>
+				<project author="andreea" version="1.0" created="2023-06-29 16:44:45" modified="2024-07-18 16:42:58"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=B2D43A4E;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=A2520EBD;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=326;Top=95;Right=494;Bottom=165;" subject="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03" seqno="1" style="DUID=80A40880;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=361;Top=229;Right=461;Bottom=284;" subject="EAID_53C53D83_424B_4038_AF6F_5B9C6F71226D" seqno="2" style="DUID=AB9F83A6;NSL=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=54:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=5:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_C0F50A97_3E33_43bb_8F4A_B5B2C763463B" style="Mode=3;EOID=AB9F83A6;SOID=80A40880;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="Left=821;Top=49;Right=936;Bottom=133;" subject="EAID_8633DF60_DBCB_4ca7_AA83_B82252A1F6D6" seqno="1" style="DUID=3734CD81;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=659;Top=394;Right=749;Bottom=444;" subject="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" seqno="2" style="DUID=27558D2D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=359;Top=394;Right=470;Bottom=442;" subject="EAID_F0DE3A34_0F67_47af_914A_82A0C222723C" seqno="3" style="DUID=63F4AAA2;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=111;Top=61;Right=201;Bottom=121;" subject="EAID_C07688A9_AAC8_4f60_A2CC_FA90C006C282" seqno="4" style="DUID=E04497FC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=659;Top=61;Right=749;Bottom=121;" subject="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A" seqno="5" style="DUID=D99BB4B9;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=292;Top=22;Right=537;Bottom=159;" subject="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" seqno="6" style="DUID=DE5FCDDF;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=350;Top=207;Right=478;Bottom=248;" subject="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" seqno="7" style="DUID=A9CA2797;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=330;Top=293;Right=498;Bottom=348;" subject="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03" seqno="8" style="DUID=80A40880;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=106;Top=293;Right=206;Bottom=348;" subject="EAID_53C53D83_424B_4038_AF6F_5B9C6F71226D" seqno="9" style="DUID=AB9F83A6;NSL=0;"/>
+					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6070C1A3_A5F5_4b53_9AAE_48C9E1FDC23C" style="Mode=3;EOID=D99BB4B9;SOID=3734CD81;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_765FB2B0_AE50_45c4_9615_1F0D6407D00D" style="Mode=3;EOID=D99BB4B9;SOID=27558D2D;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_23426D44_9964_443a_A184_0605456C2FEF" style="Mode=3;EOID=27558D2D;SOID=63F4AAA2;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_251F0F6E_D0B5_4304_8962_DC4613C4041F" style="Mode=3;EOID=80A40880;SOID=63F4AAA2;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F337974A_F4B7_4be6_BD98_F885B35FD24B" style="Mode=3;EOID=D99BB4B9;SOID=DE5FCDDF;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_6AA5ADDC_B303_41f6_A0B5_482CD2D1D30D" style="Mode=3;EOID=E04497FC;SOID=DE5FCDDF;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=527;SCTR.TOP=-35;SCTR.RIGHT=574;SCTR.BOTTOM=-6;$LLB=;LLT=;LMT=;LMB=;LRT=CX=100:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=537:-35$574:-35$574:-6$527:-6$527:-22$;" subject="EAID_7EE70932_F57C_4861_BE52_91F3F7270840" style="Mode=3;EOID=DE5FCDDF;SOID=DE5FCDDF;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9B54EEA9_42F0_4e42_A2F1_707153826314" style="Mode=3;EOID=DE5FCDDF;SOID=A9CA2797;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;EX=76;EY=2;SX=76;SY=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A1DC6D24_EABE_467c_80DC_91F8A4D3F0DE" style="Mode=3;EOID=DE5FCDDF;SOID=80A40880;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=3:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=5:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_C0F50A97_3E33_43bb_8F4A_B5B2C763463B" style="Mode=3;EOID=AB9F83A6;SOID=80A40880;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=10;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_47C1ECEB_898B_456c_9FC2_2463E88B2CE6" style="Mode=3;EOID=E04497FC;SOID=AB9F83A6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_1376593A_F78D_4947_97B8_405E8E14E9D8">
 				<model package="EAPK_2004EEE4_4246_4617_A3E8_7708D7302027" localID="132" owner="EAPK_2004EEE4_4246_4617_A3E8_7708D7302027"/>
 				<properties name="planning notices" type="Logical"/>
-				<project author="andreea" version="1.0" created="2021-12-09 11:59:04" modified="2023-09-11 18:21:26"/>
+				<project author="andreea" version="1.0" created="2021-12-09 11:59:04" modified="2024-07-23 10:26:15"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=FFBDE76B;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=4B8E071E;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
@@ -25383,11 +27716,11 @@
 					<element geometry="Left=599;Top=246;Right=689;Bottom=281;" subject="EAID_7B308DB7_0AC5_45c9_8E6F_0D46097D2C9C" seqno="5" style="DUID=D4B06842;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=299;Top=334;Right=389;Bottom=384;" subject="EAID_0D6BFEEC_649E_4c20_8CD2_0801F85D499E" seqno="6" style="DUID=CAF2DFA0;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=599;Top=334;Right=689;Bottom=384;" subject="EAID_0C95DCDD_128C_4045_8B05_B8D28E22ABB2" seqno="7" style="DUID=6F0FADED;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="SX=3;SY=0;EX=0;EY=-10;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A15F798A_231D_429f_8C16_9F9F412AC05A" style="Mode=3;EOID=3C88F842;SOID=D4B06842;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=43;SY=-7;EX=48;EY=-17;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A15F798A_231D_429f_8C16_9F9F412AC05A" style="Mode=3;EOID=3C88F842;SOID=D4B06842;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=56:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=5:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_CBED0009_2B25_4c2b_9E07_2DA712B0C3E2" style="Mode=3;EOID=6F0FADED;SOID=D4B06842;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=11;SY=0;EX=-120;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_DED553E4_8E73_4d32_88B6_1E31A0860DF8" style="Mode=3;EOID=3C88F842;SOID=DB9B4B45;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-1;SY=-3;EX=-132;EY=-3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_DED553E4_8E73_4d32_88B6_1E31A0860DF8" style="Mode=3;EOID=3C88F842;SOID=DB9B4B45;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=56:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=6:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F56EAE61_D5DE_4db5_B426_10C1FBCD992D" style="Mode=3;EOID=CAF2DFA0;SOID=DB9B4B45;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=9;SY=-1;EX=16;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_AF1D7C6F_AE8A_4b59_AB06_244F1F3F1AC2" style="Mode=3;EOID=3C88F842;SOID=144D6ADE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-3;SY=-4;EX=4;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_AF1D7C6F_AE8A_4b59_AB06_244F1F3F1AC2" style="Mode=3;EOID=3C88F842;SOID=144D6ADE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=58:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=5:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_13EDE5F0_D982_41fc_823C_F5D9AA3AB829" style="Mode=3;EOID=049A5B27;SOID=144D6ADE;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
@@ -25558,20 +27891,24 @@
 			<diagram xmi:id="EAID_A0F9C5CF_C3FB_4597_B7B1_88CE88245D50">
 				<model package="EAPK_823ACA8D_1707_4059_8C14_B89FD6B5DAD2" localID="133" owner="EAPK_823ACA8D_1707_4059_8C14_B89FD6B5DAD2"/>
 				<properties name="legal basis" type="Object"/>
-				<project author="andreea" version="1.0" created="2021-12-09 12:31:28" modified="2023-07-14 10:57:01"/>
+				<project author="andreea" version="1.0" created="2021-12-09 12:31:28" modified="2024-07-18 17:23:51"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=293E42C7;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=E14B2F5C;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=250;Top=189;Right=350;Bottom=244;" subject="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" seqno="1" style="DUID=A9F9C0FA;"/>
-					<element geometry="Left=108;Top=102;Right=208;Bottom=157;" subject="EAID_D6079364_9DE2_45de_9BAC_BE9D74F34B72" seqno="2" style="DUID=88C4ACF3;NSL=0;"/>
-					<element geometry="Left=108;Top=189;Right=208;Bottom=244;" subject="EAID_8E4FF705_88E9_4b3e_A98F_ACC159CC13C2" seqno="3" style="DUID=05EA6A5A;"/>
-					<element geometry="Left=535;Top=189;Right=635;Bottom=244;" subject="EAID_89668AB6_A244_441e_B851_9289BD4E15F3" seqno="4" style="DUID=30F69F23;"/>
-					<element geometry="Left=315;Top=98;Right=430;Bottom=160;" subject="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" seqno="5" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=FA6EF707;"/>
-					<element geometry="Left=393;Top=189;Right=493;Bottom=244;" subject="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" seqno="6" style="DUID=808D1D04;"/>
-					<element geometry="Left=535;Top=102;Right=635;Bottom=157;" subject="EAID_6C334A58_89F2_4d3e_98F6_902667A49E71" seqno="7" style="DUID=CDDF4279;NSL=0;"/>
+					<element geometry="Left=254;Top=294;Right=354;Bottom=349;" subject="EAID_C0E81714_CC78_4bd5_B8F5_31F967E74257" seqno="1" style="DUID=9C55CE2A;"/>
+					<element geometry="Left=400;Top=294;Right=500;Bottom=349;" subject="EAID_64AA7AC6_F248_4162_BC6F_4434B8DC0F67" seqno="2" style="DUID=24D3DB14;"/>
+					<element geometry="Left=108;Top=294;Right=208;Bottom=349;" subject="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" seqno="3" style="DUID=A9F9C0FA;"/>
+					<element geometry="Left=108;Top=102;Right=208;Bottom=157;" subject="EAID_D6079364_9DE2_45de_9BAC_BE9D74F34B72" seqno="4" style="DUID=88C4ACF3;NSL=0;"/>
+					<element geometry="Left=108;Top=189;Right=208;Bottom=244;" subject="EAID_8E4FF705_88E9_4b3e_A98F_ACC159CC13C2" seqno="5" style="DUID=05EA6A5A;"/>
+					<element geometry="Left=535;Top=189;Right=635;Bottom=244;" subject="EAID_89668AB6_A244_441e_B851_9289BD4E15F3" seqno="6" style="DUID=30F69F23;"/>
+					<element geometry="Left=312;Top=99;Right=427;Bottom=161;" subject="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" seqno="7" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=FA6EF707;"/>
+					<element geometry="Left=535;Top=294;Right=635;Bottom=349;" subject="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" seqno="8" style="DUID=808D1D04;"/>
+					<element geometry="Left=535;Top=102;Right=635;Bottom=157;" subject="EAID_6C334A58_89F2_4d3e_98F6_902667A49E71" seqno="9" style="DUID=CDDF4279;NSL=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_3452502E_9900_4175_9794_D484025607E7" style="Mode=3;EOID=FA6EF707;SOID=9C55CE2A;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=11;SY=-27;EX=16;EY=-27;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4F2CCAB3_E0D4_434a_869E_D874CC918E17" style="Mode=3;EOID=FA6EF707;SOID=24D3DB14;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_062347E1_F78F_43d5_ADE7_07C48E1E600D" style="Mode=3;EOID=FA6EF707;SOID=30F69F23;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8E647BBA_AE2A_4ca3_9144_41548E3A43AB" style="Mode=3;EOID=FA6EF707;SOID=808D1D04;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_3AC3215E_68C1_470f_880A_9FAE9B53D8B9" style="Mode=3;EOID=FA6EF707;SOID=A9F9C0FA;Color=-1;LWidth=0;Hidden=0;"/>
@@ -25581,68 +27918,80 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_5CEC90D5_CCA5_4575_80BB_5748E6187F9E">
-				<model package="EAPK_8B2689E9_AC38_4c4e_880C_C7FC553D1616" localID="157" owner="EAPK_8B2689E9_AC38_4c4e_880C_C7FC553D1616"/>
+				<model package="EAPK_F9A451BC_D24F_4ed4_8497_24F21DD2B6C3" localID="157" owner="EAPK_F9A451BC_D24F_4ed4_8497_24F21DD2B6C3"/>
 				<properties name="eFormsNotices" type="Logical"/>
-				<project author="andreea" version="1.0" created="2021-12-20 15:35:03" modified="2022-11-15 13:09:03"/>
+				<project author="andreea" version="1.0" created="2021-12-20 15:35:03" modified="2024-07-18 13:31:50"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=EF5B1A41;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=BC512895;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=19;Top=374;Right=150;Bottom=439;" subject="EAID_F5BD72AB_5FF0_48bc_9464_2B2F2DA07EF0" seqno="1" style="DUID=43EC0709;NSL=0;"/>
-					<element geometry="Left=370;Top=327;Right=465;Bottom=397;" subject="EAID_F4FA5525_AA4D_46bb_A4DB_AFA624268215" seqno="2" style="DUID=AF8BBFD1;NSL=0;"/>
-					<element geometry="Left=234;Top=468;Right=352;Bottom=533;" subject="EAID_E3E1C02A_989B_432d_9EDC_EB166766150C" seqno="3" style="DUID=C4B0322A;NSL=0;"/>
-					<element geometry="Left=625;Top=598;Right=810;Bottom=668;" subject="EAID_D70EAC9A_8725_48c8_81FB_7132B8627C6A" seqno="4" style="DUID=AC06A4CF;NSL=0;"/>
-					<element geometry="Left=829;Top=572;Right=1014;Bottom=642;" subject="EAID_D433A9D5_8DF2_427f_AA5C_AF579979A24B" seqno="5" style="DUID=373A4BC3;NSL=0;"/>
-					<element geometry="Left=288;Top=598;Right=408;Bottom=663;" subject="EAID_BFA7907E_8FB6_49ba_B11E_EBCC5F1EDA23" seqno="6" style="DUID=40DF8A6C;NSL=0;"/>
-					<element geometry="Left=234;Top=304;Right=336;Bottom=374;" subject="EAID_BE2F39AF_CFBF_4b97_A258_2F777FE65124" seqno="7" style="DUID=3A55C328;NSL=0;"/>
-					<element geometry="Left=822;Top=719;Right=925;Bottom=784;" subject="EAID_BDB13855_F3DD_4561_A018_D5E4E2B01404" seqno="8" style="DUID=17CAF6FD;NSL=0;"/>
-					<element geometry="Left=641;Top=471;Right=731;Bottom=549;" subject="EAID_B8491411_E302_450a_8C43_283BEAED93F3" seqno="9" style="DUID=D08FFB9A;NSL=0;"/>
-					<element geometry="Left=502;Top=471;Right=620;Bottom=536;" subject="EAID_B0688B55_49B2_4d49_B3A8_16E8DC1B426C" seqno="10" style="DUID=DABB1363;NSL=0;"/>
-					<element geometry="Left=691;Top=719;Right=794;Bottom=784;" subject="EAID_AA33DDB3_015E_422f_9700_767D093EA6DE" seqno="11" style="DUID=10F83805;NSL=0;"/>
-					<element geometry="Left=160;Top=713;Right=276;Bottom=778;" subject="EAID_961635DD_1E69_4907_B7A8_D2D05116023F" seqno="12" style="DUID=0DCE02C3;NSL=0;"/>
-					<element geometry="Left=1077;Top=300;Right=1187;Bottom=378;" subject="EAID_95A5493E_AB63_497a_B38E_96B488D39429" seqno="13" style="DUID=46CDADA2;NSL=0;"/>
-					<element geometry="Left=1124;Top=655;Right=1268;Bottom=720;" subject="EAID_9534CCE2_2925_49a9_8149_B4372990E2A4" seqno="14" style="DUID=F5619D03;NSL=0;"/>
-					<element geometry="Left=1031;Top=528;Right=1216;Bottom=598;" subject="EAID_92794986_A7F2_435b_97E1_C04AC81E72AA" seqno="15" style="DUID=5FCEA02E;NSL=0;"/>
-					<element geometry="Left=95;Top=149;Right=197;Bottom=219;" subject="EAID_8A9B11CE_AE42_4569_AC97_B7125F25083F" seqno="16" style="DUID=A584A1C7;NSL=0;"/>
-					<element geometry="Left=759;Top=304;Right=875;Bottom=374;" subject="EAID_85A3677C_D922_4169_BDDC_6D4FA8F74EE4" seqno="17" style="DUID=053D56AA;NSL=0;"/>
-					<element geometry="Left=36;Top=820;Right=182;Bottom=885;" subject="EAID_84FDBA35_4628_4956_AB0B_DC9B7C2BA31E" seqno="18" style="DUID=51A9194B;NSL=0;"/>
-					<element geometry="Left=762;Top=471;Right=872;Bottom=549;" subject="EAID_82F083DA_42A3_4d07_A10E_D0CBB81A811D" seqno="19" style="DUID=2FFA8E92;NSL=0;"/>
-					<element geometry="Left=424;Top=598;Right=609;Bottom=668;" subject="EAID_7D67416B_0D52_49d1_BBD8_A2EE61B6F060" seqno="20" style="DUID=E28148CF;NSL=0;"/>
-					<element geometry="Left=81;Top=458;Right=212;Bottom=523;" subject="EAID_7C815E00_5AB7_4221_9673_417A43FCEAF3" seqno="21" style="DUID=C096DFEF;NSL=0;"/>
-					<element geometry="Left=234;Top=820;Right=380;Bottom=885;" subject="EAID_78885FA2_A0A3_41bb_AB51_461D20C1E74E" seqno="22" style="DUID=A8121482;NSL=0;"/>
-					<element geometry="Left=514;Top=326;Right=609;Bottom=396;" subject="EAID_77B7A553_E803_4004_BBDD_E7E6A2ED7E06" seqno="23" style="DUID=E0B9565E;NSL=0;"/>
-					<element geometry="Left=542;Top=21;Right=632;Bottom=93;" subject="EAID_6C334A58_89F2_4d3e_98F6_902667A49E71" seqno="24" style="DUID=5528C12C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=639;Top=326;Right=734;Bottom=396;" subject="EAID_64AABC7B_6677_49c0_B157_A0A97128A458" seqno="25" style="DUID=A342D65A;NSL=0;"/>
-					<element geometry="Left=26;Top=663;Right=142;Bottom=728;" subject="EAID_61E6D7F3_02F4_4fe3_9A81_0609FB33A070" seqno="26" style="DUID=B196775D;NSL=0;"/>
-					<element geometry="Left=885;Top=422;Right=995;Bottom=500;" subject="EAID_60BE7698_3371_4fef_94A7_1536255B4CDF" seqno="27" style="DUID=7173051A;NSL=0;"/>
-					<element geometry="Left=424;Top=713;Right=540;Bottom=778;" subject="EAID_6019482D_1758_4997_9E94_54C4E5AD26F2" seqno="28" style="DUID=F11381D5;NSL=0;"/>
-					<element geometry="Left=150;Top=575;Right=270;Bottom=640;" subject="EAID_53B59A9E_0F19_4d91_A276_C93E14F56BF8" seqno="29" style="DUID=F74E5A39;NSL=0;"/>
-					<element geometry="Left=1131;Top=70;Right=1228;Bottom=148;" subject="EAID_53A92E92_9CAF_4d77_A25C_5BE7FADB130C" seqno="30" style="DUID=A86221F3;NSL=0;"/>
-					<element geometry="Left=535;Top=148;Right=639;Bottom=235;" subject="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" seqno="31" style="DUID=FC8BE297;"/>
-					<element geometry="Left=1131;Top=204;Right=1228;Bottom=282;" subject="EAID_459BFB03_27E6_42e5_814A_F4CDA161B12A" seqno="32" style="DUID=CA19E0DB;NSL=0;"/>
-					<element geometry="Left=444;Top=820;Right=590;Bottom=885;" subject="EAID_4280D6D9_1C83_445d_B9BA_C83F761767C3" seqno="33" style="DUID=B471D5C0;NSL=0;"/>
-					<element geometry="Left=961;Top=680;Right=1105;Bottom=745;" subject="EAID_406DCE49_EA4F_4aa6_BD32_93632614BD58" seqno="34" style="DUID=A63F1F1B;NSL=0;"/>
-					<element geometry="Left=1014;Top=393;Right=1124;Bottom=471;" subject="EAID_3FC83BCD_6B25_4180_B697_6D64E2AF9220" seqno="35" style="DUID=5EC4F93D;NSL=0;"/>
-					<element geometry="Left=961;Top=156;Right=1077;Bottom=226;" subject="EAID_378A0219_58F3_4bbb_A19B_0E19C7D6814B" seqno="36" style="DUID=A3901A9A;NSL=0;"/>
-					<element geometry="Left=373;Top=478;Right=491;Bottom=543;" subject="EAID_2A716878_4D7B_473c_A793_4F4CB4AAA00E" seqno="37" style="DUID=588EBADB;NSL=0;"/>
-					<element geometry="Left=290;Top=713;Right=406;Bottom=778;" subject="EAID_275E786B_A6CB_4f7d_8A46_523230F3EEE0" seqno="38" style="DUID=1E512EDC;NSL=0;"/>
-					<element geometry="Left=19;Top=533;Right=129;Bottom=611;" subject="EAID_1D9B79BD_930F_4444_8C1F_45A560037124" seqno="39" style="DUID=9F9F2678;NSL=0;"/>
-					<element geometry="Left=566;Top=713;Right=669;Bottom=778;" subject="EAID_1B4364F6_9CFF_4697_9C06_ACF3001ADED8" seqno="40" style="DUID=40D2CB66;NSL=0;"/>
-					<element geometry="Left=110;Top=244;Right=212;Bottom=314;" subject="EAID_0D9421F2_620D_43ab_BB41_193BFE8F5B8E" seqno="41" style="DUID=E7BF5D0E;NSL=0;"/>
-					<element geometry="Left=898;Top=245;Right=1014;Bottom=315;" subject="EAID_0A917C15_D52D_40b0_AD31_1089680BFBDF" seqno="42" style="DUID=1D796BE8;NSL=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_5D61F39C_18B6_46ae_8BB7_25602ED587F8" style="Mode=3;EOID=FC8BE297;SOID=1D796BE8;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="Left=816;Top=926;Right=932;Bottom=996;" subject="EAID_4B4AA994_6B56_421a_80D0_CE346536A2B9" seqno="1" style="DUID=6750A0FD;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=826;Top=818;Right=921;Bottom=888;" subject="EAID_20A35C8C_4895_4aef_AE94_63C59C948D5D" seqno="2" style="DUID=6BA05AA6;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=649;Top=926;Right=757;Bottom=996;" subject="EAID_137272D3_D36E_4bc8_BB25_DB95F670222F" seqno="3" style="DUID=6A72B995;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=982;Top=926;Right=1085;Bottom=996;" subject="EAID_B93F6450_B2DC_42d5_AB43_7ACC411B4F0F" seqno="4" style="DUID=030C84A7;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1138;Top=818;Right=1254;Bottom=888;" subject="EAID_1A622AA7_D176_418b_84D4_6FB3AAC4A4F9" seqno="5" style="DUID=CE3F9E23;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=978;Top=818;Right=1088;Bottom=888;" subject="EAID_12A00248_5E3C_489e_88B4_ABEF21E72261" seqno="6" style="DUID=05AC3D4B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1130;Top=926;Right=1261;Bottom=996;" subject="EAID_B6AAD0B0_AC78_46dd_A2BB_15ABCBF61F8B" seqno="7" style="DUID=E3D78E44;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=625;Top=818;Right=780;Bottom=888;" subject="EAID_F0DE3A34_0F67_47af_914A_82A0C222723C" seqno="8" style="DUID=E5F136FE;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=19;Top=374;Right=150;Bottom=439;" subject="EAID_F5BD72AB_5FF0_48bc_9464_2B2F2DA07EF0" seqno="9" style="DUID=43EC0709;NSL=0;"/>
+					<element geometry="Left=370;Top=327;Right=465;Bottom=397;" subject="EAID_F4FA5525_AA4D_46bb_A4DB_AFA624268215" seqno="10" style="DUID=AF8BBFD1;NSL=0;"/>
+					<element geometry="Left=234;Top=468;Right=352;Bottom=533;" subject="EAID_E3E1C02A_989B_432d_9EDC_EB166766150C" seqno="11" style="DUID=C4B0322A;NSL=0;"/>
+					<element geometry="Left=625;Top=598;Right=810;Bottom=668;" subject="EAID_D70EAC9A_8725_48c8_81FB_7132B8627C6A" seqno="12" style="DUID=AC06A4CF;NSL=0;"/>
+					<element geometry="Left=829;Top=572;Right=1014;Bottom=642;" subject="EAID_D433A9D5_8DF2_427f_AA5C_AF579979A24B" seqno="13" style="DUID=373A4BC3;NSL=0;"/>
+					<element geometry="Left=288;Top=598;Right=408;Bottom=663;" subject="EAID_BFA7907E_8FB6_49ba_B11E_EBCC5F1EDA23" seqno="14" style="DUID=40DF8A6C;NSL=0;"/>
+					<element geometry="Left=234;Top=304;Right=336;Bottom=374;" subject="EAID_BE2F39AF_CFBF_4b97_A258_2F777FE65124" seqno="15" style="DUID=3A55C328;NSL=0;"/>
+					<element geometry="Left=822;Top=719;Right=925;Bottom=784;" subject="EAID_BDB13855_F3DD_4561_A018_D5E4E2B01404" seqno="16" style="DUID=17CAF6FD;NSL=0;"/>
+					<element geometry="Left=641;Top=471;Right=731;Bottom=549;" subject="EAID_B8491411_E302_450a_8C43_283BEAED93F3" seqno="17" style="DUID=D08FFB9A;NSL=0;"/>
+					<element geometry="Left=502;Top=471;Right=620;Bottom=536;" subject="EAID_B0688B55_49B2_4d49_B3A8_16E8DC1B426C" seqno="18" style="DUID=DABB1363;NSL=0;"/>
+					<element geometry="Left=691;Top=719;Right=794;Bottom=784;" subject="EAID_AA33DDB3_015E_422f_9700_767D093EA6DE" seqno="19" style="DUID=10F83805;NSL=0;"/>
+					<element geometry="Left=160;Top=713;Right=276;Bottom=778;" subject="EAID_961635DD_1E69_4907_B7A8_D2D05116023F" seqno="20" style="DUID=0DCE02C3;NSL=0;"/>
+					<element geometry="Left=1077;Top=300;Right=1187;Bottom=378;" subject="EAID_95A5493E_AB63_497a_B38E_96B488D39429" seqno="21" style="DUID=46CDADA2;NSL=0;"/>
+					<element geometry="Left=1124;Top=655;Right=1268;Bottom=720;" subject="EAID_9534CCE2_2925_49a9_8149_B4372990E2A4" seqno="22" style="DUID=F5619D03;NSL=0;"/>
+					<element geometry="Left=1031;Top=528;Right=1216;Bottom=598;" subject="EAID_92794986_A7F2_435b_97E1_C04AC81E72AA" seqno="23" style="DUID=5FCEA02E;NSL=0;"/>
+					<element geometry="Left=95;Top=149;Right=197;Bottom=219;" subject="EAID_8A9B11CE_AE42_4569_AC97_B7125F25083F" seqno="24" style="DUID=A584A1C7;NSL=0;"/>
+					<element geometry="Left=759;Top=304;Right=875;Bottom=374;" subject="EAID_85A3677C_D922_4169_BDDC_6D4FA8F74EE4" seqno="25" style="DUID=053D56AA;NSL=0;"/>
+					<element geometry="Left=36;Top=820;Right=182;Bottom=885;" subject="EAID_84FDBA35_4628_4956_AB0B_DC9B7C2BA31E" seqno="26" style="DUID=51A9194B;NSL=0;"/>
+					<element geometry="Left=762;Top=471;Right=872;Bottom=549;" subject="EAID_82F083DA_42A3_4d07_A10E_D0CBB81A811D" seqno="27" style="DUID=2FFA8E92;NSL=0;"/>
+					<element geometry="Left=424;Top=598;Right=609;Bottom=668;" subject="EAID_7D67416B_0D52_49d1_BBD8_A2EE61B6F060" seqno="28" style="DUID=E28148CF;NSL=0;"/>
+					<element geometry="Left=81;Top=458;Right=212;Bottom=523;" subject="EAID_7C815E00_5AB7_4221_9673_417A43FCEAF3" seqno="29" style="DUID=C096DFEF;NSL=0;"/>
+					<element geometry="Left=234;Top=820;Right=380;Bottom=885;" subject="EAID_78885FA2_A0A3_41bb_AB51_461D20C1E74E" seqno="30" style="DUID=A8121482;NSL=0;"/>
+					<element geometry="Left=514;Top=326;Right=609;Bottom=396;" subject="EAID_77B7A553_E803_4004_BBDD_E7E6A2ED7E06" seqno="31" style="DUID=E0B9565E;NSL=0;"/>
+					<element geometry="Left=542;Top=21;Right=632;Bottom=93;" subject="EAID_6C334A58_89F2_4d3e_98F6_902667A49E71" seqno="32" style="DUID=5528C12C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=639;Top=326;Right=734;Bottom=396;" subject="EAID_64AABC7B_6677_49c0_B157_A0A97128A458" seqno="33" style="DUID=A342D65A;NSL=0;"/>
+					<element geometry="Left=26;Top=663;Right=142;Bottom=728;" subject="EAID_61E6D7F3_02F4_4fe3_9A81_0609FB33A070" seqno="34" style="DUID=B196775D;NSL=0;"/>
+					<element geometry="Left=885;Top=422;Right=995;Bottom=500;" subject="EAID_60BE7698_3371_4fef_94A7_1536255B4CDF" seqno="35" style="DUID=7173051A;NSL=0;"/>
+					<element geometry="Left=424;Top=713;Right=540;Bottom=778;" subject="EAID_6019482D_1758_4997_9E94_54C4E5AD26F2" seqno="36" style="DUID=F11381D5;NSL=0;"/>
+					<element geometry="Left=150;Top=575;Right=270;Bottom=640;" subject="EAID_53B59A9E_0F19_4d91_A276_C93E14F56BF8" seqno="37" style="DUID=F74E5A39;NSL=0;"/>
+					<element geometry="Left=1131;Top=70;Right=1228;Bottom=148;" subject="EAID_53A92E92_9CAF_4d77_A25C_5BE7FADB130C" seqno="38" style="DUID=A86221F3;NSL=0;"/>
+					<element geometry="Left=535;Top=148;Right=639;Bottom=235;" subject="EAID_4737DEE6_2CB8_48c4_A1D8_8A1EED71D647" seqno="39" style="DUID=FC8BE297;"/>
+					<element geometry="Left=1131;Top=204;Right=1228;Bottom=282;" subject="EAID_459BFB03_27E6_42e5_814A_F4CDA161B12A" seqno="40" style="DUID=CA19E0DB;NSL=0;"/>
+					<element geometry="Left=444;Top=820;Right=590;Bottom=885;" subject="EAID_4280D6D9_1C83_445d_B9BA_C83F761767C3" seqno="41" style="DUID=B471D5C0;NSL=0;"/>
+					<element geometry="Left=961;Top=680;Right=1105;Bottom=745;" subject="EAID_406DCE49_EA4F_4aa6_BD32_93632614BD58" seqno="42" style="DUID=A63F1F1B;NSL=0;"/>
+					<element geometry="Left=1014;Top=393;Right=1124;Bottom=471;" subject="EAID_3FC83BCD_6B25_4180_B697_6D64E2AF9220" seqno="43" style="DUID=5EC4F93D;NSL=0;"/>
+					<element geometry="Left=961;Top=156;Right=1077;Bottom=226;" subject="EAID_378A0219_58F3_4bbb_A19B_0E19C7D6814B" seqno="44" style="DUID=A3901A9A;NSL=0;"/>
+					<element geometry="Left=373;Top=478;Right=491;Bottom=543;" subject="EAID_2A716878_4D7B_473c_A793_4F4CB4AAA00E" seqno="45" style="DUID=588EBADB;NSL=0;"/>
+					<element geometry="Left=290;Top=713;Right=406;Bottom=778;" subject="EAID_275E786B_A6CB_4f7d_8A46_523230F3EEE0" seqno="46" style="DUID=1E512EDC;NSL=0;"/>
+					<element geometry="Left=19;Top=533;Right=129;Bottom=611;" subject="EAID_1D9B79BD_930F_4444_8C1F_45A560037124" seqno="47" style="DUID=9F9F2678;NSL=0;"/>
+					<element geometry="Left=566;Top=713;Right=669;Bottom=778;" subject="EAID_1B4364F6_9CFF_4697_9C06_ACF3001ADED8" seqno="48" style="DUID=40D2CB66;NSL=0;"/>
+					<element geometry="Left=110;Top=244;Right=212;Bottom=314;" subject="EAID_0D9421F2_620D_43ab_BB41_193BFE8F5B8E" seqno="49" style="DUID=E7BF5D0E;NSL=0;"/>
+					<element geometry="Left=898;Top=245;Right=1014;Bottom=315;" subject="EAID_0A917C15_D52D_40b0_AD31_1089680BFBDF" seqno="50" style="DUID=1D796BE8;NSL=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_7ABAC75A_602C_4c25_AA82_DB17674831F6" style="Mode=3;EOID=FC8BE297;SOID=43EC0709;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6B3143BA_4F2F_4588_9069_661C90DA98AA" style="Mode=3;EOID=FC8BE297;SOID=A86221F3;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_304C7D59_B4A0_4e72_A037_B9430918E947" style="Mode=3;EOID=FC8BE297;SOID=CA19E0DB;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_5F7A4A22_8891_4306_8497_C6A0E6A1DF10" style="Mode=3;EOID=FC8BE297;SOID=46CDADA2;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F0888087_8EC5_44da_993B_5E066A10CCF9" style="Mode=3;EOID=FC8BE297;SOID=5EC4F93D;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A1F15800_0C40_46da_8C06_C88509A7ADAE" style="Mode=3;EOID=FC8BE297;SOID=7173051A;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_DAA1840F_3F32_4a86_956C_70B806F38B9A" style="Mode=3;EOID=FC8BE297;SOID=2FFA8E92;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BB107D66_398C_4fff_9B95_9DDAEFE54292" style="Mode=3;EOID=FC8BE297;SOID=D08FFB9A;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6CD94385_E981_431b_A7A8_96CEBBA34430" style="Mode=3;EOID=FC8BE297;SOID=DABB1363;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_0BDDE5E5_5E2D_438f_900E_43985FC6F4D3" style="Mode=3;EOID=FC8BE297;SOID=588EBADB;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_287B91EE_C9D0_4b5a_B824_CA7FBF189C7D" style="Mode=3;EOID=FC8BE297;SOID=C4B0322A;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_88411C51_17C6_4b79_B119_259EE8D70E63" style="Mode=3;EOID=FC8BE297;SOID=C096DFEF;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_60240524_13B2_46c0_9B7B_4607821ACD3D" style="Mode=3;EOID=FC8BE297;SOID=B196775D;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_88411C51_17C6_4b79_B119_259EE8D70E63" style="Mode=3;EOID=FC8BE297;SOID=C096DFEF;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8D822444_2ABC_4032_ACDA_D8B62A04195A" style="Mode=3;EOID=FC8BE297;SOID=40DF8A6C;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_2CB2CFE5_7A21_4a1d_B422_A7E2EF4D9832" style="Mode=3;EOID=FC8BE297;SOID=A3901A9A;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_304C7D59_B4A0_4e72_A037_B9430918E947" style="Mode=3;EOID=FC8BE297;SOID=CA19E0DB;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_5D61F39C_18B6_46ae_8BB7_25602ED587F8" style="Mode=3;EOID=FC8BE297;SOID=1D796BE8;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_726794CC_9E6F_4ef1_90FE_E09A19EA8365" style="Mode=3;EOID=FC8BE297;SOID=053D56AA;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D0FFBE63_C48C_4d65_9C41_4399E6C4FC47" style="Mode=3;EOID=FC8BE297;SOID=A342D65A;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6095DC52_29EC_44bb_8960_5273E4E77A46" style="Mode=3;EOID=FC8BE297;SOID=E0B9565E;Color=-1;LWidth=0;Hidden=0;"/>
@@ -25651,179 +28000,207 @@
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_FD4092C9_3AC0_4623_B5FC_71A5A27CDC31" style="Mode=3;EOID=FC8BE297;SOID=E7BF5D0E;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_842C0275_F355_41a9_91B7_C5C86D5DEC39" style="Mode=3;EOID=FC8BE297;SOID=A584A1C7;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=136:CY=14:OX=76:OY=24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D4E69FBD_0972_491c_89CA_686B0CAFECBF" style="Mode=3;EOID=5528C12C;SOID=FC8BE297;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_7ABAC75A_602C_4c25_AA82_DB17674831F6" style="Mode=3;EOID=FC8BE297;SOID=43EC0709;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_CD75AD4C_9D67_425c_9AF5_104892C66F82" style="Mode=3;EOID=FC8BE297;SOID=5FCEA02E;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_287B91EE_C9D0_4b5a_B824_CA7FBF189C7D" style="Mode=3;EOID=FC8BE297;SOID=C4B0322A;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_93FD0771_35EB_41f8_8A61_A6C3C9EF8A1D" style="Mode=3;EOID=FC8BE297;SOID=17CAF6FD;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_10DA1E5E_EB3E_4f82_AB74_84EC9AB0AF8D" style="Mode=3;EOID=FC8BE297;SOID=6BA05AA6;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_AF8B2993_D45B_4d65_BCC9_641769FA2898" style="Mode=3;EOID=FC8BE297;SOID=6A72B995;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8CD40BAD_1B19_4e5e_B3AC_E2C7CB4138B9" style="Mode=3;EOID=FC8BE297;SOID=030C84A7;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D150D8BA_9E5C_46d7_88B7_B524DAE70854" style="Mode=3;EOID=FC8BE297;SOID=CE3F9E23;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_25F1119B_B9A1_4e00_81DE_AB87104E2971" style="Mode=3;EOID=FC8BE297;SOID=05AC3D4B;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6589DF3C_F8AF_4060_9294_0DA799BDC3D9" style="Mode=3;EOID=FC8BE297;SOID=E3D78E44;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_CE524DE2_7EA2_4088_82A8_10147B85EC4A" style="Mode=3;EOID=FC8BE297;SOID=E5F136FE;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_2B3454E9_DDE4_4458_B276_3E5F1210A7CC" style="Mode=3;EOID=FC8BE297;SOID=B471D5C0;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_958ED0F3_DFB5_4b75_8BA3_B0DFD962D332" style="Mode=3;EOID=FC8BE297;SOID=A8121482;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BB097A39_C442_4e37_80B3_72438C82C716" style="Mode=3;EOID=FC8BE297;SOID=51A9194B;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_CD99C8BD_DC6F_4d30_8016_828165F11C86" style="Mode=3;EOID=FC8BE297;SOID=F5619D03;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_EC3728E7_47FB_4acd_A724_594C5E16EEAA" style="Mode=3;EOID=FC8BE297;SOID=9F9F2678;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D8F5A0A7_8441_4207_B3AA_82C96EDCD5CD" style="Mode=3;EOID=FC8BE297;SOID=A63F1F1B;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_93FD0771_35EB_41f8_8A61_A6C3C9EF8A1D" style="Mode=3;EOID=FC8BE297;SOID=17CAF6FD;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_DDFD9DA4_A0FD_4feb_B02F_A6F4616B8667" style="Mode=3;EOID=FC8BE297;SOID=F74E5A39;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B08538A4_702A_4149_8C5D_43CDF93181B9" style="Mode=3;EOID=FC8BE297;SOID=10F83805;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_FEC07492_3985_45dd_9577_8726D2245F60" style="Mode=3;EOID=FC8BE297;SOID=40D2CB66;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_882F7772_3F8D_4698_81C0_4EA85548792A" style="Mode=3;EOID=FC8BE297;SOID=F11381D5;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F0888087_8EC5_44da_993B_5E066A10CCF9" style="Mode=3;EOID=FC8BE297;SOID=5EC4F93D;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4CC6B937_BF6E_4d00_A537_FAD85DD7FBD4" style="Mode=3;EOID=FC8BE297;SOID=1E512EDC;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_84CB7ABD_1AEF_47ce_A6E5_919F4F518F2D" style="Mode=3;EOID=FC8BE297;SOID=0DCE02C3;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_5F7A4A22_8891_4306_8497_C6A0E6A1DF10" style="Mode=3;EOID=FC8BE297;SOID=46CDADA2;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_CD75AD4C_9D67_425c_9AF5_104892C66F82" style="Mode=3;EOID=FC8BE297;SOID=5FCEA02E;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_EE95B6A9_B1E7_412d_BF99_92791E20F841" style="Mode=3;EOID=FC8BE297;SOID=373A4BC3;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_32AD8089_28D6_47cb_9FA7_18640C746901" style="Mode=3;EOID=FC8BE297;SOID=AC06A4CF;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_E5DF6970_5414_4f87_B0D8_BC329006B679" style="Mode=3;EOID=FC8BE297;SOID=E28148CF;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8D822444_2ABC_4032_ACDA_D8B62A04195A" style="Mode=3;EOID=FC8BE297;SOID=40DF8A6C;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_DDFD9DA4_A0FD_4feb_B02F_A6F4616B8667" style="Mode=3;EOID=FC8BE297;SOID=F74E5A39;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_EC3728E7_47FB_4acd_A724_594C5E16EEAA" style="Mode=3;EOID=FC8BE297;SOID=9F9F2678;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6B3143BA_4F2F_4588_9069_661C90DA98AA" style="Mode=3;EOID=FC8BE297;SOID=A86221F3;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_2B3454E9_DDE4_4458_B276_3E5F1210A7CC" style="Mode=3;EOID=FC8BE297;SOID=B471D5C0;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4CC6B937_BF6E_4d00_A537_FAD85DD7FBD4" style="Mode=3;EOID=FC8BE297;SOID=1E512EDC;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_DDE54F6E_927C_4aa6_A9DE_D600878A0184" style="Mode=3;EOID=FC8BE297;SOID=6750A0FD;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_CD99C8BD_DC6F_4d30_8016_828165F11C86" style="Mode=3;EOID=FC8BE297;SOID=F5619D03;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_FABAECA6_C004_4da5_A405_DEF53DCEAD55">
 				<model package="EAPK_6970E353_92B6_44dc_8D54_27EE50616607" localID="142" owner="EAPK_6970E353_92B6_44dc_8D54_27EE50616607"/>
 				<properties name="planning subtype notices" type="Logical"/>
-				<project author="andreea" version="1.0" created="2021-12-10 12:56:37" modified="2022-12-15 14:32:40"/>
+				<project author="andreea" version="1.0" created="2021-12-10 12:56:37" modified="2024-07-18 17:30:17"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=1;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=F4C7A21D;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=EB027157;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=260;Top=629;Right=350;Bottom=679;" subject="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" seqno="1" style="DUID=6BC46043;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=460;Top=415;Right=550;Bottom=450;" subject="EAID_F4FA5525_AA4D_46bb_A4DB_AFA624268215" seqno="2" style="DUID=AD7F27D6;"/>
-					<element geometry="Left=343;Top=415;Right=433;Bottom=450;" subject="EAID_BE2F39AF_CFBF_4b97_A258_2F777FE65124" seqno="3" style="DUID=D9E7AABF;"/>
-					<element geometry="Left=403;Top=134;Right=493;Bottom=204;" subject="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" seqno="4" style="DUID=6728EEDF;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=577;Top=275;Right=667;Bottom=345;" subject="EAID_A31D0982_B460_4636_82B7_C2AF2C92D0B7" seqno="5" style="DUID=7496CB0D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=226;Top=274;Right=316;Bottom=344;" subject="EAID_9A9E6106_6655_4d55_9343_6884F40C1496" seqno="6" style="DUID=EB922E56;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=109;Top=415;Right=199;Bottom=450;" subject="EAID_8A9B11CE_AE42_4569_AC97_B7125F25083F" seqno="7" style="DUID=7405BA2E;"/>
-					<element geometry="Left=874;Top=504;Right=964;Bottom=554;" subject="EAID_89668AB6_A244_441e_B851_9289BD4E15F3" seqno="8" style="DUID=BBAA95AE;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=811;Top=415;Right=901;Bottom=450;" subject="EAID_85A3677C_D922_4169_BDDC_6D4FA8F74EE4" seqno="9" style="DUID=83A279E6;"/>
-					<element geometry="Left=928;Top=275;Right=1018;Bottom=345;" subject="EAID_7B308DB7_0AC5_45c9_8E6F_0D46097D2C9C" seqno="10" style="DUID=B28B84FC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=577;Top=415;Right=667;Bottom=450;" subject="EAID_77B7A553_E803_4004_BBDD_E7E6A2ED7E06" seqno="11" style="DUID=7CC48493;"/>
-					<element geometry="Left=518;Top=579;Right=608;Bottom=629;" subject="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" seqno="12" style="DUID=DC234C82;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=694;Top=415;Right=784;Bottom=450;" subject="EAID_64AABC7B_6677_49c0_B157_A0A97128A458" seqno="13" style="DUID=78B5FD3C;"/>
-					<element geometry="Left=518;Top=747;Right=725;Bottom=841;" subject="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" seqno="14" style="DUID=292BD732;NSL=0;"/>
-					<element geometry="Left=1045;Top=415;Right=1135;Bottom=450;" subject="EAID_378A0219_58F3_4bbb_A19B_0E19C7D6814B" seqno="15" style="DUID=4A948E73;"/>
-					<element geometry="Left=226;Top=415;Right=316;Bottom=450;" subject="EAID_0D9421F2_620D_43ab_BB41_193BFE8F5B8E" seqno="16" style="DUID=91B3C4DF;"/>
-					<element geometry="Left=928;Top=415;Right=1018;Bottom=450;" subject="EAID_0A917C15_D52D_40b0_AD31_1089680BFBDF" seqno="17" style="DUID=6DA79067;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_EB529402_EAC3_46fb_846D_2858010D4357" style="Mode=3;EOID=B28B84FC;SOID=6DA79067;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=18;SY=0;EX=0;EY=-10;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-33:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=406:-539$;" subject="EAID_DF4E84B8_BC53_457a_9B19_5424EE0DD512" style="Mode=3;EOID=BBAA95AE;SOID=D9E7AABF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-5;SY=0;EX=0;EY=21;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-27:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=383:-773$;" subject="EAID_182C7BFF_7991_4a8e_AA3B_C4F232F7574F" style="Mode=3;EOID=292BD732;SOID=D9E7AABF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4D75816A_997C_42ba_AC94_51FB591352A8" style="Mode=3;EOID=7496CB0D;SOID=AD7F27D6;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-42;SY=0;EX=0;EY=17;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=463:-637$;" subject="EAID_EA81BC08_9517_4e13_B65C_903E3691CA96" style="Mode=3;EOID=6BC46043;SOID=AD7F27D6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-27;SY=0;EX=0;EY=39;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=4:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=23:OY=-26:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=478:-755$;" subject="EAID_D134E775_11C7_4793_8C65_7C72BF9EF936" style="Mode=3;EOID=292BD732;SOID=AD7F27D6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_81C15491_9561_4a4b_B24C_6B2EC6A04EE7" style="Mode=3;EOID=7496CB0D;SOID=7CC48493;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-35;SY=0;EX=33;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=42:OY=-15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_BE01D9C1_FCF1_4ee6_95CC_76D95D51FD8A" style="Mode=3;EOID=DC234C82;SOID=7CC48493;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=30;SY=-8;EX=44;EY=-6;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=53:OY=-16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_FB2BB349_DFDB_4132_89B8_9848E326CEF8" style="Mode=3;EOID=292BD732;SOID=7CC48493;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="Left=1530;Top=757;Right=1620;Bottom=807;" subject="EAID_C0E81714_CC78_4bd5_B8F5_31F967E74257" seqno="1" style="DUID=6B23B82C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=547;Top=167;Right=792;Bottom=294;" subject="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" seqno="2" style="DUID=183573D6;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1552;Top=613;Right=1642;Bottom=648;" subject="EAID_4B4AA994_6B56_421a_80D0_CE346536A2B9" seqno="3" style="DUID=2FB4BE98;"/>
+					<element geometry="Left=1056;Top=613;Right=1146;Bottom=648;" subject="EAID_20A35C8C_4895_4aef_AE94_63C59C948D5D" seqno="4" style="DUID=D2E4E3BE;"/>
+					<element geometry="Left=202;Top=613;Right=292;Bottom=648;" subject="EAID_F0DE3A34_0F67_47af_914A_82A0C222723C" seqno="5" style="DUID=C5DE2917;"/>
+					<element geometry="Left=162;Top=472;Right=331;Bottom=542;" subject="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03" seqno="6" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=E5A674F8;"/>
+					<element geometry="Left=482;Top=827;Right=572;Bottom=877;" subject="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" seqno="7" style="DUID=6BC46043;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=682;Top=613;Right=772;Bottom=648;" subject="EAID_F4FA5525_AA4D_46bb_A4DB_AFA624268215" seqno="8" style="DUID=AD7F27D6;"/>
+					<element geometry="Left=565;Top=613;Right=655;Bottom=648;" subject="EAID_BE2F39AF_CFBF_4b97_A258_2F777FE65124" seqno="9" style="DUID=D9E7AABF;"/>
+					<element geometry="Left=625;Top=332;Right=715;Bottom=402;" subject="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" seqno="10" style="DUID=6728EEDF;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=857;Top=472;Right=947;Bottom=542;" subject="EAID_A31D0982_B460_4636_82B7_C2AF2C92D0B7" seqno="11" style="DUID=7496CB0D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=448;Top=472;Right=538;Bottom=542;" subject="EAID_9A9E6106_6655_4d55_9343_6884F40C1496" seqno="12" style="DUID=EB922E56;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=331;Top=613;Right=421;Bottom=648;" subject="EAID_8A9B11CE_AE42_4569_AC97_B7125F25083F" seqno="13" style="DUID=7405BA2E;"/>
+					<element geometry="Left=1261;Top=702;Right=1351;Bottom=752;" subject="EAID_89668AB6_A244_441e_B851_9289BD4E15F3" seqno="14" style="DUID=BBAA95AE;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1198;Top=613;Right=1288;Bottom=648;" subject="EAID_85A3677C_D922_4169_BDDC_6D4FA8F74EE4" seqno="15" style="DUID=83A279E6;"/>
+					<element geometry="Left=1364;Top=472;Right=1454;Bottom=542;" subject="EAID_7B308DB7_0AC5_45c9_8E6F_0D46097D2C9C" seqno="16" style="DUID=B28B84FC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=799;Top=613;Right=889;Bottom=648;" subject="EAID_77B7A553_E803_4004_BBDD_E7E6A2ED7E06" seqno="17" style="DUID=7CC48493;"/>
+					<element geometry="Left=740;Top=777;Right=830;Bottom=827;" subject="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" seqno="18" style="DUID=DC234C82;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=916;Top=613;Right=1006;Bottom=648;" subject="EAID_64AABC7B_6677_49c0_B157_A0A97128A458" seqno="19" style="DUID=78B5FD3C;"/>
+					<element geometry="Left=740;Top=945;Right=947;Bottom=1097;" subject="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E" seqno="20" style="DUID=292BD732;NSL=0;"/>
+					<element geometry="Left=1432;Top=613;Right=1522;Bottom=648;" subject="EAID_378A0219_58F3_4bbb_A19B_0E19C7D6814B" seqno="21" style="DUID=4A948E73;"/>
+					<element geometry="Left=448;Top=613;Right=538;Bottom=648;" subject="EAID_0D9421F2_620D_43ab_BB41_193BFE8F5B8E" seqno="22" style="DUID=91B3C4DF;"/>
+					<element geometry="Left=1315;Top=613;Right=1405;Bottom=648;" subject="EAID_0A917C15_D52D_40b0_AD31_1089680BFBDF" seqno="23" style="DUID=6DA79067;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8DDCEAA8_CB1F_4102_A652_453D48B0CA7E" style="Mode=3;EOID=7496CB0D;SOID=78B5FD3C;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-18;SY=0;EX=0;EY=10;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-12:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=721:-519$;" subject="EAID_26E5CF31_436C_4888_86C4_34506B53F655" style="Mode=3;EOID=BBAA95AE;SOID=78B5FD3C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=42;SY=0;EX=0;EY=31;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-5:OY=-10:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=5:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=781:-763$;" subject="EAID_4A3E5F63_E2CC_4dde_A0D3_9DE895E13057" style="Mode=3;EOID=292BD732;SOID=78B5FD3C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_DE1E6E6D_F92C_4af1_B5E3_EDE10941DF91" style="Mode=3;EOID=B28B84FC;SOID=83A279E6;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9EF7739E_6DEB_48cc_98DC_87BEB2186702" style="Mode=3;EOID=EB922E56;SOID=D9E7AABF;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=1;SY=0;EX=0;EY=14;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=19:OY=23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=857:-780$;" subject="EAID_7861D5F9_24A5_4cdc_8C15_332EAC4B3904" style="Mode=3;EOID=292BD732;SOID=83A279E6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-34;SY=0;EX=0;EY=-4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-27:OY=20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=237:-798$;" subject="EAID_00420D59_9F5A_4c97_A1E8_B94BF00B0FD7" style="Mode=3;EOID=292BD732;SOID=91B3C4DF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=7;SY=0;EX=0;EY=-5;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=6:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=980:-609$;" subject="EAID_BAEF6C8B_1B54_420b_8605_0C705EEC1EF5" style="Mode=3;EOID=DC234C82;SOID=6DA79067;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=25;SY=0;EX=0;EY=-11;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=26:OY=19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=998:-805$;" subject="EAID_6C23590C_DC5E_499c_8A1F_9A3D6F23B10A" style="Mode=3;EOID=292BD732;SOID=6DA79067;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=25;SY=0;EX=0;EY=-16;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=26:OY=19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1385:-1037$;" subject="EAID_6C23590C_DC5E_499c_8A1F_9A3D6F23B10A" style="Mode=3;EOID=292BD732;SOID=6DA79067;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=7;SY=0;EX=0;EY=-5;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=6:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1367:-807$;" subject="EAID_BAEF6C8B_1B54_420b_8605_0C705EEC1EF5" style="Mode=3;EOID=DC234C82;SOID=6DA79067;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_EB529402_EAC3_46fb_846D_2858010D4357" style="Mode=3;EOID=B28B84FC;SOID=6DA79067;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=9;SY=0;EX=0;EY=10;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=19:OY=23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1252:-1011$;" subject="EAID_7861D5F9_24A5_4cdc_8C15_332EAC4B3904" style="Mode=3;EOID=292BD732;SOID=83A279E6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-28;SY=0;EX=0;EY=-14;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-3:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1215:-866$;" subject="EAID_FA04F438_FBFD_4a53_B663_E08B34100639" style="Mode=3;EOID=6BC46043;SOID=83A279E6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_DE1E6E6D_F92C_4af1_B5E3_EDE10941DF91" style="Mode=3;EOID=B28B84FC;SOID=83A279E6;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-13;SY=0;EX=0;EY=-2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=6:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1464:-729$;" subject="EAID_E24F0453_58DF_4fce_8815_666C9CD92900" style="Mode=3;EOID=BBAA95AE;SOID=4A948E73;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-18;SY=0;EX=0;EY=10;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-12:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=943:-717$;" subject="EAID_26E5CF31_436C_4888_86C4_34506B53F655" style="Mode=3;EOID=BBAA95AE;SOID=78B5FD3C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=26;SY=0;EX=0;EY=-36;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=24:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1503:-1057$;" subject="EAID_BD4D35AF_F4C0_470f_B185_99AC7779C464" style="Mode=3;EOID=292BD732;SOID=4A948E73;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=30;SY=-8;EX=44;EY=-6;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=53:OY=-16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_FB2BB349_DFDB_4132_89B8_9848E326CEF8" style="Mode=3;EOID=292BD732;SOID=7CC48493;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-35;SY=0;EX=33;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=42:OY=-15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_BE01D9C1_FCF1_4ee6_95CC_76D95D51FD8A" style="Mode=3;EOID=DC234C82;SOID=7CC48493;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_81C15491_9561_4a4b_B24C_6B2EC6A04EE7" style="Mode=3;EOID=7496CB0D;SOID=7CC48493;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-27;SY=0;EX=0;EY=61;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=4:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-13:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=700:-960$;" subject="EAID_D134E775_11C7_4793_8C65_7C72BF9EF936" style="Mode=3;EOID=292BD732;SOID=AD7F27D6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-42;SY=0;EX=0;EY=17;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=685:-835$;" subject="EAID_EA81BC08_9517_4e13_B65C_903E3691CA96" style="Mode=3;EOID=6BC46043;SOID=AD7F27D6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4D75816A_997C_42ba_AC94_51FB591352A8" style="Mode=3;EOID=7496CB0D;SOID=AD7F27D6;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-5;SY=0;EX=0;EY=34;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-27:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=605:-987$;" subject="EAID_182C7BFF_7991_4a8e_AA3B_C4F232F7574F" style="Mode=3;EOID=292BD732;SOID=D9E7AABF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=18;SY=0;EX=0;EY=-10;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-33:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=628:-737$;" subject="EAID_DF4E84B8_BC53_457a_9B19_5424EE0DD512" style="Mode=3;EOID=BBAA95AE;SOID=D9E7AABF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=42;SY=0;EX=0;EY=61;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=4:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=16:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1003:-960$;" subject="EAID_4A3E5F63_E2CC_4dde_A0D3_9DE895E13057" style="Mode=3;EOID=292BD732;SOID=78B5FD3C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=10;SY=0;EX=0;EY=-2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-21:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=503:-804$;" subject="EAID_30880E95_E936_44d6_9434_FF80603A8059" style="Mode=3;EOID=DC234C82;SOID=91B3C4DF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-9;SY=-3;EX=-9;EY=-3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=39:OY=-21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_22448738_74AC_444e_AA46_30FE9C0CC404" style="Mode=3;EOID=6B23B82C;SOID=2FB4BE98;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=34;SY=0;EX=0;EY=-65;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=21:OY=20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1631:-1086$;" subject="EAID_09317411_46CE_4072_BBAE_0E80F1DB23E4" style="Mode=3;EOID=292BD732;SOID=2FB4BE98;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C0AEC9E0_776E_47ad_B97E_C65FBB995AB7" style="Mode=3;EOID=B28B84FC;SOID=2FB4BE98;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=1;SY=0;EX=0;EY=39;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=24:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1102:-982$;" subject="EAID_F7FF5756_985F_42b8_B881_CE0D3C6C7822" style="Mode=3;EOID=292BD732;SOID=D2E4E3BE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_093A00FE_8C02_46c0_BF3D_F4067DB0161C" style="Mode=3;EOID=7496CB0D;SOID=D2E4E3BE;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=-50;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-32:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=247:-1071$;" subject="EAID_23426D44_9964_443a_A184_0605456C2FEF" style="Mode=3;EOID=292BD732;SOID=C5DE2917;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_251F0F6E_D0B5_4304_8962_DC4613C4041F" style="Mode=3;EOID=E5A674F8;SOID=C5DE2917;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A2552EE8_A41E_4e28_8C74_B27EB1903597" style="Mode=3;EOID=B28B84FC;SOID=4A948E73;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-13;SY=0;EX=0;EY=-2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=6:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1077:-531$;" subject="EAID_E24F0453_58DF_4fce_8815_666C9CD92900" style="Mode=3;EOID=BBAA95AE;SOID=4A948E73;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=21;SY=0;EX=0;EY=-38;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=24:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1111:-832$;" subject="EAID_BD4D35AF_F4C0_470f_B185_99AC7779C464" style="Mode=3;EOID=292BD732;SOID=4A948E73;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_DED553E4_8E73_4d32_88B6_1E31A0860DF8" style="Mode=3;EOID=6728EEDF;SOID=EB922E56;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_AF1D7C6F_AE8A_4b59_AB06_244F1F3F1AC2" style="Mode=3;EOID=6728EEDF;SOID=7496CB0D;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=-3;SY=0;EX=0;EY=7;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=970:-162$;" subject="EAID_A15F798A_231D_429f_8C16_9F9F412AC05A" style="Mode=3;EOID=6728EEDF;SOID=B28B84FC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_CAC4CAAF_63BE_4b47_B408_7E03688C16F5" style="Mode=3;EOID=EB922E56;SOID=7405BA2E;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=11;SY=0;EX=0;EY=2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-11:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=165:-652$;" subject="EAID_7FB6A525_A2DF_472e_B640_44782AAB984C" style="Mode=3;EOID=6BC46043;SOID=7405BA2E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-28;SY=0;EX=0;EY=-28;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-21:OY=23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-4:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=126:-822$;" subject="EAID_D6275E44_62A9_4afe_B5B5_A66923BD84D9" style="Mode=3;EOID=292BD732;SOID=7405BA2E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-34;SY=0;EX=0;EY=5;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-27:OY=20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=459:-1016$;" subject="EAID_00420D59_9F5A_4c97_A1E8_B94BF00B0FD7" style="Mode=3;EOID=292BD732;SOID=91B3C4DF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=769;SCTR.TOP=-176;SCTR.RIGHT=829;SCTR.BOTTOM=-138;$LLB=;LLT=;LMT=;LMB=;LRT=CX=100:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=792:-176$829:-176$829:-138$769:-138$769:-167$;" subject="EAID_7EE70932_F57C_4861_BE52_91F3F7270840" style="Mode=3;EOID=183573D6;SOID=183573D6;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6A26342D_C219_4a74_826C_BAAB2EAB7049" style="Mode=3;EOID=EB922E56;SOID=91B3C4DF;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=10;SY=0;EX=0;EY=-2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-21:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=281:-606$;" subject="EAID_30880E95_E936_44d6_9434_FF80603A8059" style="Mode=3;EOID=DC234C82;SOID=91B3C4DF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-28;SY=0;EX=0;EY=-14;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-3:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=828:-668$;" subject="EAID_FA04F438_FBFD_4a53_B663_E08B34100639" style="Mode=3;EOID=6BC46043;SOID=83A279E6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-28;SY=0;EX=0;EY=-21;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-21:OY=23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-4:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=348:-1042$;" subject="EAID_D6275E44_62A9_4afe_B5B5_A66923BD84D9" style="Mode=3;EOID=292BD732;SOID=7405BA2E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=11;SY=0;EX=0;EY=2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-11:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=387:-850$;" subject="EAID_7FB6A525_A2DF_472e_B640_44782AAB984C" style="Mode=3;EOID=6BC46043;SOID=7405BA2E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_CAC4CAAF_63BE_4b47_B408_7E03688C16F5" style="Mode=3;EOID=EB922E56;SOID=7405BA2E;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-3;SY=0;EX=0;EY=7;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1406:-360$;" subject="EAID_A15F798A_231D_429f_8C16_9F9F412AC05A" style="Mode=3;EOID=6728EEDF;SOID=B28B84FC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_AF1D7C6F_AE8A_4b59_AB06_244F1F3F1AC2" style="Mode=3;EOID=6728EEDF;SOID=7496CB0D;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9B54EEA9_42F0_4e42_A2F1_707153826314" style="Mode=3;EOID=183573D6;SOID=6728EEDF;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_DED553E4_8E73_4d32_88B6_1E31A0860DF8" style="Mode=3;EOID=6728EEDF;SOID=EB922E56;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-5;SY=0;EX=0;EY=6;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=241:-224$;" subject="EAID_A1DC6D24_EABE_467c_80DC_91F8A4D3F0DE" style="Mode=3;EOID=183573D6;SOID=E5A674F8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_311D2286_4C4E_48f9_9977_FFFC1F14ED9A">
 				<model package="EAPK_B67F8633_2079_4127_BD4D_86B7F8DBC6AA" localID="140" owner="EAPK_B67F8633_2079_4127_BD4D_86B7F8DBC6AA"/>
 				<properties name="competition subtype notices" type="Logical"/>
-				<project author="andreea" version="1.0" created="2021-12-10 10:40:42" modified="2023-09-11 18:22:43"/>
+				<project author="andreea" version="1.0" created="2021-12-10 10:40:42" modified="2024-07-18 17:26:31"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=1;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=D96A6B3D;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=701E7F83;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=495;Top=653;Right=585;Bottom=738;" subject="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" seqno="1" style="DUID=9AF2E3F1;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=26;Top=405;Right=116;Bottom=440;" subject="EAID_F5BD72AB_5FF0_48bc_9464_2B2F2DA07EF0" seqno="2" style="DUID=555FE596;"/>
-					<element geometry="Left=260;Top=405;Right=350;Bottom=440;" subject="EAID_E3E1C02A_989B_432d_9EDC_EB166766150C" seqno="3" style="DUID=585658C1;"/>
-					<element geometry="Left=1605;Top=270;Right=1695;Bottom=340;" subject="EAID_C2B5E2C0_38FA_484b_A696_E3B22916E927" seqno="4" style="DUID=5968FC20;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=611;Top=270;Right=701;Bottom=340;" subject="EAID_C04A3529_BA24_4b09_BA1E_34917AA6433D" seqno="5" style="DUID=594A1898;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1664;Top=406;Right=1754;Bottom=441;" subject="EAID_BFA7907E_8FB6_49ba_B11E_EBCC5F1EDA23" seqno="6" style="DUID=9A4320C4;"/>
-					<element geometry="Left=611;Top=406;Right=701;Bottom=441;" subject="EAID_B8491411_E302_450a_8C43_283BEAED93F3" seqno="7" style="DUID=73CB6CF8;"/>
-					<element geometry="Left=494;Top=406;Right=584;Bottom=441;" subject="EAID_B0688B55_49B2_4d49_B3A8_16E8DC1B426C" seqno="8" style="DUID=02F9C20F;"/>
-					<element geometry="Left=89;Top=270;Right=186;Bottom=361;" subject="EAID_A055DBBD_DFB0_481c_8A60_5F8E32E52187" seqno="9" style="DUID=D7DD6A02;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1079;Top=406;Right=1169;Bottom=441;" subject="EAID_95A5493E_AB63_497a_B38E_96B488D39429" seqno="10" style="DUID=B51EEB64;"/>
-					<element geometry="Left=494;Top=492;Right=584;Bottom=577;" subject="EAID_8E4FF705_88E9_4b3e_A98F_ACC159CC13C2" seqno="11" style="DUID=866BD2AD;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1028;Top=755;Right=1118;Bottom=840;" subject="EAID_89668AB6_A244_441e_B851_9289BD4E15F3" seqno="12" style="DUID=9232A3E7;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=728;Top=406;Right=818;Bottom=441;" subject="EAID_82F083DA_42A3_4d07_A10E_D0CBB81A811D" seqno="13" style="DUID=633FA994;"/>
-					<element geometry="Left=143;Top=405;Right=233;Bottom=440;" subject="EAID_7C815E00_5AB7_4221_9673_417A43FCEAF3" seqno="14" style="DUID=17D0A2CD;"/>
-					<element geometry="Left=771;Top=936;Right=941;Bottom=1045;" subject="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" seqno="15" style="DUID=F9341F43;NSL=0;"/>
-					<element geometry="Left=872;Top=577;Right=962;Bottom=662;" subject="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" seqno="16" style="DUID=1D811E2F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=845;Top=406;Right=935;Bottom=441;" subject="EAID_60BE7698_3371_4fef_94A7_1536255B4CDF" seqno="17" style="DUID=C0D0529C;"/>
-					<element geometry="Left=898;Top=270;Right=988;Bottom=340;" subject="EAID_5DE4BBA5_24F3_4e6e_823C_BFF3401A979F" seqno="18" style="DUID=BCE1ED2B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=377;Top=270;Right=474;Bottom=340;" subject="EAID_592715F4_D66A_4a87_928F_BD5CC2C2E681" seqno="19" style="DUID=FC22784B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1547;Top=406;Right=1637;Bottom=441;" subject="EAID_53B59A9E_0F19_4d91_A276_C93E14F56BF8" seqno="20" style="DUID=649FFE4F;"/>
-					<element geometry="Left=1313;Top=406;Right=1403;Bottom=441;" subject="EAID_53A92E92_9CAF_4d77_A25C_5BE7FADB130C" seqno="21" style="DUID=2C5EF2BC;"/>
-					<element geometry="Left=1430;Top=270;Right=1520;Bottom=340;" subject="EAID_4E444B8E_FC46_42b6_9A28_4F03AE4B456A" seqno="22" style="DUID=91116F0A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1196;Top=406;Right=1286;Bottom=441;" subject="EAID_459BFB03_27E6_42e5_814A_F4CDA161B12A" seqno="23" style="DUID=FBEC0711;"/>
-					<element geometry="Left=962;Top=406;Right=1052;Bottom=441;" subject="EAID_3FC83BCD_6B25_4180_B697_6D64E2AF9220" seqno="24" style="DUID=B258F855;"/>
-					<element geometry="Left=1248;Top=270;Right=1338;Bottom=340;" subject="EAID_33778168_3AF6_4d83_B03E_875438FD6EAC" seqno="25" style="DUID=C51838C8;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=377;Top=406;Right=467;Bottom=441;" subject="EAID_2A716878_4D7B_473c_A793_4F4CB4AAA00E" seqno="26" style="DUID=51297B6D;"/>
-					<element geometry="Left=1430;Top=406;Right=1520;Bottom=441;" subject="EAID_1D9B79BD_930F_4444_8C1F_45A560037124" seqno="27" style="DUID=97B2E7E1;"/>
-					<element geometry="Left=891;Top=111;Right=995;Bottom=181;" subject="EAID_17662AEF_1321_446a_AE42_0583F7417A79" seqno="28" style="DUID=D6BBDFA9;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="SX=-20;SY=0;EX=0;EY=-25;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-22:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=168:-1015$;" subject="EAID_49BC96B7_CB04_420a_9BBB_86D95D89F26A" style="Mode=3;EOID=F9341F43;SOID=17D0A2CD;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=-2;SY=34;EX=-44;EY=-31;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_77A997B5_6993_4de4_82CE_ED5F7075A3D5" style="Mode=3;EOID=D6BBDFA9;SOID=594A1898;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-8;SY=0;EX=0;EY=49;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-18:OY=19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=648:-941$;" subject="EAID_A7D7A61A_07D4_482e_BB2D_248727FBEE52" style="Mode=3;EOID=F9341F43;SOID=73CB6CF8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=26;SY=0;EX=0;EY=-28;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-21:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=682:-647$;" subject="EAID_CAD36783_38AE_42d4_83B1_9E47694F0AEC" style="Mode=3;EOID=1D811E2F;SOID=73CB6CF8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="Left=213;Top=493;Right=303;Bottom=543;" subject="EAID_64AA7AC6_F248_4162_BC6F_4434B8DC0F67" seqno="1" style="DUID=8CE72904;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1459;Top=373;Right=1549;Bottom=408;" subject="EAID_12A00248_5E3C_489e_88B4_ABEF21E72261" seqno="2" style="DUID=8F933255;"/>
+					<element geometry="Left=169;Top=372;Right=259;Bottom=407;" subject="EAID_B6AAD0B0_AC78_46dd_A2BB_15ABCBF61F8B" seqno="3" style="DUID=D00BD971;"/>
+					<element geometry="Left=759;Top=620;Right=849;Bottom=705;" subject="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" seqno="4" style="DUID=9AF2E3F1;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=290;Top=372;Right=380;Bottom=407;" subject="EAID_F5BD72AB_5FF0_48bc_9464_2B2F2DA07EF0" seqno="5" style="DUID=555FE596;"/>
+					<element geometry="Left=524;Top=372;Right=614;Bottom=407;" subject="EAID_E3E1C02A_989B_432d_9EDC_EB166766150C" seqno="6" style="DUID=585658C1;"/>
+					<element geometry="Left=1980;Top=237;Right=2070;Bottom=307;" subject="EAID_C2B5E2C0_38FA_484b_A696_E3B22916E927" seqno="7" style="DUID=5968FC20;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=875;Top=237;Right=965;Bottom=307;" subject="EAID_C04A3529_BA24_4b09_BA1E_34917AA6433D" seqno="8" style="DUID=594A1898;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=2039;Top=373;Right=2129;Bottom=408;" subject="EAID_BFA7907E_8FB6_49ba_B11E_EBCC5F1EDA23" seqno="9" style="DUID=9A4320C4;"/>
+					<element geometry="Left=875;Top=373;Right=965;Bottom=408;" subject="EAID_B8491411_E302_450a_8C43_283BEAED93F3" seqno="10" style="DUID=73CB6CF8;"/>
+					<element geometry="Left=758;Top=373;Right=848;Bottom=408;" subject="EAID_B0688B55_49B2_4d49_B3A8_16E8DC1B426C" seqno="11" style="DUID=02F9C20F;"/>
+					<element geometry="Left=286;Top=237;Right=383;Bottom=307;" subject="EAID_A055DBBD_DFB0_481c_8A60_5F8E32E52187" seqno="12" style="DUID=D7DD6A02;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1343;Top=373;Right=1433;Bottom=408;" subject="EAID_95A5493E_AB63_497a_B38E_96B488D39429" seqno="13" style="DUID=B51EEB64;"/>
+					<element geometry="Left=758;Top=459;Right=848;Bottom=544;" subject="EAID_8E4FF705_88E9_4b3e_A98F_ACC159CC13C2" seqno="14" style="DUID=866BD2AD;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1292;Top=722;Right=1382;Bottom=807;" subject="EAID_89668AB6_A244_441e_B851_9289BD4E15F3" seqno="15" style="DUID=9232A3E7;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=992;Top=373;Right=1082;Bottom=408;" subject="EAID_82F083DA_42A3_4d07_A10E_D0CBB81A811D" seqno="16" style="DUID=633FA994;"/>
+					<element geometry="Left=407;Top=372;Right=497;Bottom=407;" subject="EAID_7C815E00_5AB7_4221_9673_417A43FCEAF3" seqno="17" style="DUID=17D0A2CD;"/>
+					<element geometry="Left=1035;Top=903;Right=1205;Bottom=1067;" subject="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC" seqno="18" style="DUID=F9341F43;NSL=0;"/>
+					<element geometry="Left=1136;Top=544;Right=1226;Bottom=629;" subject="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" seqno="19" style="DUID=1D811E2F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1109;Top=373;Right=1199;Bottom=408;" subject="EAID_60BE7698_3371_4fef_94A7_1536255B4CDF" seqno="20" style="DUID=C0D0529C;"/>
+					<element geometry="Left=1162;Top=237;Right=1252;Bottom=307;" subject="EAID_5DE4BBA5_24F3_4e6e_823C_BFF3401A979F" seqno="21" style="DUID=BCE1ED2B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=641;Top=237;Right=738;Bottom=307;" subject="EAID_592715F4_D66A_4a87_928F_BD5CC2C2E681" seqno="22" style="DUID=FC22784B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1922;Top=373;Right=2012;Bottom=408;" subject="EAID_53B59A9E_0F19_4d91_A276_C93E14F56BF8" seqno="23" style="DUID=649FFE4F;"/>
+					<element geometry="Left=1688;Top=373;Right=1778;Bottom=408;" subject="EAID_53A92E92_9CAF_4d77_A25C_5BE7FADB130C" seqno="24" style="DUID=2C5EF2BC;"/>
+					<element geometry="Left=1805;Top=237;Right=1895;Bottom=307;" subject="EAID_4E444B8E_FC46_42b6_9A28_4F03AE4B456A" seqno="25" style="DUID=91116F0A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1571;Top=373;Right=1661;Bottom=408;" subject="EAID_459BFB03_27E6_42e5_814A_F4CDA161B12A" seqno="26" style="DUID=FBEC0711;"/>
+					<element geometry="Left=1226;Top=373;Right=1316;Bottom=408;" subject="EAID_3FC83BCD_6B25_4180_B697_6D64E2AF9220" seqno="27" style="DUID=B258F855;"/>
+					<element geometry="Left=1623;Top=237;Right=1713;Bottom=307;" subject="EAID_33778168_3AF6_4d83_B03E_875438FD6EAC" seqno="28" style="DUID=C51838C8;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=641;Top=373;Right=731;Bottom=408;" subject="EAID_2A716878_4D7B_473c_A793_4F4CB4AAA00E" seqno="29" style="DUID=51297B6D;"/>
+					<element geometry="Left=1805;Top=373;Right=1895;Bottom=408;" subject="EAID_1D9B79BD_930F_4444_8C1F_45A560037124" seqno="30" style="DUID=97B2E7E1;"/>
+					<element geometry="Left=1155;Top=78;Right=1259;Bottom=148;" subject="EAID_17662AEF_1321_446a_AE42_0583F7417A79" seqno="31" style="DUID=D6BBDFA9;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_635AB80A_45DC_4f79_9E2E_1DD18A71FEAA" style="Mode=3;EOID=FC22784B;SOID=585658C1;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=28;SY=-9;EX=-49;EY=50;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=47:OY=-18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B162EE79_7E6B_4e0b_A728_4F6A0B8B3C8F" style="Mode=3;EOID=F9341F43;SOID=633FA994;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=1;SY=0;EX=0;EY=23;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=22:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1038:-639$;" subject="EAID_F64371A9_69A9_42ed_8203_ABADAC735C19" style="Mode=3;EOID=9AF2E3F1;SOID=633FA994;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9E65DE1F_9426_4db1_A52E_0256EDE56D0B" style="Mode=3;EOID=594A1898;SOID=73CB6CF8;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-9;SY=0;EX=0;EY=67;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-18:OY=19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=911:-918$;" subject="EAID_A7D7A61A_07D4_482e_BB2D_248727FBEE52" style="Mode=3;EOID=F9341F43;SOID=73CB6CF8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=26;SY=0;EX=0;EY=-28;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-21:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=946:-614$;" subject="EAID_CAD36783_38AE_42d4_83B1_9E47694F0AEC" style="Mode=3;EOID=1D811E2F;SOID=73CB6CF8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_2B6E93DB_190C_4441_86EA_27A080A75820" style="Mode=3;EOID=FC22784B;SOID=02F9C20F;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=-4;EX=0;EY=33;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-29:OY=19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=475:-427$475:-957$;" subject="EAID_D9B0F2BE_BBAE_4748_9D1C_4962C84B5FF6" style="Mode=3;EOID=F9341F43;SOID=02F9C20F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-4;EX=0;EY=44;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-29:OY=19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=739:-394$739:-941$;" subject="EAID_D9B0F2BE_BBAE_4748_9D1C_4962C84B5FF6" style="Mode=3;EOID=F9341F43;SOID=02F9C20F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=42:OY=-18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_FA228CBB_BF55_48ad_AB67_DC0C864CEE43" style="Mode=3;EOID=866BD2AD;SOID=02F9C20F;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4E457C38_9393_4661_ACF1_4A847DD828B4" style="Mode=3;EOID=FC22784B;SOID=51297B6D;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-25;SY=0;EX=0;EY=14;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-31:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=397:-976$;" subject="EAID_816FEADA_9E37_4958_91D4_3991E8968B23" style="Mode=3;EOID=F9341F43;SOID=51297B6D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=1;SY=0;EX=0;EY=1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-23:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=423:-618$;" subject="EAID_BBF21AB4_820E_42a4_A4A8_80A1D9EEA78F" style="Mode=3;EOID=1D811E2F;SOID=51297B6D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-13;SY=0;EX=0;EY=-7;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-20:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=292:-997$;" subject="EAID_45B5738D_C570_4834_8D2E_727F543D2A9D" style="Mode=3;EOID=F9341F43;SOID=585658C1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=1;SY=0;EX=0;EY=23;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=22:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=774:-672$;" subject="EAID_F64371A9_69A9_42ed_8203_ABADAC735C19" style="Mode=3;EOID=9AF2E3F1;SOID=633FA994;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_635AB80A_45DC_4f79_9E2E_1DD18A71FEAA" style="Mode=3;EOID=FC22784B;SOID=585658C1;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=28;SY=-9;EX=-49;EY=50;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=47:OY=-18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B162EE79_7E6B_4e0b_A728_4F6A0B8B3C8F" style="Mode=3;EOID=F9341F43;SOID=633FA994;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-24;SY=0;EX=0;EY=24;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-31:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=662:-961$;" subject="EAID_816FEADA_9E37_4958_91D4_3991E8968B23" style="Mode=3;EOID=F9341F43;SOID=51297B6D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=1;SY=0;EX=0;EY=1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-23:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=687:-585$;" subject="EAID_BBF21AB4_820E_42a4_A4A8_80A1D9EEA78F" style="Mode=3;EOID=1D811E2F;SOID=51297B6D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-2;SY=34;EX=-44;EY=-31;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_77A997B5_6993_4de4_82CE_ED5F7075A3D5" style="Mode=3;EOID=D6BBDFA9;SOID=594A1898;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=2;SY=0;EX=0;EY=16;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-12:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=571:-646$;" subject="EAID_E83907E3_1D56_4a9b_811D_CC6B095ED05E" style="Mode=3;EOID=9AF2E3F1;SOID=585658C1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-42;SY=0;EX=-2;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=49:OY=-40:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_FB55E0C5_D63F_497b_8941_D0694C121639" style="Mode=3;EOID=F9341F43;SOID=C0D0529C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-19;SY=0;EX=0;EY=-19;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-22:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=433:-1004$;" subject="EAID_49BC96B7_CB04_420a_9BBB_86D95D89F26A" style="Mode=3;EOID=F9341F43;SOID=17D0A2CD;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_76F210FA_5489_47b7_8FD9_2F861B44B724" style="Mode=3;EOID=D7DD6A02;SOID=17D0A2CD;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-2;SY=0;EX=0;EY=25;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-8:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=186:-594$;" subject="EAID_E43DD256_3301_4c14_B0D2_7E09533694D7" style="Mode=3;EOID=1D811E2F;SOID=17D0A2CD;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=16;SY=0;EX=0;EY=-48;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-28:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=87:-1038$;" subject="EAID_42FCF429_74A4_44dd_BBD9_C09B9510F1FE" style="Mode=3;EOID=F9341F43;SOID=555FE596;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=2;SY=0;EX=0;EY=-9;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-21:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=73:-704$;" subject="EAID_0395D6B0_402A_4455_B7E4_571054E1ACA1" style="Mode=3;EOID=9AF2E3F1;SOID=555FE596;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-2;SY=0;EX=0;EY=25;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-8:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=450:-561$;" subject="EAID_E43DD256_3301_4c14_B0D2_7E09533694D7" style="Mode=3;EOID=1D811E2F;SOID=17D0A2CD;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=16;SY=0;EX=0;EY=-44;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-28:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=351:-1029$;" subject="EAID_42FCF429_74A4_44dd_BBD9_C09B9510F1FE" style="Mode=3;EOID=F9341F43;SOID=555FE596;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=2;SY=0;EX=0;EY=-9;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-21:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=337:-671$;" subject="EAID_0395D6B0_402A_4455_B7E4_571054E1ACA1" style="Mode=3;EOID=9AF2E3F1;SOID=555FE596;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B027C297_9F8F_4fe5_BE8D_F948E5020DDC" style="Mode=3;EOID=D7DD6A02;SOID=555FE596;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=-2;SY=0;EX=0;EY=-6;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1473:-152$;" subject="EAID_BC6D5FD3_0356_4463_A3D9_55355B814130" style="Mode=3;EOID=D6BBDFA9;SOID=91116F0A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=-2;SY=0;EX=0;EY=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=135:-142$;" subject="EAID_3F8437A0_516C_4b2e_89DC_B3689DBDE53E" style="Mode=3;EOID=D6BBDFA9;SOID=D7DD6A02;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=-1;SY=0;EX=0;EY=8;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1649:-138$;" subject="EAID_B69D002B_14AF_4080_A51D_3AD3E8CE91EB" style="Mode=3;EOID=D6BBDFA9;SOID=5968FC20;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-2;SY=0;EX=0;EY=-6;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1848:-119$;" subject="EAID_BC6D5FD3_0356_4463_A3D9_55355B814130" style="Mode=3;EOID=D6BBDFA9;SOID=91116F0A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-2;SY=0;EX=0;EY=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=332:-109$;" subject="EAID_3F8437A0_516C_4b2e_89DC_B3689DBDE53E" style="Mode=3;EOID=D6BBDFA9;SOID=D7DD6A02;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-1;SY=0;EX=0;EY=8;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=2024:-105$;" subject="EAID_B69D002B_14AF_4080_A51D_3AD3E8CE91EB" style="Mode=3;EOID=D6BBDFA9;SOID=5968FC20;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=1;SY=34;EX=44;EY=-35;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6D29D1B0_227D_4d86_B0DF_62CFC4CE6A0A" style="Mode=3;EOID=D6BBDFA9;SOID=C51838C8;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-1;SY=34;EX=-2;EY=-34;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_83C8FB41_B08A_49a2_A3D5_722A4F20BE68" style="Mode=1;EOID=D6BBDFA9;SOID=BCE1ED2B;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=-2;SY=0;EX=0;EY=-10;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=423:-156$;" subject="EAID_51552DDF_3D55_4c2a_AD76_B35D2F6B65EC" style="Mode=3;EOID=D6BBDFA9;SOID=FC22784B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=2;SY=0;EX=0;EY=16;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-12:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=307:-679$;" subject="EAID_E83907E3_1D56_4a9b_811D_CC6B095ED05E" style="Mode=3;EOID=9AF2E3F1;SOID=585658C1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=27;SY=0;EX=0;EY=36;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=22:OY=20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1268:-954$;" subject="EAID_8F0FD8B2_F185_4e94_B2DD_947CBECD8265" style="Mode=3;EOID=F9341F43;SOID=FBEC0711;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-2;SY=0;EX=0;EY=-10;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=687:-123$;" subject="EAID_51552DDF_3D55_4c2a_AD76_B35D2F6B65EC" style="Mode=3;EOID=D6BBDFA9;SOID=FC22784B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-13;SY=0;EX=0;EY=3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-20:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=556:-982$;" subject="EAID_45B5738D_C570_4834_8D2E_727F543D2A9D" style="Mode=3;EOID=F9341F43;SOID=585658C1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=28;SY=0;EX=0;EY=10;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=23:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1761:-975$;" subject="EAID_D373C122_1BC3_4bed_B3BE_2EBE77045AC9" style="Mode=3;EOID=F9341F43;SOID=2C5EF2BC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_E4877D84_62DD_4b49_93E9_B9CDDC757DFE" style="Mode=3;EOID=BCE1ED2B;SOID=8F933255;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=29;SY=0;EX=-15;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=50:OY=-21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_39D76FBC_915F_4506_BBA5_1BAA08D19F04" style="Mode=3;EOID=8CE72904;SOID=D00BD971;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-24;SY=0;EX=0;EY=-68;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-24:OY=19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=190:-1053$;" subject="EAID_70B69CB3_7E46_46fb_A6C2_A6B376E78B1B" style="Mode=3;EOID=F9341F43;SOID=D00BD971;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_40F0FF83_FA54_4eb1_93E2_2C730C732867" style="Mode=3;EOID=D7DD6A02;SOID=D00BD971;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=1;SY=0;EX=0;EY=-65;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=25:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=2085:-1050$;" subject="EAID_0AE161D5_0060_433e_984D_B48009494E55" style="Mode=3;EOID=F9341F43;SOID=9A4320C4;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B9946A5D_9729_487c_99FF_4F8AEE7E3C93" style="Mode=3;EOID=5968FC20;SOID=9A4320C4;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=8;SY=0;EX=0;EY=-13;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=19:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1717:-632$;" subject="EAID_A485A567_4A80_4862_9881_8D25909380BF" style="Mode=3;EOID=1D811E2F;SOID=9A4320C4;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-19;SY=0;EX=0;EY=-23;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=24:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1573:-1013$;" subject="EAID_04DE498E_EC37_41fe_A367_306D811B657C" style="Mode=3;EOID=F9341F43;SOID=649FFE4F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=8;SY=0;EX=0;EY=-13;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=19:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=2092:-599$;" subject="EAID_A485A567_4A80_4862_9881_8D25909380BF" style="Mode=3;EOID=1D811E2F;SOID=9A4320C4;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-15;SY=0;EX=0;EY=-38;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=24:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1952:-1023$;" subject="EAID_04DE498E_EC37_41fe_A367_306D811B657C" style="Mode=3;EOID=F9341F43;SOID=649FFE4F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_51E53893_4A9F_4065_90D3_C50FC9DCEF6A" style="Mode=3;EOID=5968FC20;SOID=649FFE4F;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=-28;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=21:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1592:-723$;" subject="EAID_524BC667_7E62_4a3d_B0D7_33EC07BB4132" style="Mode=3;EOID=9AF2E3F1;SOID=649FFE4F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-22;SY=0;EX=0;EY=-5;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=22:OY=19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1453:-995$;" subject="EAID_E66FC8C6_19D8_44c5_B15F_D9A35438C920" style="Mode=3;EOID=F9341F43;SOID=97B2E7E1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=1;SY=0;EX=0;EY=-2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=13:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1476:-799$;" subject="EAID_C05DD8F5_18B8_42f1_ADDC_48808B3F3555" style="Mode=3;EOID=9232A3E7;SOID=97B2E7E1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F52DCC56_F762_479b_998B_FD1C7AF51A31" style="Mode=3;EOID=91116F0A;SOID=97B2E7E1;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=-28;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=21:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1967:-690$;" subject="EAID_524BC667_7E62_4a3d_B0D7_33EC07BB4132" style="Mode=3;EOID=9AF2E3F1;SOID=649FFE4F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-22;SY=0;EX=0;EY=-13;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=22:OY=19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1828:-998$;" subject="EAID_E66FC8C6_19D8_44c5_B15F_D9A35438C920" style="Mode=3;EOID=F9341F43;SOID=97B2E7E1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=1;SY=0;EX=0;EY=-2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=13:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1851:-766$;" subject="EAID_C05DD8F5_18B8_42f1_ADDC_48808B3F3555" style="Mode=3;EOID=9232A3E7;SOID=97B2E7E1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_0D36E96A_7E1E_4805_A9CC_DDD002BD9D7A" style="Mode=3;EOID=BCE1ED2B;SOID=633FA994;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_82384408_BDB4_4aea_B6D6_937D926E0FB1" style="Mode=3;EOID=C51838C8;SOID=2C5EF2BC;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=27;SY=0;EX=0;EY=19;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=23:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1385:-971$;" subject="EAID_D373C122_1BC3_4bed_B3BE_2EBE77045AC9" style="Mode=3;EOID=F9341F43;SOID=2C5EF2BC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9E65DE1F_9426_4db1_A52E_0256EDE56D0B" style="Mode=3;EOID=594A1898;SOID=73CB6CF8;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=26;SY=-17;EX=-1;EY=41;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=44:OY=-27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D520E2A3_E451_4ac1_97ED_ADF0F3DB2666" style="Mode=3;EOID=1D811E2F;SOID=C0D0529C;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=12;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=7:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1733:-574$;" subject="EAID_C1A159CA_1BCA_4563_9B6C_EEC7C251E248" style="Mode=3;EOID=1D811E2F;SOID=2C5EF2BC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_3095E23F_6F7A_4faa_B0A7_F42B6A4C497D" style="Mode=3;EOID=C51838C8;SOID=FBEC0711;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-5;SY=0;EX=0;EY=-48;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=25:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1704:-1038$;" subject="EAID_0AE161D5_0060_433e_984D_B48009494E55" style="Mode=3;EOID=F9341F43;SOID=9A4320C4;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=1;SY=0;EX=0;EY=-1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=23:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1242:-696$;" subject="EAID_CE22747B_385E_4705_AEE1_7E97C8212E81" style="Mode=3;EOID=9AF2E3F1;SOID=FBEC0711;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=27;SY=0;EX=0;EY=32;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=22:OY=20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1643:-953$;" subject="EAID_8F0FD8B2_F185_4e94_B2DD_947CBECD8265" style="Mode=3;EOID=F9341F43;SOID=FBEC0711;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=1;SY=0;EX=0;EY=-1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=23:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1617:-663$;" subject="EAID_CE22747B_385E_4705_AEE1_7E97C8212E81" style="Mode=3;EOID=9AF2E3F1;SOID=FBEC0711;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_37773559_8236_4994_A4E4_A2FF446DF6A3" style="Mode=3;EOID=BCE1ED2B;SOID=B51EEB64;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=45;SY=0;EX=0;EY=53;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=22:OY=20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1169:-937$;" subject="EAID_0F05AECA_2EC4_4086_9AF9_594FEC647E55" style="Mode=3;EOID=F9341F43;SOID=B51EEB64;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=7;SY=0;EX=0;EY=17;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1131:-517$;" subject="EAID_63744D9C_1D40_4611_A855_399E5F8DF512" style="Mode=3;EOID=866BD2AD;SOID=B51EEB64;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=31;SY=0;EX=0;EY=74;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=26:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1419:-911$;" subject="EAID_0F05AECA_2EC4_4086_9AF9_594FEC647E55" style="Mode=3;EOID=F9341F43;SOID=B51EEB64;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=7;SY=0;EX=0;EY=17;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1395:-484$;" subject="EAID_63744D9C_1D40_4611_A855_399E5F8DF512" style="Mode=3;EOID=866BD2AD;SOID=B51EEB64;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_5151BB57_9A61_4a55_82D8_818B9477B524" style="Mode=3;EOID=BCE1ED2B;SOID=B258F855;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-18;SY=0;EX=58;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=84:OY=-14:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=989:-893$914:-893$;" subject="EAID_B17671EF_9E4A_497d_A4EC_CE72A02654ED" style="Mode=3;EOID=F9341F43;SOID=B258F855;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-18;SY=0;EX=58;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=84:OY=-14:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1253:-860$1178:-860$;" subject="EAID_B17671EF_9E4A_497d_A4EC_CE72A02654ED" style="Mode=3;EOID=F9341F43;SOID=B258F855;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=34;SY=-17;EX=-32;EY=41;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=57:OY=-11:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D0C69A78_A417_43c8_ABC0_AF744FDF5AB1" style="Mode=3;EOID=9232A3E7;SOID=B258F855;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A13194F0_9A95_4fda_A5AA_C2D31307FFF6" style="Mode=3;EOID=BCE1ED2B;SOID=C0D0529C;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-42;SY=0;EX=-2;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=49:OY=-40:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_FB55E0C5_D63F_497b_8941_D0694C121639" style="Mode=3;EOID=F9341F43;SOID=C0D0529C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=26;SY=-17;EX=-1;EY=41;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=44:OY=-27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D520E2A3_E451_4ac1_97ED_ADF0F3DB2666" style="Mode=3;EOID=1D811E2F;SOID=C0D0529C;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_0D36E96A_7E1E_4805_A9CC_DDD002BD9D7A" style="Mode=3;EOID=BCE1ED2B;SOID=633FA994;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=12;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=7:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1358:-607$;" subject="EAID_C1A159CA_1BCA_4563_9B6C_EEC7C251E248" style="Mode=3;EOID=1D811E2F;SOID=2C5EF2BC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=4;SY=0;EX=0;EY=51;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=19:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1508:-934$;" subject="EAID_7226E575_9BF3_4599_A33E_E62EFF274606" style="Mode=3;EOID=F9341F43;SOID=8F933255;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F52DCC56_F762_479b_998B_FD1C7AF51A31" style="Mode=3;EOID=91116F0A;SOID=97B2E7E1;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_2FDB7244_40AB_4df1_AE7C_A26145DA0BCF">
@@ -25865,61 +28242,69 @@
 			<diagram xmi:id="EAID_0301AA4B_61CC_4101_B049_132023B470AA">
 				<model package="EAPK_B775C397_9DD7_4b60_8DF5_BD1A1119F341" localID="144" owner="EAPK_B775C397_9DD7_4b60_8DF5_BD1A1119F341"/>
 				<properties name="result subtype notices" type="Logical"/>
-				<project author="andreea" version="1.0" created="2021-12-10 13:19:54" modified="2022-11-15 13:22:27"/>
+				<project author="andreea" version="1.0" created="2021-12-10 13:19:54" modified="2024-07-18 17:27:14"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=1;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=46E9CC01;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=BA98783C;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=498;Top=624;Right=626;Bottom=710;" subject="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5" seqno="1" style="DUID=B9998EED;NSL=0;"/>
-					<element geometry="Left=33;Top=533;Right=123;Bottom=583;" subject="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" seqno="2" style="DUID=17E49457;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=576;Top=115;Right=704;Bottom=150;" subject="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" seqno="3" style="DUID=212749F3;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=711;Top=298;Right=801;Bottom=334;" subject="EAID_BDB13855_F3DD_4561_A018_D5E4E2B01404" seqno="4" style="DUID=CBCAA996;"/>
-					<element geometry="Left=873;Top=203;Right=1001;Bottom=238;" subject="EAID_AE877E81_8A12_4ec7_ACA1_4EE4A3ADE597" seqno="5" style="DUID=5A500F03;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=595;Top=298;Right=685;Bottom=334;" subject="EAID_AA33DDB3_015E_422f_9700_767D093EA6DE" seqno="6" style="DUID=29DC079B;"/>
-					<element geometry="Left=131;Top=299;Right=221;Bottom=334;" subject="EAID_961635DD_1E69_4907_B7A8_D2D05116023F" seqno="7" style="DUID=7722A0DD;"/>
-					<element geometry="Left=943;Top=299;Right=1033;Bottom=334;" subject="EAID_9534CCE2_2925_49a9_8149_B4372990E2A4" seqno="8" style="DUID=4BD8861C;"/>
-					<element geometry="Left=685;Top=389;Right=775;Bottom=439;" subject="EAID_8E4FF705_88E9_4b3e_A98F_ACC159CC13C2" seqno="9" style="DUID=65D32D17;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=247;Top=379;Right=337;Bottom=429;" subject="EAID_89668AB6_A244_441e_B851_9289BD4E15F3" seqno="10" style="DUID=D7B10380;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=172;Top=203;Right=300;Bottom=238;" subject="EAID_83474E52_0601_44c6_9D61_AD99797CBD13" seqno="11" style="DUID=263FA116;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=576;Top=203;Right=704;Bottom=238;" subject="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1" seqno="12" style="DUID=BB24F033;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=626;Top=475;Right=716;Bottom=525;" subject="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" seqno="13" style="DUID=BF8913C3;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=15;Top=299;Right=105;Bottom=334;" subject="EAID_61E6D7F3_02F4_4fe3_9A81_0609FB33A070" seqno="14" style="DUID=A8D3FA23;"/>
-					<element geometry="Left=363;Top=299;Right=453;Bottom=334;" subject="EAID_6019482D_1758_4997_9E94_54C4E5AD26F2" seqno="15" style="DUID=A39DD1E0;"/>
-					<element geometry="Left=827;Top=299;Right=917;Bottom=334;" subject="EAID_406DCE49_EA4F_4aa6_BD32_93632614BD58" seqno="16" style="DUID=3F2A1A18;"/>
-					<element geometry="Left=247;Top=299;Right=337;Bottom=334;" subject="EAID_275E786B_A6CB_4f7d_8A46_523230F3EEE0" seqno="17" style="DUID=27A44C63;"/>
-					<element geometry="Left=479;Top=298;Right=569;Bottom=334;" subject="EAID_1B4364F6_9CFF_4697_9C06_ACF3001ADED8" seqno="18" style="DUID=5D7AFF86;"/>
+					<element geometry="Left=966;Top=381;Right=1056;Bottom=431;" subject="EAID_C0E81714_CC78_4bd5_B8F5_31F967E74257" seqno="1" style="DUID=9B036D7E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=920;Top=291;Right=1010;Bottom=326;" subject="EAID_B93F6450_B2DC_42d5_AB43_7ACC411B4F0F" seqno="2" style="DUID=4EC56524;"/>
+					<element geometry="Left=7;Top=291;Right=97;Bottom=326;" subject="EAID_1A622AA7_D176_418b_84D4_6FB3AAC4A4F9" seqno="3" style="DUID=974DAF08;"/>
+					<element geometry="Left=603;Top=616;Right=731;Bottom=738;" subject="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5" seqno="4" style="DUID=B9998EED;NSL=0;"/>
+					<element geometry="Left=138;Top=525;Right=228;Bottom=575;" subject="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" seqno="5" style="DUID=17E49457;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=681;Top=107;Right=809;Bottom=142;" subject="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" seqno="6" style="DUID=212749F3;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=816;Top=290;Right=906;Bottom=326;" subject="EAID_BDB13855_F3DD_4561_A018_D5E4E2B01404" seqno="7" style="DUID=CBCAA996;"/>
+					<element geometry="Left=1071;Top=195;Right=1199;Bottom=230;" subject="EAID_AE877E81_8A12_4ec7_ACA1_4EE4A3ADE597" seqno="8" style="DUID=5A500F03;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=700;Top=290;Right=790;Bottom=326;" subject="EAID_AA33DDB3_015E_422f_9700_767D093EA6DE" seqno="9" style="DUID=29DC079B;"/>
+					<element geometry="Left=236;Top=291;Right=326;Bottom=326;" subject="EAID_961635DD_1E69_4907_B7A8_D2D05116023F" seqno="10" style="DUID=7722A0DD;"/>
+					<element geometry="Left=1141;Top=291;Right=1231;Bottom=326;" subject="EAID_9534CCE2_2925_49a9_8149_B4372990E2A4" seqno="11" style="DUID=4BD8861C;"/>
+					<element geometry="Left=790;Top=381;Right=880;Bottom=431;" subject="EAID_8E4FF705_88E9_4b3e_A98F_ACC159CC13C2" seqno="12" style="DUID=65D32D17;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=352;Top=371;Right=442;Bottom=421;" subject="EAID_89668AB6_A244_441e_B851_9289BD4E15F3" seqno="13" style="DUID=D7B10380;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=217;Top=195;Right=345;Bottom=230;" subject="EAID_83474E52_0601_44c6_9D61_AD99797CBD13" seqno="14" style="DUID=263FA116;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=681;Top=195;Right=809;Bottom=230;" subject="EAID_81771DDE_1109_4f66_BDAC_C1B68CDF47C1" seqno="15" style="DUID=BB24F033;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=731;Top=467;Right=821;Bottom=517;" subject="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" seqno="16" style="DUID=BF8913C3;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=120;Top=291;Right=210;Bottom=326;" subject="EAID_61E6D7F3_02F4_4fe3_9A81_0609FB33A070" seqno="17" style="DUID=A8D3FA23;"/>
+					<element geometry="Left=468;Top=291;Right=558;Bottom=326;" subject="EAID_6019482D_1758_4997_9E94_54C4E5AD26F2" seqno="18" style="DUID=A39DD1E0;"/>
+					<element geometry="Left=1025;Top=291;Right=1115;Bottom=326;" subject="EAID_406DCE49_EA4F_4aa6_BD32_93632614BD58" seqno="19" style="DUID=3F2A1A18;"/>
+					<element geometry="Left=352;Top=291;Right=442;Bottom=326;" subject="EAID_275E786B_A6CB_4f7d_8A46_523230F3EEE0" seqno="20" style="DUID=27A44C63;"/>
+					<element geometry="Left=584;Top=290;Right=674;Bottom=326;" subject="EAID_1B4364F6_9CFF_4697_9C06_ACF3001ADED8" seqno="21" style="DUID=5D7AFF86;"/>
+					<element geometry="SX=27;SY=0;EX=0;EY=2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-1:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=308:-490$;" subject="EAID_AEC77620_A2B4_4cf8_B406_686C04509EC6" style="Mode=3;EOID=BF8913C3;SOID=7722A0DD;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_2470BB20_3107_4023_9A95_1F387AB2B926" style="Mode=3;EOID=BB24F033;SOID=5D7AFF86;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-19;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=217:-132$;" subject="EAID_24895ADA_E91E_44cf_9118_C084D6F128C5" style="Mode=3;EOID=212749F3;SOID=263FA116;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-20;SY=0;EX=0;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=917:-134$;" subject="EAID_76A51C8C_F081_425d_B003_0CF86709B61A" style="Mode=3;EOID=212749F3;SOID=5A500F03;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D60668CB_4565_4f10_8EA3_14B93254E757" style="Mode=3;EOID=263FA116;SOID=A8D3FA23;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=18;SY=-17;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=48:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_684A21F9_B14B_4fe3_8965_0C8831D5C6F6" style="Mode=3;EOID=17E49457;SOID=A8D3FA23;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-34;SY=0;EX=0;EY=-38;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-18:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=26:-705$;" subject="EAID_85E80E5D_F364_4763_8F5D_5203FC4612DB" style="Mode=3;EOID=B9998EED;SOID=A8D3FA23;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A37999FA_4BFE_4661_9AE9_32813DCF358A" style="Mode=3;EOID=263FA116;SOID=7722A0DD;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=27;SY=0;EX=0;EY=2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-1:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=203:-498$;" subject="EAID_AEC77620_A2B4_4cf8_B406_686C04509EC6" style="Mode=3;EOID=BF8913C3;SOID=7722A0DD;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=7;SY=0;EX=0;EY=-9;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-15:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=183:-676$;" subject="EAID_42AA0D6A_27A6_4fc3_8C73_04DB39B171EA" style="Mode=3;EOID=B9998EED;SOID=7722A0DD;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_1A090812_CCBF_46aa_8697_AA4E52589D49" style="Mode=3;EOID=263FA116;SOID=27A44C63;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=48:OY=-15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_E4B59BE3_9FA5_443f_AF5A_305FCC30D1E9" style="Mode=3;EOID=D7B10380;SOID=27A44C63;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=-1;EX=0;EY=13;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-17:OY=5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=351:-317$351:-654$;" subject="EAID_45889F4C_DDD6_45a7_9578_FA3BF570A314" style="Mode=3;EOID=B9998EED;SOID=27A44C63;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-26;SY=0;EX=0;EY=42;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-11:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=487:-635$;" subject="EAID_FE5B42CB_B903_40b0_AB95_EB7BA3114932" style="Mode=3;EOID=B9998EED;SOID=A39DD1E0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=2;SY=0;EX=0;EY=1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-18:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=515:-405$;" subject="EAID_33F55B39_3AC8_40e3_87BA_D03D3521D137" style="Mode=3;EOID=65D32D17;SOID=A39DD1E0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C926EE7A_E434_4893_842E_F2E5FA432810" style="Mode=3;EOID=263FA116;SOID=A39DD1E0;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=-1;EX=0;EY=19;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-17:OY=5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=456:-309$456:-658$;" subject="EAID_45889F4C_DDD6_45a7_9578_FA3BF570A314" style="Mode=3;EOID=B9998EED;SOID=27A44C63;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=48:OY=-15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_E4B59BE3_9FA5_443f_AF5A_305FCC30D1E9" style="Mode=3;EOID=D7B10380;SOID=27A44C63;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_19D21EDF_4A27_44be_96F5_5066D75785F4" style="Mode=3;EOID=212749F3;SOID=BB24F033;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-26;SY=0;EX=0;EY=35;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-11:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=382:-632$;" subject="EAID_FE5B42CB_B903_40b0_AB95_EB7BA3114932" style="Mode=3;EOID=B9998EED;SOID=A39DD1E0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=-27;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=24:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=988:-694$;" subject="EAID_F7CC5A3E_F7E9_4f76_B68A_8AE98592729E" style="Mode=3;EOID=B9998EED;SOID=4BD8861C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-34;SY=0;EX=0;EY=14;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=11:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=490:-544$;" subject="EAID_93FDB9F8_FAB1_4bc1_99DC_3C9C7CDA4DCB" style="Mode=3;EOID=17E49457;SOID=5D7AFF86;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-1;SY=1;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=39:OY=-16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_42611760_184B_41b9_967E_E21B2767CCE7" style="Mode=3;EOID=B9998EED;SOID=5D7AFF86;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=7;SY=0;EX=0;EY=-5;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-15:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=288:-682$;" subject="EAID_42AA0D6A_27A6_4fc3_8C73_04DB39B171EA" style="Mode=3;EOID=B9998EED;SOID=7722A0DD;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6B05B709_B9D0_446e_ADF9_6954786BECD9" style="Mode=3;EOID=BB24F033;SOID=29DC079B;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=17;SY=-18;EX=-14;EY=-1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=34:OY=-16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_A1B0769A_6C40_4127_9CD7_F01DCE4E5449" style="Mode=3;EOID=BF8913C3;SOID=29DC079B;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-39;SY=0;EX=39;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=64:OY=-24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_6926B6AE_BEA0_4f27_9388_71D77D79C7B7" style="Mode=3;EOID=B9998EED;SOID=29DC079B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_3E955EE8_380D_40d3_A11F_7EEDF94928AC" style="Mode=3;EOID=BB24F033;SOID=CBCAA996;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-26;SY=-17;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=58:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_2B87E05C_8E93_4fd1_B6FE_CDD24BBDA1FC" style="Mode=3;EOID=65D32D17;SOID=CBCAA996;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=37;SY=0;EX=0;EY=32;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=16:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=793:-635$;" subject="EAID_A84907C9_3C78_4400_88C7_3C5CF97F6EFF" style="Mode=3;EOID=B9998EED;SOID=CBCAA996;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A37999FA_4BFE_4661_9AE9_32813DCF358A" style="Mode=3;EOID=263FA116;SOID=7722A0DD;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-35;SY=0;EX=0;EY=-31;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-18:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=130:-708$;" subject="EAID_85E80E5D_F364_4763_8F5D_5203FC4612DB" style="Mode=3;EOID=B9998EED;SOID=A8D3FA23;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=18;SY=-17;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=48:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_684A21F9_B14B_4fe3_8965_0C8831D5C6F6" style="Mode=3;EOID=17E49457;SOID=A8D3FA23;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D60668CB_4565_4f10_8EA3_14B93254E757" style="Mode=3;EOID=263FA116;SOID=A8D3FA23;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-20;SY=0;EX=0;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1115:-126$;" subject="EAID_76A51C8C_F081_425d_B003_0CF86709B61A" style="Mode=3;EOID=212749F3;SOID=5A500F03;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-2;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=279:-124$;" subject="EAID_24895ADA_E91E_44cf_9118_C084D6F128C5" style="Mode=3;EOID=212749F3;SOID=263FA116;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_1A090812_CCBF_46aa_8697_AA4E52589D49" style="Mode=3;EOID=263FA116;SOID=27A44C63;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-1;SY=0;EX=0;EY=-11;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=21:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1069:-561$;" subject="EAID_79B001C2_5537_4051_9149_B0D356179DF9" style="Mode=3;EOID=17E49457;SOID=3F2A1A18;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-21;SY=0;EX=0;EY=22;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=15:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=944:-655$;" subject="EAID_092B4BA8_26FC_40e9_B172_6F9C6045CFC9" style="Mode=3;EOID=B9998EED;SOID=4EC56524;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_FF4E869D_E24B_4c77_9DA7_6869F03D59F3" style="Mode=3;EOID=BB24F033;SOID=4EC56524;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-2;SY=0;EX=0;EY=-54;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-24:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=50:-731$;" subject="EAID_8E5E0D60_1F11_4dc5_8F6F_6DAB4A8EF634" style="Mode=3;EOID=B9998EED;SOID=974DAF08;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_CD899FA2_16BF_440c_9BBF_0C20785CB74C" style="Mode=3;EOID=263FA116;SOID=974DAF08;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=6;SY=0;EX=0;EY=-35;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=24:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1192:-712$;" subject="EAID_F7CC5A3E_F7E9_4f76_B68A_8AE98592729E" style="Mode=3;EOID=B9998EED;SOID=4BD8861C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-23;SY=0;EX=0;EY=-4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=5:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1163:-496$;" subject="EAID_5C309854_4FBF_495b_8F6A_AF16FAB37C24" style="Mode=3;EOID=BF8913C3;SOID=4BD8861C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-34;SY=0;EX=0;EY=14;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=11:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=595:-536$;" subject="EAID_93FDB9F8_FAB1_4bc1_99DC_3C9C7CDA4DCB" style="Mode=3;EOID=17E49457;SOID=5D7AFF86;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=24;SY=0;EX=0;EY=-6;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=20:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1094:-683$;" subject="EAID_3A176A7E_6EAC_4714_8B83_7E96F8F27796" style="Mode=3;EOID=B9998EED;SOID=3F2A1A18;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-1;SY=1;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=39:OY=-16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_42611760_184B_41b9_967E_E21B2767CCE7" style="Mode=3;EOID=B9998EED;SOID=5D7AFF86;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B41CAE99_910B_45c3_9A01_A7B6965739FE" style="Mode=3;EOID=5A500F03;SOID=3F2A1A18;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-1;SY=0;EX=0;EY=-11;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=21:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=871:-569$;" subject="EAID_79B001C2_5537_4051_9149_B0D356179DF9" style="Mode=3;EOID=17E49457;SOID=3F2A1A18;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=25;SY=0;EX=0;EY=5;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=20:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=897:-662$;" subject="EAID_3A176A7E_6EAC_4714_8B83_7E96F8F27796" style="Mode=3;EOID=B9998EED;SOID=3F2A1A18;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=37;SY=0;EX=0;EY=49;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=17:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=898:-628$;" subject="EAID_A84907C9_3C78_4400_88C7_3C5CF97F6EFF" style="Mode=3;EOID=B9998EED;SOID=CBCAA996;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-26;SY=-17;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=58:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_2B87E05C_8E93_4fd1_B6FE_CDD24BBDA1FC" style="Mode=3;EOID=65D32D17;SOID=CBCAA996;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_3E955EE8_380D_40d3_A11F_7EEDF94928AC" style="Mode=3;EOID=BB24F033;SOID=CBCAA996;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-39;SY=0;EX=39;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=64:OY=-24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_6926B6AE_BEA0_4f27_9388_71D77D79C7B7" style="Mode=3;EOID=B9998EED;SOID=29DC079B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=17;SY=-18;EX=-14;EY=-1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=34:OY=-16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_A1B0769A_6C40_4127_9CD7_F01DCE4E5449" style="Mode=3;EOID=BF8913C3;SOID=29DC079B;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=6;SY=0;EX=8;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=65:OY=-21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_01E7319D_7EE6_4b79_94C5_251FABA00729" style="Mode=3;EOID=9B036D7E;SOID=4EC56524;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C44465DB_D26F_4ce5_8D04_3DD2183E5504" style="Mode=3;EOID=5A500F03;SOID=4BD8861C;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-23;SY=0;EX=0;EY=-4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=5:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=965:-504$;" subject="EAID_5C309854_4FBF_495b_8F6A_AF16FAB37C24" style="Mode=3;EOID=BF8913C3;SOID=4BD8861C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=2;SY=0;EX=0;EY=1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=-18:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=410:-413$;" subject="EAID_33F55B39_3AC8_40e3_87BA_D03D3521D137" style="Mode=3;EOID=65D32D17;SOID=A39DD1E0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_70B7CFA1_FE5A_451d_9BBA_798A95377279">
@@ -25954,14 +28339,18 @@
 			<diagram xmi:id="EAID_1488F282_3C96_4933_B390_907FA87FE3C2">
 				<model package="EAPK_F92ADA51_C0C0_408e_A6E8_EA20B8C21EAD" localID="145" owner="EAPK_F92ADA51_C0C0_408e_A6E8_EA20B8C21EAD"/>
 				<properties name="completion subtype notices" type="Logical"/>
-				<project author="andreea" version="1.0" created="2021-12-10 13:33:10" modified="2022-11-15 13:24:31"/>
+				<project author="andreea" version="1.0" created="2021-12-10 13:33:10" modified="2024-07-18 16:55:01"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=1;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=2A77C21E;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=C1DCE166;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=178;Top=126;Right=314;Bottom=156;" subject="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" seqno="1" style="DUID=30B246B7;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=141;Top=234;Right=256;Bottom=289;" subject="EAID_F72A2F1B_E855_4fd5_85C1_44FFF7302FAA" seqno="1" style="DUID=A002D895;"/>
+					<element geometry="Left=154;Top=148;Right=244;Bottom=183;" subject="EAID_137272D3_D36E_4bc8_BB25_DB95F670222F" seqno="2" style="DUID=18148B3A;"/>
+					<element geometry="Left=130;Top=61;Right=266;Bottom=91;" subject="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" seqno="3" style="DUID=30B246B7;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_211F10EB_36BF_46b2_900A_DFA61A369012" style="Mode=3;EOID=18148B3A;SOID=A002D895;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_08F5FCE9_9B75_4d80_AD87_6CDE7E017303" style="Mode=3;EOID=30B246B7;SOID=18148B3A;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_DD40D051_ED4F_4994_BE7C_6282641D32F5">
@@ -25992,7 +28381,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_6FC7DD7D_CA3C_452d_8562_B92FA4C144F0">
-				<model package="EAPK_C8716BFF_C5FE_40c2_BF04_C2A97B06669D" localID="156" owner="EAPK_C8716BFF_C5FE_40c2_BF04_C2A97B06669D"/>
+				<model package="EAPK_CB52574B_A99F_4805_91CB_5CF174945B4A" localID="156" owner="EAPK_CB52574B_A99F_4805_91CB_5CF174945B4A"/>
 				<properties name="standardFormsNotices" type="Logical"/>
 				<project author="andreea" version="1.0" created="2021-12-17 11:08:54" modified="2022-11-15 12:22:33"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
diff --git a/implementation/eOrdering/model2owl-config/config-parameters.xsl b/implementation/eOrdering/model2owl-config/config-parameters.xsl
index 59f8b307..b23fcdc0 100644
--- a/implementation/eOrdering/model2owl-config/config-parameters.xsl
+++ b/implementation/eOrdering/model2owl-config/config-parameters.xsl
@@ -122,11 +122,11 @@
     <!--    owl:incompatibleWith -->
     <xsl:variable name="incompatibleWith" select="'3.1.0'"/>
     <!--    owl:versionInfo -->
-    <xsl:variable name="versionInfo" select="'4.1.0'"/>
+    <xsl:variable name="versionInfo" select="'4.2.0'"/>
     <!--    bibo:status-->
     <xsl:variable name="ontologyStatus" select="'Semantic Specification Release'"/>
     <!--    owl:priorVersion -->
-    <xsl:variable name="priorVersion" select="'4.0.2'"/>
+    <xsl:variable name="priorVersion" select="'4.1.0'"/>
     <!--    vann:preferredNamespaceUri -->
     <xsl:variable name="preferredNamespaceUri" select="'http://data.europa.eu/a4g/ontology#'"/>
     <!--    vann:preferredNamespacePrefix -->
diff --git a/implementation/eOrdering/model2owl-config/namespaces.xml b/implementation/eOrdering/model2owl-config/namespaces.xml
index 5e8f2974..9bb8a653 100644
--- a/implementation/eOrdering/model2owl-config/namespaces.xml
+++ b/implementation/eOrdering/model2owl-config/namespaces.xml
@@ -21,6 +21,7 @@
     <prefix name="epo-ful" value="http://data.europa.eu/a4g/ontology#" importURI="http://data.europa.eu/a4g/ontology#ful"/>
     <prefix name="epo-acc" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-sub" value="http://data.europa.eu/a4g/ontology#"/>
+    <prefix name="epo-inv" value="http://data.europa.eu/a4g/ontology#"/>
 
     <prefix name="nuts" value="http://data.europa.eu/nuts/"/>
     <prefix name="espd" value="https://github.com/ESPD/ESPD-EDM/"/>
diff --git a/implementation/eOrdering/xmi_conceptual_model/eOrdering.xml b/implementation/eOrdering/xmi_conceptual_model/eOrdering.xml
index b2c499da..59d6a1c1 100644
--- a/implementation/eOrdering/xmi_conceptual_model/eOrdering.xml
+++ b/implementation/eOrdering/xmi_conceptual_model/eOrdering.xml
@@ -4,7 +4,7 @@
 	<uml:Model xmi:type="uml:Model" name="EA_Model">
 		<packagedElement xmi:type="uml:Package" xmi:id="EAPK_E2C29545_D1F9_4f95_9A73_D4C5237825DE" name="Ordering">
 			<packagedElement xmi:type="uml:Package" xmi:id="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" name="order only">
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708" name="diagrams">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A" name="diagrams">
 					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444" body="Note: Supplier is out of discussion. It is a third party. &#xA;We do not care who provides these service or products we care with whom business is done.&#xA;&#xA;PEPPOL - Invoice:&#xA;The supplier is the legal person or organization who provides a product and/or service.&#xA;&#xA;PEPPOL - Order: The supplier is the legal person or organisation who provides a product or service.&#xA;Examples of supplier roles: seller, despatch party, creditor, economic operator.&#xA;&#xA;">
 						<annotatedElement xmi:idref="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01"/>
 						<annotatedElement xmi:idref="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3"/>
@@ -20,7 +20,7 @@
 						<annotatedElement xmi:idref="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695"/>
 					</ownedComment>
 				</packagedElement>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_9D6273BE_3306_4c89_ACDE_4EB42B089540" name="classes">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_7D4F55D5_E4BB_4d9a_86CE_D56603763CE3" name="classes">
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" name="epo-ord:AllowanceChargeInformation">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_44E5CE57_12D3_4013_8F09_B434DAB0D6BA" name="epo-cat:hasPercentage">
 							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000001_12D3_4013_8F09_B434DAB0D6BA" value="0"/>
@@ -78,6 +78,11 @@
 							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000012__B424_424e_A34E_13EA1CB113F2" value="*"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_308D4104_53D2_4be0_B731_D93BB56777D3" general="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst984A8F_8800_4bd8_89A8_7BF01AA3F7CB" name="epo-inv:isSpecificToInvoiceLine" association="EAID_F3984A8F_8800_4bd8_89A8_7BF01AA3F7CB">
+							<type xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000013__8800_4bd8_89A8_7BF01AA3F7CB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000014__8800_4bd8_89A8_7BF01AA3F7CB" value="*"/>
+						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_2938C487_B424_424e_A34E_13EA1CB113F2">
 						<memberEnd xmi:idref="EAID_dst38C487_B424_424e_A34E_13EA1CB113F2"/>
@@ -86,6 +91,13 @@
 							<type xmi:idref="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F3984A8F_8800_4bd8_89A8_7BF01AA3F7CB">
+						<memberEnd xmi:idref="EAID_dst984A8F_8800_4bd8_89A8_7BF01AA3F7CB"/>
+						<memberEnd xmi:idref="EAID_src984A8F_8800_4bd8_89A8_7BF01AA3F7CB"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src984A8F_8800_4bd8_89A8_7BF01AA3F7CB" association="EAID_F3984A8F_8800_4bd8_89A8_7BF01AA3F7CB">
+							<type xmi:idref="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_15B1CFC6_0B95_4c94_B742_4DC2F5EAF55E">
 						<memberEnd xmi:idref="EAID_dstB1CFC6_0B95_4c94_B742_4DC2F5EAF55E"/>
 						<memberEnd xmi:idref="EAID_srcB1CFC6_0B95_4c94_B742_4DC2F5EAF55E"/>
@@ -93,6 +105,13 @@
 							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_38248DFF_252A_4130_A663_5B676B14A992">
+						<memberEnd xmi:idref="EAID_dst248DFF_252A_4130_A663_5B676B14A992"/>
+						<memberEnd xmi:idref="EAID_src248DFF_252A_4130_A663_5B676B14A992"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src248DFF_252A_4130_A663_5B676B14A992" association="EAID_38248DFF_252A_4130_A663_5B676B14A992">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C4D92701_64B7_43fe_A8FE_020E2E87A51A">
 						<memberEnd xmi:idref="EAID_dstD92701_64B7_43fe_A8FE_020E2E87A51A"/>
 						<memberEnd xmi:idref="EAID_srcD92701_64B7_43fe_A8FE_020E2E87A51A"/>
@@ -127,14 +146,14 @@
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_1D470B74_66C6_4e95_82A9_28C6309EBB94" name="epo-ord:ContractInformation">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstC34048_F5E0_4885_8D46_5814F76AE356" name="epo-ord:isSpecificToOrderLine" association="EAID_16C34048_F5E0_4885_8D46_5814F76AE356">
 							<type xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000013__F5E0_4885_8D46_5814F76AE356" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000014__F5E0_4885_8D46_5814F76AE356" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000015__F5E0_4885_8D46_5814F76AE356" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000016__F5E0_4885_8D46_5814F76AE356" value="*"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_A76AAA3D_FA92_46df_8905_FDFE3A9A6323" general="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst9DC2F8_C373_4894_AF6D_C4779365607A" name="epo-ord:concernsContract" association="EAID_A79DC2F8_C373_4894_AF6D_C4779365607A">
 							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000015__C373_4894_AF6D_C4779365607A" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000016__C373_4894_AF6D_C4779365607A" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000017__C373_4894_AF6D_C4779365607A" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000018__C373_4894_AF6D_C4779365607A" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_16C34048_F5E0_4885_8D46_5814F76AE356">
@@ -160,14 +179,14 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_EA36CA1F_5963_4ff6_86BE_1ACC9D34E843" name="epo-ord:DeliveryAgreement">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_02A5E1CD_6E25_4ae3_A76B_B552B9987D94" name="dct:description">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000017_6E25_4ae3_A76B_B552B9987D94" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000018_6E25_4ae3_A76B_B552B9987D94" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000019_6E25_4ae3_A76B_B552B9987D94" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000020_6E25_4ae3_A76B_B552B9987D94" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst549AF3_1E2A_4cd7_9F26_8CD173F2F4F7" name="epo-ord:specifiesDeliveryAgreementLocation" association="EAID_6A549AF3_1E2A_4cd7_9F26_8CD173F2F4F7">
 							<type xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000019__1E2A_4cd7_9F26_8CD173F2F4F7" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000020__1E2A_4cd7_9F26_8CD173F2F4F7" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000021__1E2A_4cd7_9F26_8CD173F2F4F7" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000022__1E2A_4cd7_9F26_8CD173F2F4F7" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6A549AF3_1E2A_4cd7_9F26_8CD173F2F4F7">
@@ -193,50 +212,55 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" name="epo-ord:DeliveryInformation">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_289C1955_4486_4bfc_A2A2_11B9317C4CEA" name="epo-ord:hasShippingMark">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000021_4486_4bfc_A2A2_11B9317C4CEA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000022_4486_4bfc_A2A2_11B9317C4CEA" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000023_4486_4bfc_A2A2_11B9317C4CEA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000024_4486_4bfc_A2A2_11B9317C4CEA" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_170D0E72_3CEC_45db_9771_2CC4975CC6CB" name="epo-ord:hasDeliveryDeadline">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000023_3CEC_45db_9771_2CC4975CC6CB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000024_3CEC_45db_9771_2CC4975CC6CB" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000025_3CEC_45db_9771_2CC4975CC6CB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000026_3CEC_45db_9771_2CC4975CC6CB" value="1"/>
 							<type xmi:idref="EAJava_xsd_dateTime"/>
 						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_F2A457C5_9C89_4b3d_AEFD_02FCEB4DACB5" name="epo-inv:hasActualDeliveryDate">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000027_9C89_4b3d_AEFD_02FCEB4DACB5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000028_9C89_4b3d_AEFD_02FCEB4DACB5" value="1"/>
+							<type xmi:idref="EAJava_xsd_date"/>
+						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_8D08461D_427C_4617_A7FA_357936EA21A8" general="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst2635C6_3F1B_4466_A940_494C66EC292F" name="epo-ord:concernsConsignee" association="EAID_A52635C6_3F1B_4466_A940_494C66EC292F">
 							<type xmi:idref="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000025__3F1B_4466_A940_494C66EC292F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000026__3F1B_4466_A940_494C66EC292F" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000029__3F1B_4466_A940_494C66EC292F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000030__3F1B_4466_A940_494C66EC292F" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstDD985E_9817_4356_BF94_B8B6325FE628" name="epo-ord:isSpecificToOrderLine" association="EAID_ADDD985E_9817_4356_BF94_B8B6325FE628">
 							<type xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000027__9817_4356_BF94_B8B6325FE628" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000028__9817_4356_BF94_B8B6325FE628" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000031__9817_4356_BF94_B8B6325FE628" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000032__9817_4356_BF94_B8B6325FE628" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstFEF002_D274_4157_BCA8_CFEC07ED34AE" name="epo-ord:specifiesPlaceOfDelivery" association="EAID_D8FEF002_D274_4157_BCA8_CFEC07ED34AE">
 							<type xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000029__D274_4157_BCA8_CFEC07ED34AE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000030__D274_4157_BCA8_CFEC07ED34AE" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000033__D274_4157_BCA8_CFEC07ED34AE" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000034__D274_4157_BCA8_CFEC07ED34AE" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstA21CBC_3D4F_480a_B24B_49A69CC51624" name="epo-ord:hasDeliveryPeriod" association="EAID_DCA21CBC_3D4F_480a_B24B_49A69CC51624">
 							<type xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000031__3D4F_480a_B24B_49A69CC51624" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000032__3D4F_480a_B24B_49A69CC51624" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000035__3D4F_480a_B24B_49A69CC51624" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000036__3D4F_480a_B24B_49A69CC51624" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst2DCABC_3EFA_4af4_B368_9AA9D2B6757D" name="epo-ord:specifiesGeneralDeliveryAgreement" association="EAID_ED2DCABC_3EFA_4af4_B368_9AA9D2B6757D">
 							<type xmi:idref="EAID_EA36CA1F_5963_4ff6_86BE_1ACC9D34E843"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000033__3EFA_4af4_B368_9AA9D2B6757D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000034__3EFA_4af4_B368_9AA9D2B6757D" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000037__3EFA_4af4_B368_9AA9D2B6757D" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000038__3EFA_4af4_B368_9AA9D2B6757D" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst951C5B_94E2_4a5f_BF21_25D103CB3656" name="epo-ful:hasTrackingID" association="EAID_F0951C5B_94E2_4a5f_BF21_25D103CB3656">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000035__94E2_4a5f_BF21_25D103CB3656" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000036__94E2_4a5f_BF21_25D103CB3656" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000039__94E2_4a5f_BF21_25D103CB3656" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000040__94E2_4a5f_BF21_25D103CB3656" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst9B2205_58A2_42e8_ACA2_4C099B935E15" name="epo-ord:specifiesSpecificDeliveryAgreement" association="EAID_F79B2205_58A2_42e8_ACA2_4C099B935E15">
 							<type xmi:idref="EAID_EA36CA1F_5963_4ff6_86BE_1ACC9D34E843"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000037__58A2_42e8_ACA2_4C099B935E15" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000038__58A2_42e8_ACA2_4C099B935E15" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000041__58A2_42e8_ACA2_4C099B935E15" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000042__58A2_42e8_ACA2_4C099B935E15" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_ADDD985E_9817_4356_BF94_B8B6325FE628">
@@ -267,6 +291,13 @@
 							<type xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_810B5419_84AA_4cbc_BD0F_1B682068D4FB">
+						<memberEnd xmi:idref="EAID_dst0B5419_84AA_4cbc_BD0F_1B682068D4FB"/>
+						<memberEnd xmi:idref="EAID_src0B5419_84AA_4cbc_BD0F_1B682068D4FB"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0B5419_84AA_4cbc_BD0F_1B682068D4FB" association="EAID_810B5419_84AA_4cbc_BD0F_1B682068D4FB">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B9BA1AAD_DA48_4953_9445_B3D0C269B4E6">
 						<memberEnd xmi:idref="EAID_dstBA1AAD_DA48_4953_9445_B3D0C269B4E6"/>
 						<memberEnd xmi:idref="EAID_srcBA1AAD_DA48_4953_9445_B3D0C269B4E6"/>
@@ -283,122 +314,134 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" name="epo-ord:Order">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_136FF2A2_5E7E_4f6b_88CC_0465F90D5A77" name="epo-ord:hasCustomerReference">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000039_5E7E_4f6b_88CC_0465F90D5A77" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000040_5E7E_4f6b_88CC_0465F90D5A77" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000043_5E7E_4f6b_88CC_0465F90D5A77" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000044_5E7E_4f6b_88CC_0465F90D5A77" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_020ED37D_6C6C_4792_BA95_9DBC1C57FD5D" name="epo-ord:hasAccountingCost">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000041_6C6C_4792_BA95_9DBC1C57FD5D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000042_6C6C_4792_BA95_9DBC1C57FD5D" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000045_6C6C_4792_BA95_9DBC1C57FD5D" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000046_6C6C_4792_BA95_9DBC1C57FD5D" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_52107FB7_C54B_479e_9D20_D1D2C915CB6C" name="epo-ord:hasPaymentTerm">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000043_C54B_479e_9D20_D1D2C915CB6C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000044_C54B_479e_9D20_D1D2C915CB6C" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000047_C54B_479e_9D20_D1D2C915CB6C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000048_C54B_479e_9D20_D1D2C915CB6C" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstC53A6F_084E_4dbf_817A_1DF5BE5981D8" name="epo:hasValidityPeriod" association="EAID_24C53A6F_084E_4dbf_817A_1DF5BE5981D8">
+							<type xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000049__084E_4dbf_817A_1DF5BE5981D8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000050__084E_4dbf_817A_1DF5BE5981D8" value="1"/>
+						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstD3C49F_AF44_49ad_8519_B199CADD080B" name="epo-ord:hasTotalTaxInclusiveAmount" association="EAID_29D3C49F_AF44_49ad_8519_B199CADD080B">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000045__AF44_49ad_8519_B199CADD080B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000046__AF44_49ad_8519_B199CADD080B" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000051__AF44_49ad_8519_B199CADD080B" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000052__AF44_49ad_8519_B199CADD080B" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst64F9E7_B02B_4433_AB2C_0A6E23A8559E" name="epo-ord:hasTotalTaxExclusiveAmount" association="EAID_2C64F9E7_B02B_4433_AB2C_0A6E23A8559E">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000047__B02B_4433_AB2C_0A6E23A8559E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000048__B02B_4433_AB2C_0A6E23A8559E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000053__B02B_4433_AB2C_0A6E23A8559E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000054__B02B_4433_AB2C_0A6E23A8559E" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE7ABA9_FFB1_4212_81E5_12821EB05CDD" name="epo-ord:specifiesContractInformation" association="EAID_36E7ABA9_FFB1_4212_81E5_12821EB05CDD">
 							<type xmi:idref="EAID_1D470B74_66C6_4e95_82A9_28C6309EBB94"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000049__FFB1_4212_81E5_12821EB05CDD" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000050__FFB1_4212_81E5_12821EB05CDD" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000055__FFB1_4212_81E5_12821EB05CDD" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000056__FFB1_4212_81E5_12821EB05CDD" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst338F2C_8F52_4c58_8FE0_29F2F5CFCD7E" name="epo-ord:comprisesOrderLine" association="EAID_46338F2C_8F52_4c58_8FE0_29F2F5CFCD7E">
 							<type xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000051__8F52_4c58_8FE0_29F2F5CFCD7E" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000052__8F52_4c58_8FE0_29F2F5CFCD7E" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000057__8F52_4c58_8FE0_29F2F5CFCD7E" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000058__8F52_4c58_8FE0_29F2F5CFCD7E" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst29001E_A2EF_4905_B7BD_A92CA6123721" name="epo:specifiesDespatcher" association="EAID_7129001E_A2EF_4905_B7BD_A92CA6123721">
 							<type xmi:idref="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000053__A2EF_4905_B7BD_A92CA6123721" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000054__A2EF_4905_B7BD_A92CA6123721" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000059__A2EF_4905_B7BD_A92CA6123721" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000060__A2EF_4905_B7BD_A92CA6123721" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst1163CB_9C26_4b4f_BCD6_23ABF38C12BE" name="epo-cat:specifiesChargeInformation" association="EAID_7A1163CB_9C26_4b4f_BCD6_23ABF38C12BE">
 							<type xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000055__9C26_4b4f_BCD6_23ABF38C12BE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000056__9C26_4b4f_BCD6_23ABF38C12BE" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000061__9C26_4b4f_BCD6_23ABF38C12BE" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000062__9C26_4b4f_BCD6_23ABF38C12BE" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst3DC23D_A612_4ba0_B319_00C96CEA60BC" name="epo-ord:refersToCatalogue" association="EAID_813DC23D_A612_4ba0_B319_00C96CEA60BC">
 							<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000057__A612_4ba0_B319_00C96CEA60BC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000058__A612_4ba0_B319_00C96CEA60BC" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000063__A612_4ba0_B319_00C96CEA60BC" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000064__A612_4ba0_B319_00C96CEA60BC" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstBBB829_4470_4b0d_A142_494C41C8807D" name="epo-ord:hasTotalLineAmount" association="EAID_8DBBB829_4470_4b0d_A142_494C41C8807D">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000059__4470_4b0d_A142_494C41C8807D" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000060__4470_4b0d_A142_494C41C8807D" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000065__4470_4b0d_A142_494C41C8807D" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000066__4470_4b0d_A142_494C41C8807D" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst66393B_8067_4f18_9B28_69541B862505" name="epo:refersToProject" association="EAID_9866393B_8067_4f18_9B28_69541B862505">
 							<type xmi:idref="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000061__8067_4f18_9B28_69541B862505" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000062__8067_4f18_9B28_69541B862505" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000067__8067_4f18_9B28_69541B862505" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000068__8067_4f18_9B28_69541B862505" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_9F9DDC4D_D1D7_4c74_943A_79D432082022" general="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst10770D_19E8_400c_A438_44EEAB172389" name="epo-ord:hasTotalAllowanceAmount" association="EAID_A110770D_19E8_400c_A438_44EEAB172389">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000063__19E8_400c_A438_44EEAB172389" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000064__19E8_400c_A438_44EEAB172389" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000069__19E8_400c_A438_44EEAB172389" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000070__19E8_400c_A438_44EEAB172389" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst61F37A_DE72_4467_A025_043DE09FF216" name="epo:specifiesSeller" association="EAID_BF61F37A_DE72_4467_A025_043DE09FF216">
 							<type xmi:idref="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000065__DE72_4467_A025_043DE09FF216" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000066__DE72_4467_A025_043DE09FF216" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000071__DE72_4467_A025_043DE09FF216" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000072__DE72_4467_A025_043DE09FF216" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF576CC_0DFC_40d6_86C4_6F47177DB0C6" name="epo-ord:hasRoundingAmount" association="EAID_C3F576CC_0DFC_40d6_86C4_6F47177DB0C6">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000067__0DFC_40d6_86C4_6F47177DB0C6" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000068__0DFC_40d6_86C4_6F47177DB0C6" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000073__0DFC_40d6_86C4_6F47177DB0C6" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000074__0DFC_40d6_86C4_6F47177DB0C6" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstD92701_64B7_43fe_A8FE_020E2E87A51A" name="epo-ord:specifiesAllowanceInformation" association="EAID_C4D92701_64B7_43fe_A8FE_020E2E87A51A">
 							<type xmi:idref="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000069__64B7_43fe_A8FE_020E2E87A51A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000070__64B7_43fe_A8FE_020E2E87A51A" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000075__64B7_43fe_A8FE_020E2E87A51A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000076__64B7_43fe_A8FE_020E2E87A51A" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst53CDC6_88B6_449b_B44C_0F56A31472A7" name="epo-ord:hasPrepaidAmount" association="EAID_C753CDC6_88B6_449b_B44C_0F56A31472A7">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000071__88B6_449b_B44C_0F56A31472A7" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000072__88B6_449b_B44C_0F56A31472A7" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000077__88B6_449b_B44C_0F56A31472A7" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000078__88B6_449b_B44C_0F56A31472A7" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE972DE_D8B8_42a5_A6A1_F386873985BC" name="epo-ord:hasAmountDueForPayment" association="EAID_CBE972DE_D8B8_42a5_A6A1_F386873985BC">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000073__D8B8_42a5_A6A1_F386873985BC" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000074__D8B8_42a5_A6A1_F386873985BC" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000079__D8B8_42a5_A6A1_F386873985BC" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000080__D8B8_42a5_A6A1_F386873985BC" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstFAB429_5D16_4718_A790_6F3EB673B453" name="epo:specifiesBuyer" association="EAID_D2FAB429_5D16_4718_A790_6F3EB673B453">
 							<type xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000075__5D16_4718_A790_6F3EB673B453" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000076__5D16_4718_A790_6F3EB673B453" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000081__5D16_4718_A790_6F3EB673B453" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000082__5D16_4718_A790_6F3EB673B453" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst2B1380_78A6_4579_B0FD_C3609EBD8AFD" name="epo-ord:hasSellerOrderID" association="EAID_D42B1380_78A6_4579_B0FD_C3609EBD8AFD">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000077__78A6_4579_B0FD_C3609EBD8AFD" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000078__78A6_4579_B0FD_C3609EBD8AFD" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000083__78A6_4579_B0FD_C3609EBD8AFD" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000084__78A6_4579_B0FD_C3609EBD8AFD" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst5A5085_B775_40dd_87F4_44B260BCBB19" name="epo-ord:specifiesDeliveryInformation" association="EAID_E35A5085_B775_40dd_87F4_44B260BCBB19">
 							<type xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000079__B775_40dd_87F4_44B260BCBB19" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000080__B775_40dd_87F4_44B260BCBB19" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000085__B775_40dd_87F4_44B260BCBB19" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000086__B775_40dd_87F4_44B260BCBB19" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst3F1621_7810_4b80_BE0A_37F252FE6245" name="epo-ord:specifiesOriginatorInformation" association="EAID_F03F1621_7810_4b80_BE0A_37F252FE6245">
 							<type xmi:idref="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000081__7810_4b80_BE0A_37F252FE6245" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000082__7810_4b80_BE0A_37F252FE6245" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000087__7810_4b80_BE0A_37F252FE6245" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000088__7810_4b80_BE0A_37F252FE6245" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst8CF3B1_3FB3_43b9_B9AB_1FE660C3663F" name="epo-ord:hasTotalChargeAmount" association="EAID_F78CF3B1_3FB3_43b9_B9AB_1FE660C3663F">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000083__3FB3_43b9_B9AB_1FE660C3663F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000084__3FB3_43b9_B9AB_1FE660C3663F" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000089__3FB3_43b9_B9AB_1FE660C3663F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000090__3FB3_43b9_B9AB_1FE660C3663F" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_24C53A6F_084E_4dbf_817A_1DF5BE5981D8">
+						<memberEnd xmi:idref="EAID_dstC53A6F_084E_4dbf_817A_1DF5BE5981D8"/>
+						<memberEnd xmi:idref="EAID_srcC53A6F_084E_4dbf_817A_1DF5BE5981D8"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC53A6F_084E_4dbf_817A_1DF5BE5981D8" association="EAID_24C53A6F_084E_4dbf_817A_1DF5BE5981D8">
+							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_29D3C49F_AF44_49ad_8519_B199CADD080B">
 						<memberEnd xmi:idref="EAID_dstD3C49F_AF44_49ad_8519_B199CADD080B"/>
 						<memberEnd xmi:idref="EAID_srcD3C49F_AF44_49ad_8519_B199CADD080B"/>
@@ -525,6 +568,13 @@
 							<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_78E3CABC_FE13_4dc0_BA12_FFFFA0D54042">
+						<memberEnd xmi:idref="EAID_dstE3CABC_FE13_4dc0_BA12_FFFFA0D54042"/>
+						<memberEnd xmi:idref="EAID_srcE3CABC_FE13_4dc0_BA12_FFFFA0D54042"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE3CABC_FE13_4dc0_BA12_FFFFA0D54042" association="EAID_78E3CABC_FE13_4dc0_BA12_FFFFA0D54042">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_AFC00307_2C3C_43a2_91E7_AA8247B7CEDD">
 						<memberEnd xmi:idref="EAID_dstC00307_2C3C_43a2_91E7_AA8247B7CEDD"/>
 						<memberEnd xmi:idref="EAID_srcC00307_2C3C_43a2_91E7_AA8247B7CEDD"/>
@@ -535,18 +585,18 @@
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" name="epo-ord:OrderLine">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst2B76C7_EF6B_4c76_8A07_9FF99AC0CF07" name="epo-ord:refersToCatalogueLine" association="EAID_082B76C7_EF6B_4c76_8A07_9FF99AC0CF07">
 							<type xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000085__EF6B_4c76_8A07_9FF99AC0CF07" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000086__EF6B_4c76_8A07_9FF99AC0CF07" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000091__EF6B_4c76_8A07_9FF99AC0CF07" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000092__EF6B_4c76_8A07_9FF99AC0CF07" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstC5D04E_7364_4118_9D94_CE93A68B3CF9" name="epo-cat:hasQuantity" association="EAID_0AC5D04E_7364_4118_9D94_CE93A68B3CF9">
 							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000087__7364_4118_9D94_CE93A68B3CF9" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000088__7364_4118_9D94_CE93A68B3CF9" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000093__7364_4118_9D94_CE93A68B3CF9" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000094__7364_4118_9D94_CE93A68B3CF9" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst2E5010_8DA9_46f5_A0D6_59757CEC226D" name="epo-cat:hasPrice" association="EAID_1F2E5010_8DA9_46f5_A0D6_59757CEC226D">
 							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000089__8DA9_46f5_A0D6_59757CEC226D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000090__8DA9_46f5_A0D6_59757CEC226D" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000095__8DA9_46f5_A0D6_59757CEC226D" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000096__8DA9_46f5_A0D6_59757CEC226D" value="*"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_AA589EDA_B26B_44c3_BCCC_37421BA960DE" general="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7"/>
 					</packagedElement>
@@ -571,6 +621,13 @@
 							<type xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_8254F8D7_D6F0_4c63_A478_9179AAD0DF81">
+						<memberEnd xmi:idref="EAID_dst54F8D7_D6F0_4c63_A478_9179AAD0DF81"/>
+						<memberEnd xmi:idref="EAID_src54F8D7_D6F0_4c63_A478_9179AAD0DF81"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src54F8D7_D6F0_4c63_A478_9179AAD0DF81" association="EAID_8254F8D7_D6F0_4c63_A478_9179AAD0DF81">
+							<type xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_AD18A153_57A6_4142_86D1_A887FC375039">
 						<memberEnd xmi:idref="EAID_dst18A153_57A6_4142_86D1_A887FC375039"/>
 						<memberEnd xmi:idref="EAID_src18A153_57A6_4142_86D1_A887FC375039"/>
@@ -620,18 +677,18 @@
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_014949B1_BE8E_4bef_8E6B_98E657488D49" general="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstA55DED_4624_43a3_8FA7_D8F2D6516D40" name="epo-ord:concernsOriginator" association="EAID_74A55DED_4624_43a3_8FA7_D8F2D6516D40">
 							<type xmi:idref="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000091__4624_43a3_8FA7_D8F2D6516D40" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000092__4624_43a3_8FA7_D8F2D6516D40" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000097__4624_43a3_8FA7_D8F2D6516D40" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000098__4624_43a3_8FA7_D8F2D6516D40" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst6D38A5_94EF_4bae_941E_311C9FC4668A" name="epo-ord:concernsOriginatorRequest" association="EAID_976D38A5_94EF_4bae_941E_311C9FC4668A">
 							<type xmi:idref="EAID_23E9784F_4AEE_4484_9BAC_28A7FEB05838"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000093__94EF_4bae_941E_311C9FC4668A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000094__94EF_4bae_941E_311C9FC4668A" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000099__94EF_4bae_941E_311C9FC4668A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000100__94EF_4bae_941E_311C9FC4668A" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst53180A_8F43_4db4_900E_D8D8F18E8521" name="epo-ord:isSpecificToOrderLine" association="EAID_C553180A_8F43_4db4_900E_D8D8F18E8521">
 							<type xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000095__8F43_4db4_900E_D8D8F18E8521" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000096__8F43_4db4_900E_D8D8F18E8521" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000101__8F43_4db4_900E_D8D8F18E8521" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000102__8F43_4db4_900E_D8D8F18E8521" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_976D38A5_94EF_4bae_941E_311C9FC4668A">
@@ -665,6 +722,13 @@
 							<type xmi:idref="EAID_CF553CC8_8DC9_4ea2_B386_8ACB39A17657"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_E8BF523C_66C7_4412_825C_9D63A7DB9BFF">
+						<memberEnd xmi:idref="EAID_dstBF523C_66C7_4412_825C_9D63A7DB9BFF"/>
+						<memberEnd xmi:idref="EAID_srcBF523C_66C7_4412_825C_9D63A7DB9BFF"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBF523C_66C7_4412_825C_9D63A7DB9BFF" association="EAID_E8BF523C_66C7_4412_825C_9D63A7DB9BFF">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F0AC5841_AE12_4b29_9A54_29BA5C9C4A38">
 						<memberEnd xmi:idref="EAID_dstAC5841_AE12_4b29_9A54_29BA5C9C4A38"/>
 						<memberEnd xmi:idref="EAID_srcAC5841_AE12_4b29_9A54_29BA5C9C4A38"/>
@@ -674,24 +738,24 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" name="epo-ord:TaxInformation">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_28EB145B_8DD8_49b7_8986_81DD8F3654E4" name="epo-cat:hasPercentage">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000097_8DD8_49b7_8986_81DD8F3654E4" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000098_8DD8_49b7_8986_81DD8F3654E4" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000103_8DD8_49b7_8986_81DD8F3654E4" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000104_8DD8_49b7_8986_81DD8F3654E4" value="1"/>
 							<type xmi:idref="EAJava_xsd_decimal"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_573DEA29_FDB2_441a_98C2_1EDF890CF3DD" name="dct:description">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000099_FDB2_441a_98C2_1EDF890CF3DD" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000100_FDB2_441a_98C2_1EDF890CF3DD" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000105_FDB2_441a_98C2_1EDF890CF3DD" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000106_FDB2_441a_98C2_1EDF890CF3DD" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst0D1B16_C07B_4868_91B2_799578663395" name="epo:isCalculatedOn" association="EAID_470D1B16_C07B_4868_91B2_799578663395">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000101__C07B_4868_91B2_799578663395" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000102__C07B_4868_91B2_799578663395" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000107__C07B_4868_91B2_799578663395" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000108__C07B_4868_91B2_799578663395" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst123434_C2AD_43de_925D_13E9A7667A18" name="epo-cat:hasAmount" association="EAID_87123434_C2AD_43de_925D_13E9A7667A18">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000103__C2AD_43de_925D_13E9A7667A18" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000104__C2AD_43de_925D_13E9A7667A18" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000109__C2AD_43de_925D_13E9A7667A18" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000110__C2AD_43de_925D_13E9A7667A18" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_F38D2FE9_AA8F_4ecb_A19A_9A7A0B30CF7E" general="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
 					</packagedElement>
@@ -718,6 +782,27 @@
 							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_8FE282D8_21BB_4e43_8F2A_1B37812ADCA1">
+						<memberEnd xmi:idref="EAID_dstE282D8_21BB_4e43_8F2A_1B37812ADCA1"/>
+						<memberEnd xmi:idref="EAID_srcE282D8_21BB_4e43_8F2A_1B37812ADCA1"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE282D8_21BB_4e43_8F2A_1B37812ADCA1" association="EAID_8FE282D8_21BB_4e43_8F2A_1B37812ADCA1">
+							<type xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_AF564753_2A12_4d02_8DB3_0F11F0819AB2">
+						<memberEnd xmi:idref="EAID_dst564753_2A12_4d02_8DB3_0F11F0819AB2"/>
+						<memberEnd xmi:idref="EAID_src564753_2A12_4d02_8DB3_0F11F0819AB2"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src564753_2A12_4d02_8DB3_0F11F0819AB2" association="EAID_AF564753_2A12_4d02_8DB3_0F11F0819AB2">
+							<type xmi:idref="EAID_BE27BBA5_3E46_4b8b_96B2_9B6152688E23"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_DB71486E_B9DA_432e_B070_BFF4ECEF7300">
+						<memberEnd xmi:idref="EAID_dst71486E_B9DA_432e_B070_BFF4ECEF7300"/>
+						<memberEnd xmi:idref="EAID_src71486E_B9DA_432e_B070_BFF4ECEF7300"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src71486E_B9DA_432e_B070_BFF4ECEF7300" association="EAID_DB71486E_B9DA_432e_B070_BFF4ECEF7300">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_FBD708FC_CE05_4098_ADF6_2FEC3A1BB755">
 						<memberEnd xmi:idref="EAID_dstD708FC_CE05_4098_ADF6_2FEC3A1BB755"/>
 						<memberEnd xmi:idref="EAID_srcD708FC_CE05_4098_ADF6_2FEC3A1BB755"/>
@@ -728,47 +813,47 @@
 				</packagedElement>
 			</packagedElement>
 			<packagedElement xmi:type="uml:Package" xmi:id="EAPK_44147FFC_CE0D_4cb8_94F5_0B4C7BAF6127" name="order response">
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_70689CE1_2681_4a24_93B5_A80337180E43" name="diagrams">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_C19B5FA7_AD57_4c09_8A50_D50200E83D15" name="diagrams">
 					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_D7E32546_10E8_48f1_BCFD_D9808F73B52B" body="If contractually agreed, the Seller also may respond to the order, changing details that are acceptable by the Buyer.&#xA;-- If an order is accepted with change, the buyer and seller need to have an agreement between them regarding the processing of the changed order, i.e. when is a contract concluded and when can the items be shipped.&#xA;&#xA;Proposal: &#xA;If the order  response is &quot;Change&quot; then the Buyer will create (instantiate) a new order implementing the changes and superseding the previously sent order. ">
 						<annotatedElement xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556"/>
 					</ownedComment>
 				</packagedElement>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_4B590216_59B8_4fc2_9DEA_627B4099D6D4" name="classes">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_7E3D3F90_8267_466d_875D_B6B46A3BCBF0" name="classes">
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" name="epo-ord:OrderResponse">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_4B7CCAB3_628F_41fd_A787_5AF33D50812B" name="epo-ord:hasResponseDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000105_628F_41fd_A787_5AF33D50812B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000106_628F_41fd_A787_5AF33D50812B" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000111_628F_41fd_A787_5AF33D50812B" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000112_628F_41fd_A787_5AF33D50812B" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstCF78D6_E061_467c_8F33_D45D96E7471E" name="epo-ord:comprisesOrderResponseLine" association="EAID_13CF78D6_E061_467c_8F33_D45D96E7471E">
 							<type xmi:idref="EAID_F655321A_F106_46f3_933E_53ADDFD9113B"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000107__E061_467c_8F33_D45D96E7471E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000108__E061_467c_8F33_D45D96E7471E" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000113__E061_467c_8F33_D45D96E7471E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000114__E061_467c_8F33_D45D96E7471E" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstC00307_2C3C_43a2_91E7_AA8247B7CEDD" name="epo-ord:isSubmittedForOrder" association="EAID_AFC00307_2C3C_43a2_91E7_AA8247B7CEDD">
 							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000109__2C3C_43a2_91E7_AA8247B7CEDD" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000110__2C3C_43a2_91E7_AA8247B7CEDD" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000115__2C3C_43a2_91E7_AA8247B7CEDD" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000116__2C3C_43a2_91E7_AA8247B7CEDD" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF97AE3_C138_47de_9B92_F1BE4B376642" name="epo-ord:specifiesOrderResponseInformation" association="EAID_ECF97AE3_C138_47de_9B92_F1BE4B376642">
 							<type xmi:idref="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000111__C138_47de_9B92_F1BE4B376642" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000112__C138_47de_9B92_F1BE4B376642" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000117__C138_47de_9B92_F1BE4B376642" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000118__C138_47de_9B92_F1BE4B376642" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstAC5841_AE12_4b29_9A54_29BA5C9C4A38" name="epo-ord:specifiesSeller" association="EAID_F0AC5841_AE12_4b29_9A54_29BA5C9C4A38">
 							<type xmi:idref="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000113__AE12_4b29_9A54_29BA5C9C4A38" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000114__AE12_4b29_9A54_29BA5C9C4A38" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000119__AE12_4b29_9A54_29BA5C9C4A38" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000120__AE12_4b29_9A54_29BA5C9C4A38" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst419AFF_EA5D_40db_B89D_FEC52A5F5DBC" name="epo-ord:specifiesBuyer" association="EAID_F1419AFF_EA5D_40db_B89D_FEC52A5F5DBC">
 							<type xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000115__EA5D_40db_B89D_FEC52A5F5DBC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000116__EA5D_40db_B89D_FEC52A5F5DBC" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000121__EA5D_40db_B89D_FEC52A5F5DBC" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000122__EA5D_40db_B89D_FEC52A5F5DBC" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF64E25_5DAC_4cec_8EE0_33C8C2F66C12" name="epo-ord:implementsContract" association="EAID_F2F64E25_5DAC_4cec_8EE0_33C8C2F66C12">
 							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000117__5DAC_4cec_8EE0_33C8C2F66C12" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000118__5DAC_4cec_8EE0_33C8C2F66C12" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000123__5DAC_4cec_8EE0_33C8C2F66C12" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000124__5DAC_4cec_8EE0_33C8C2F66C12" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_F3DC6C10_C71E_4d6a_8E54_05CFB346E654" general="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
 					</packagedElement>
@@ -804,13 +889,13 @@
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_1B6003C0_D0B7_432f_8EA3_408BD2086789" general="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstB39003_2ED7_40e3_B01B_D11FF794AF2B" name="epo-ord:isSpecificToOrderResponseLine" association="EAID_41B39003_2ED7_40e3_B01B_D11FF794AF2B">
 							<type xmi:idref="EAID_F655321A_F106_46f3_933E_53ADDFD9113B"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000119__2ED7_40e3_B01B_D11FF794AF2B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000120__2ED7_40e3_B01B_D11FF794AF2B" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000125__2ED7_40e3_B01B_D11FF794AF2B" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000126__2ED7_40e3_B01B_D11FF794AF2B" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstC3F218_90EF_42ed_B918_7EEB88718C50" name="epo-ord:hasDeliveryPeriod" association="EAID_89C3F218_90EF_42ed_B918_7EEB88718C50">
 							<type xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000121__90EF_42ed_B918_7EEB88718C50" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000122__90EF_42ed_B918_7EEB88718C50" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000127__90EF_42ed_B918_7EEB88718C50" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000128__90EF_42ed_B918_7EEB88718C50" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_41B39003_2ED7_40e3_B01B_D11FF794AF2B">
@@ -832,12 +917,12 @@
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_9343C3B2_DB33_4545_A54D_801F70801F89" general="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF5C9AF_E278_4ca2_80B9_C8B85FBF7E96" name="epo-ord:isSubmittedForOrderLine" association="EAID_B2F5C9AF_E278_4ca2_80B9_C8B85FBF7E96">
 							<type xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000123__E278_4ca2_80B9_C8B85FBF7E96" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000124__E278_4ca2_80B9_C8B85FBF7E96" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000129__E278_4ca2_80B9_C8B85FBF7E96" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000130__E278_4ca2_80B9_C8B85FBF7E96" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 				</packagedElement>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_2B96F637_F575_4aab_B2D9_297DB63948D0" name="controlled vocabularies">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_FDC814B4_C647_4a6e_87B5_5D2514CCB379" name="controlled vocabularies">
 					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_1E0B8798_161F_491d_ADC5_9FD206CC6125" name="at-voc-new:ResponseStatus">
 						<ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="EAID_EADCE343_CBD4_4bd5_92AD_3F07BE4ACCBE" name="Accepted"/>
 						<ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="EAID_7EACCF92_5B82_46a7_82F9_20FC14D774C0" name="Rejected"/>
@@ -857,94 +942,106 @@
 				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_DD30645A_3A1A_40ab_BAE1_A2CE1366635F" name="xsd:integer"/>
 			</packagedElement>
 		</packagedElement>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_C451B2CC_DD71_461f_8B8E_B08F284A9D7E" isFrame="false" modelElement="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_C451B2CC_DD71_461f_8B8E_B08F284A9D7E" isFrame="false" modelElement="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A">
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_C451B2CC_DD71_461f_B222_35A41469D7C5" modelElement="EAID_151E333E_CEC7_4c28_B222_35A41469D7C5">
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_B222_35A41469D7C5" x="325" y="359" width="115" height="55"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_B222_35A41469D7C5" x="318" y="434" width="115" height="55"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_C451B2CC_DD71_461f_A897_6A3BE5805EC3" modelElement="EAID_4CD6F72F_C895_4f45_A897_6A3BE5805EC3">
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_A897_6A3BE5805EC3" x="472" y="359" width="115" height="55"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_A897_6A3BE5805EC3" x="465" y="434" width="115" height="55"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C451B2CC_DD71_461f_95E7_ABB29EDCEDFD" modelElement="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DD71_461f_95E7_ABB29EDCEDFD" text="epo-cat:Manufacturer"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_95E7_ABB29EDCEDFD" x="1052" y="238" width="96" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_95E7_ABB29EDCEDFD" x="927" y="313" width="96" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C451B2CC_DD71_461f_9284_B6F7309F5985" modelElement="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DD71_461f_9284_B6F7309F5985" text="epo:OfferingParty"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_9284_B6F7309F5985" x="904" y="86" width="115" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_9284_B6F7309F5985" x="779" y="161" width="115" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C451B2CC_DD71_461f_B8B3_4DB83EC94A01" modelElement="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DD71_461f_B8B3_4DB83EC94A01" text="epo-ord:Seller"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_B8B3_4DB83EC94A01" x="780" y="238" width="96" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_B8B3_4DB83EC94A01" x="655" y="313" width="96" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C451B2CC_DD71_461f_9655_04521F703750" modelElement="EAID_96B284C4_E759_4bad_9655_04521F703750">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DD71_461f_9655_04521F703750" text="epo:Buyer"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_9655_04521F703750" x="51" y="222" width="228" height="101"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_9655_04521F703750" x="44" y="297" width="228" height="101"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C451B2CC_DD71_461f_B50E_A7C6B28E280E" modelElement="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DD71_461f_B50E_A7C6B28E280E" text="epo-ord:Originator"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_B50E_A7C6B28E280E" x="485" y="238" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_B50E_A7C6B28E280E" x="478" y="313" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_C451B2CC_DD71_461f_887E_3D02A662D444" modelElement="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444">
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_887E_3D02A662D444" x="859" y="374" width="207" height="187"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_887E_3D02A662D444" x="734" y="449" width="207" height="187"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C451B2CC_DD71_461f_844D_DCAF96861695" modelElement="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DD71_461f_844D_DCAF96861695" text="epo-ord:Consignee"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_844D_DCAF96861695" x="337" y="238" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_844D_DCAF96861695" x="330" y="313" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C451B2CC_DD71_461f_B61A_99942ED53255" modelElement="EAID_BCFFD008_5189_4d53_B61A_99942ED53255">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DD71_461f_B61A_99942ED53255" text="epo:AcquiringParty"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_B61A_99942ED53255" x="324" y="86" width="115" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_B61A_99942ED53255" x="317" y="161" width="115" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C451B2CC_DD71_461f_8EF3_D893D4201BD3" modelElement="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DD71_461f_8EF3_D893D4201BD3" text="epo-ful:Despatcher"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_8EF3_D893D4201BD3" x="913" y="238" width="96" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_8EF3_D893D4201BD3" x="788" y="313" width="96" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C451B2CC_DD71_461f_A12E_00C2BE16F4B6" modelElement="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DD71_461f_A12E_00C2BE16F4B6" text="epo:AgentInRole"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_A12E_00C2BE16F4B6" x="546" y="22" width="171" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C451B2CC_DD71_461f_BDBC_A13B860A4535" source="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_ACAE27B9_7F0D_4491_BDBC_A13B860A4535">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DD71_461f_BDBC_A13B860A4535" x="961" y="238"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_BDBC_A13B860A4535" x="961" y="156"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DD71_461f_BDBC_A13B860A4535" x="836" y="313"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_BDBC_A13B860A4535" x="836" y="231"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C451B2CC_DD71_461f_A266_DDF9F55EABCE" source="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" target="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" modelElement="EAID_93385F64_990A_44d0_A266_DDF9F55EABCE">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DD71_461f_A266_DDF9F55EABCE" x="432" y="164"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_A266_DDF9F55EABCE" x="566" y="92"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C451B2CC_DD71_461f_9657_EC6B3D521C37" source="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444" target="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3" modelElement="EAID_B6C50430_8249_4ddc_9657_EC6B3D521C37">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DD71_461f_9657_EC6B3D521C37" x="961" y="374"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_9657_EC6B3D521C37" x="961" y="308"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DD71_461f_9657_EC6B3D521C37" x="836" y="449"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_9657_EC6B3D521C37" x="836" y="383"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C451B2CC_DD71_461f_924C_BF1F30BDA6CD" source="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444" target="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" modelElement="EAID_2902C23F_2D24_4d06_924C_BF1F30BDA6CD">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DD71_461f_924C_BF1F30BDA6CD" x="911" y="374"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_924C_BF1F30BDA6CD" x="865" y="308"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DD71_461f_924C_BF1F30BDA6CD" x="786" y="449"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_924C_BF1F30BDA6CD" x="740" y="383"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C451B2CC_DD71_461f_A5A2_DD96859DF5FB" source="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444" target="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD" modelElement="EAID_DA29E13C_0424_4173_A5A2_DD96859DF5FB">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DD71_461f_A5A2_DD96859DF5FB" x="1028" y="374"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_A5A2_DD96859DF5FB" x="1075" y="308"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DD71_461f_A5A2_DD96859DF5FB" x="903" y="449"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_A5A2_DD96859DF5FB" x="950" y="383"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C451B2CC_DD71_461f_87FA_6410FDD407CF" source="EAID_4CD6F72F_C895_4f45_A897_6A3BE5805EC3" target="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E" modelElement="EAID_F40A4DB7_3736_4264_87FA_6410FDD407CF">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DD71_461f_87FA_6410FDD407CF" x="529" y="359"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_87FA_6410FDD407CF" x="529" y="308"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DD71_461f_87FA_6410FDD407CF" x="522" y="434"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_87FA_6410FDD407CF" x="522" y="383"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C451B2CC_DD71_461f_83B7_20456106C5AD" source="EAID_151E333E_CEC7_4c28_B222_35A41469D7C5" target="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695" modelElement="EAID_504EDC48_0B7F_4532_83B7_20456106C5AD">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DD71_461f_83B7_20456106C5AD" x="386" y="359"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_83B7_20456106C5AD" x="386" y="308"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DD71_461f_83B7_20456106C5AD" x="379" y="434"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_83B7_20456106C5AD" x="379" y="383"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C451B2CC_DD71_461f_B4C0_912C9C11EC4E" source="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_D2C94CC0_A14F_4c9c_B4C0_912C9C11EC4E">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DD71_461f_B4C0_912C9C11EC4E" x="1062" y="238"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_B4C0_912C9C11EC4E" x="993" y="156"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DD71_461f_B4C0_912C9C11EC4E" x="937" y="313"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_B4C0_912C9C11EC4E" x="868" y="231"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C451B2CC_DD71_461f_8ABC_CDD0FA9EF71E" source="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695" target="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" modelElement="EAID_8713966E_EA7B_4ed9_8ABC_CDD0FA9EF71E">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DD71_461f_8ABC_CDD0FA9EF71E" x="376" y="238"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_8ABC_CDD0FA9EF71E" x="376" y="156"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DD71_461f_8ABC_CDD0FA9EF71E" x="369" y="313"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_8ABC_CDD0FA9EF71E" x="369" y="231"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C451B2CC_DD71_461f_947D_E6C47AAC7527" source="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" target="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" modelElement="EAID_4657FAEB_1A34_4ef7_947D_E6C47AAC7527">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DD71_461f_947D_E6C47AAC7527" x="839" y="161"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_947D_E6C47AAC7527" x="682" y="92"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C451B2CC_DD71_461f_8105_4D93D49DFA8A" source="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_A88E2729_62D9_493c_8105_4D93D49DFA8A">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DD71_461f_8105_4D93D49DFA8A" x="862" y="238"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_8105_4D93D49DFA8A" x="934" y="156"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DD71_461f_8105_4D93D49DFA8A" x="737" y="313"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_8105_4D93D49DFA8A" x="809" y="231"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C451B2CC_DD71_461f_B9C6_7721498D7537" source="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E" target="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" modelElement="EAID_BF3FF147_D995_4e17_B9C6_7721498D7537">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DD71_461f_B9C6_7721498D7537" x="495" y="238"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_B9C6_7721498D7537" x="415" y="156"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DD71_461f_B9C6_7721498D7537" x="488" y="313"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_B9C6_7721498D7537" x="408" y="231"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C451B2CC_DD71_461f_9C21_84470056CF01" source="EAID_96B284C4_E759_4bad_9655_04521F703750" target="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" modelElement="EAID_BD5C98D5_43D4_41be_9C21_84470056CF01">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DD71_461f_9C21_84470056CF01" x="248" y="222"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_9C21_84470056CF01" x="336" y="156"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DD71_461f_9C21_84470056CF01" x="241" y="297"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_9C21_84470056CF01" x="329" y="231"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_22250BDC_AC99_495d_9AAD_3A4E9486D937" isFrame="false" modelElement="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_22250BDC_AC99_495d_9AAD_3A4E9486D937" isFrame="false" modelElement="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_22250BDC_AC99_495d_847A_7E8C5EEC0432" modelElement="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AC99_495d_847A_7E8C5EEC0432" text="epo:Period"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AC99_495d_847A_7E8C5EEC0432" x="1111" y="1277" width="176" height="85"/>
@@ -999,7 +1096,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_22250BDC_AC99_495d_B5B1_F96CAB80B7F4" modelElement="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AC99_495d_B5B1_F96CAB80B7F4" text="epo-cat:ItemProperty"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AC99_495d_B5B1_F96CAB80B7F4" x="2159" y="1098" width="219" height="90"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AC99_495d_B5B1_F96CAB80B7F4" x="2159" y="1098" width="243" height="90"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_22250BDC_AC99_495d_8D25_BA714BA9C3EC" modelElement="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AC99_495d_8D25_BA714BA9C3EC" text="epo:Quantity"/>
@@ -1083,6 +1180,32 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AC99_495d_83AB_E27B06BA632B" text="epo-cat:PostAwardDocument"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AC99_495d_83AB_E27B06BA632B" x="878" y="451" width="131" height="69"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_86D1_A887FC375039" source="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" target="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" modelElement="EAID_AD18A153_57A6_4142_86D1_A887FC375039">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_86D1_A887FC375039" text="+epo-ord:isSpecificToOrderLine" modelElement="EAID_dst18A153_57A6_4142_86D1_A887FC375039">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_86D1_A887FC375039" x="1442" y="872" width="125" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_86D1_A887FC375039" text="0..*" modelElement="EAID_dst18A153_57A6_4142_86D1_A887FC375039">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_86D1_A887FC375039" x="1505" y="900" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_86D1_A887FC375039" x="1863" y="664"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_86D1_A887FC375039" x="1497" y="664"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AC99_495d_86D1_A887FC375039" x="1497" y="918"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_8070_7102E73439C9" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_F7CADBEA_BE8C_41f0_8070_7102E73439C9">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_8070_7102E73439C9" text="+epo-cat:hasExternalSpecification" modelElement="EAID_dstCADBEA_BE8C_41f0_8070_7102E73439C9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_8070_7102E73439C9" x="1211" y="199" width="135" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_8070_7102E73439C9" text="0..*" modelElement="EAID_dstCADBEA_BE8C_41f0_8070_7102E73439C9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_8070_7102E73439C9" x="1194" y="223" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_8070_7102E73439C9" x="2278" y="828"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_8070_7102E73439C9" x="2278" y="218"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AC99_495d_8070_7102E73439C9" x="1191" y="218"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_943A_79D432082022" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" modelElement="EAID_9F9DDC4D_D1D7_4c74_943A_79D432082022">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_943A_79D432082022" x="946" y="898"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_943A_79D432082022" x="946" y="520"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_8A07_9FF99AC0CF07" source="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" target="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" modelElement="EAID_082B76C7_EF6B_4c76_8A07_9FF99AC0CF07">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_8A07_9FF99AC0CF07" text="+epo-ord:refersToCatalogueLine" modelElement="EAID_dst2B76C7_EF6B_4c76_8A07_9FF99AC0CF07">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_8A07_9FF99AC0CF07" x="1635" y="939" width="129" height="14"/>
@@ -1093,16 +1216,6 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_8A07_9FF99AC0CF07" x="1593" y="961"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_8A07_9FF99AC0CF07" x="1773" y="961"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_8346_839CB32AF64E" source="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" target="EAID_2424C22E_B54F_4b6f_BA47_E78DE21C76DE" modelElement="EAID_F48E8C16_CD7F_4664_8346_839CB32AF64E">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_8346_839CB32AF64E" text="+locn:geometry" modelElement="EAID_dst8E8C16_CD7F_4664_8346_839CB32AF64E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_8346_839CB32AF64E" x="1289" y="1597" width="64" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_8346_839CB32AF64E" text="0..1" modelElement="EAID_dst8E8C16_CD7F_4664_8346_839CB32AF64E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_8346_839CB32AF64E" x="1289" y="1620" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_8346_839CB32AF64E" x="1398" y="1615"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_8346_839CB32AF64E" x="1286" y="1615"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_9D94_CE93A68B3CF9" source="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_0AC5D04E_7364_4118_9D94_CE93A68B3CF9">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_9D94_CE93A68B3CF9" text="+epo-cat:hasQuantity" modelElement="EAID_dstC5D04E_7364_4118_9D94_CE93A68B3CF9">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_9D94_CE93A68B3CF9" x="1678" y="1074" width="88" height="14"/>
@@ -1118,7 +1231,7 @@
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_A0D6_59757CEC226D" text="+epo-cat:hasPrice" modelElement="EAID_dst2E5010_8DA9_46f5_A0D6_59757CEC226D">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_A0D6_59757CEC226D" x="1941" y="760" width="72" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_A0D6_59757CEC226D" text="0..1" modelElement="EAID_dst2E5010_8DA9_46f5_A0D6_59757CEC226D">
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_A0D6_59757CEC226D" text="0..*" modelElement="EAID_dst2E5010_8DA9_46f5_A0D6_59757CEC226D">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_A0D6_59757CEC226D" x="2000" y="790" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_A0D6_59757CEC226D" x="1570" y="918"/>
@@ -1127,23 +1240,23 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_A80A_3CDDD84D3629" source="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" target="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" modelElement="EAID_0692BD51_5113_4e40_A80A_3CDDD84D3629">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_A80A_3CDDD84D3629" text="+epo-cat:describesItem" modelElement="EAID_dst92BD51_5113_4e40_A80A_3CDDD84D3629">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_A80A_3CDDD84D3629" x="2224" y="990" width="95" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_A80A_3CDDD84D3629" x="2233" y="990" width="95" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_A80A_3CDDD84D3629" text="1" modelElement="EAID_dst92BD51_5113_4e40_A80A_3CDDD84D3629">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_A80A_3CDDD84D3629" x="2282" y="973" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_A80A_3CDDD84D3629" x="2291" y="973" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_A80A_3CDDD84D3629" x="2270" y="1098"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_A80A_3CDDD84D3629" x="2270" y="968"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_A80A_3CDDD84D3629" x="2279" y="1098"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_A80A_3CDDD84D3629" x="2279" y="968"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_AA00_34CA1CC60CA2" source="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_B9C9C412_36FA_46d5_AA00_34CA1CC60CA2">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_AA00_34CA1CC60CA2" text="+epo-cat:hasQualifiedValue" modelElement="EAID_dstC9C412_36FA_46d5_AA00_34CA1CC60CA2">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_AA00_34CA1CC60CA2" x="1825" y="1122" width="112" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_AA00_34CA1CC60CA2" x="1825" y="1094" width="112" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_AA00_34CA1CC60CA2" text="0..1" modelElement="EAID_dstC9C412_36FA_46d5_AA00_34CA1CC60CA2">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_AA00_34CA1CC60CA2" x="1821" y="1151" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_AA00_34CA1CC60CA2" x="1821" y="1123" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_AA00_34CA1CC60CA2" x="2159" y="1144"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_AA00_34CA1CC60CA2" x="1818" y="1144"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_AA00_34CA1CC60CA2" x="2159" y="1116"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_AA00_34CA1CC60CA2" x="1818" y="1116"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_9953_EA1E6D255A89" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_3220FB6D_76C7_486a_9953_EA1E6D255A89">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_9953_EA1E6D255A89" text="+epo:hasContractValue" modelElement="EAID_dst20FB6D_76C7_486a_9953_EA1E6D255A89">
@@ -1166,30 +1279,37 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_B0AA_8C6787D5DF46" x="641" y="335"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_B0AA_8C6787D5DF46" x="641" y="629"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_B308_C0F08C743DCF" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_97C17D51_4DF6_4979_B308_C0F08C743DCF">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_B308_C0F08C743DCF" x="754" y="270"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_B308_C0F08C743DCF" x="963" y="270"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_8346_839CB32AF64E" source="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" target="EAID_2424C22E_B54F_4b6f_BA47_E78DE21C76DE" modelElement="EAID_F48E8C16_CD7F_4664_8346_839CB32AF64E">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_8346_839CB32AF64E" text="+locn:geometry" modelElement="EAID_dst8E8C16_CD7F_4664_8346_839CB32AF64E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_8346_839CB32AF64E" x="1289" y="1597" width="64" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_8346_839CB32AF64E" text="0..1" modelElement="EAID_dst8E8C16_CD7F_4664_8346_839CB32AF64E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_8346_839CB32AF64E" x="1289" y="1620" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_8346_839CB32AF64E" x="1398" y="1615"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_8346_839CB32AF64E" x="1286" y="1615"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_8070_7102E73439C9" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_F7CADBEA_BE8C_41f0_8070_7102E73439C9">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_8070_7102E73439C9" text="+epo-cat:hasExternalSpecification" modelElement="EAID_dstCADBEA_BE8C_41f0_8070_7102E73439C9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_8070_7102E73439C9" x="1211" y="199" width="135" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_A513_76150076F808" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_52CB7369_B0C2_4acc_A513_76150076F808">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_A513_76150076F808" text="+epo-inv:hasItemClassificationIdentifier" modelElement="EAID_dstCB7369_B0C2_4acc_A513_76150076F808">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_A513_76150076F808" x="2242" y="962" width="159" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_8070_7102E73439C9" text="0..*" modelElement="EAID_dstCADBEA_BE8C_41f0_8070_7102E73439C9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_8070_7102E73439C9" x="1194" y="223" width="100" height="10"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_A513_76150076F808" text="0..*" modelElement="EAID_dstCB7369_B0C2_4acc_A513_76150076F808">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_A513_76150076F808" x="2384" y="985" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_8070_7102E73439C9" x="2278" y="828"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_8070_7102E73439C9" x="2278" y="218"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AC99_495d_8070_7102E73439C9" x="1191" y="218"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_A513_76150076F808" x="2383" y="968"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_A513_76150076F808" x="2403" y="980"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_B7BD_A92CA6123721" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3" modelElement="EAID_7129001E_A2EF_4905_B7BD_A92CA6123721">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_B7BD_A92CA6123721" text="+epo:specifiesDespatcher" modelElement="EAID_dst29001E_A2EF_4905_B7BD_A92CA6123721">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_B7BD_A92CA6123721" x="764" y="955" width="103" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_B0FD_C3609EBD8AFD" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_D42B1380_78A6_4579_B0FD_C3609EBD8AFD">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_B0FD_C3609EBD8AFD" text="+epo-ord:hasSellerOrderID" modelElement="EAID_dst2B1380_78A6_4579_B0FD_C3609EBD8AFD">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_B0FD_C3609EBD8AFD" x="2450" y="1196" width="108" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_B7BD_A92CA6123721" text="0..1" modelElement="EAID_dst29001E_A2EF_4905_B7BD_A92CA6123721">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_B7BD_A92CA6123721" x="766" y="988" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_B0FD_C3609EBD8AFD" text="0..1" modelElement="EAID_dst2B1380_78A6_4579_B0FD_C3609EBD8AFD">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_B0FD_C3609EBD8AFD" x="2517" y="1122" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_B7BD_A92CA6123721" x="892" y="977"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_B7BD_A92CA6123721" x="758" y="977"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_B0FD_C3609EBD8AFD" x="953" y="1025"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_B0FD_C3609EBD8AFD" x="953" y="1265"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AC99_495d_B0FD_C3609EBD8AFD" x="2505" y="1265"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_AC99_495d_B0FD_C3609EBD8AFD" x="2505" y="1117"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_BEE6_89F708783872" source="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" target="EAID_29678A10_6473_461a_BE84_76269B5BBD68" modelElement="EAID_C70B3C1A_A0BD_494b_BEE6_89F708783872">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_BEE6_89F708783872" text="+locn:address" modelElement="EAID_dst0B3C1A_A0BD_494b_BEE6_89F708783872">
@@ -1235,14 +1355,14 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_87F4_44B260BCBB19" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" modelElement="EAID_E35A5085_B775_40dd_87F4_44B260BCBB19">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_87F4_44B260BCBB19" text="+epo-ord:specifiesDeliveryInformation" modelElement="EAID_dst5A5085_B775_40dd_87F4_44B260BCBB19">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_87F4_44B260BCBB19" x="1217" y="1385" width="154" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_87F4_44B260BCBB19" x="1217" y="1378" width="154" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_87F4_44B260BCBB19" text="1..*" modelElement="EAID_dst5A5085_B775_40dd_87F4_44B260BCBB19">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_87F4_44B260BCBB19" x="1358" y="1411" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_87F4_44B260BCBB19" x="1358" y="1404" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_87F4_44B260BCBB19" x="933" y="1025"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_87F4_44B260BCBB19" x="933" y="1403"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AC99_495d_87F4_44B260BCBB19" x="1385" y="1403"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_87F4_44B260BCBB19" x="907" y="1025"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_87F4_44B260BCBB19" x="907" y="1396"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AC99_495d_87F4_44B260BCBB19" x="1385" y="1396"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_8FE0_29F2F5CFCD7E" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" modelElement="EAID_46338F2C_8F52_4c58_8FE0_29F2F5CFCD7E">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_8FE0_29F2F5CFCD7E" text="+epo-ord:comprisesOrderLine" modelElement="EAID_dst338F2C_8F52_4c58_8FE0_29F2F5CFCD7E">
@@ -1276,33 +1396,37 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_A8FE_020E2E87A51A" x="1055" y="565"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AC99_495d_A8FE_020E2E87A51A" x="1390" y="565"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_A790_6F3EB673B453" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_D2FAB429_5D16_4718_A790_6F3EB673B453">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_A790_6F3EB673B453" text="+epo:specifiesBuyer" modelElement="EAID_dstFAB429_5D16_4718_A790_6F3EB673B453">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_A790_6F3EB673B453" x="419" y="627" width="81" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_BE0A_37F252FE6245" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809" modelElement="EAID_F03F1621_7810_4b80_BE0A_37F252FE6245">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_BE0A_37F252FE6245" text="+epo-ord:specifiesOriginatorInformation" modelElement="EAID_dst3F1621_7810_4b80_BE0A_37F252FE6245">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_BE0A_37F252FE6245" x="1039" y="1135" width="161" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_A790_6F3EB673B453" text="1" modelElement="EAID_dstFAB429_5D16_4718_A790_6F3EB673B453">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_A790_6F3EB673B453" x="502" y="658" width="6" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_BE0A_37F252FE6245" text="0..1" modelElement="EAID_dst3F1621_7810_4b80_BE0A_37F252FE6245">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_BE0A_37F252FE6245" x="1186" y="1166" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_A790_6F3EB673B453" x="892" y="1021"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_A790_6F3EB673B453" x="416" y="1021"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AC99_495d_A790_6F3EB673B453" x="416" y="647"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_AC99_495d_A790_6F3EB673B453" x="513" y="647"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_BE0A_37F252FE6245" x="1087" y="1025"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_BE0A_37F252FE6245" x="1087" y="1162"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AC99_495d_BE0A_37F252FE6245" x="1205" y="1162"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_943A_79D432082022" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" modelElement="EAID_9F9DDC4D_D1D7_4c74_943A_79D432082022">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_943A_79D432082022" x="946" y="898"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_943A_79D432082022" x="946" y="520"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_B7BD_A92CA6123721" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3" modelElement="EAID_7129001E_A2EF_4905_B7BD_A92CA6123721">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_B7BD_A92CA6123721" text="+epo:specifiesDespatcher" modelElement="EAID_dst29001E_A2EF_4905_B7BD_A92CA6123721">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_B7BD_A92CA6123721" x="764" y="955" width="103" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_B7BD_A92CA6123721" text="0..1" modelElement="EAID_dst29001E_A2EF_4905_B7BD_A92CA6123721">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_B7BD_A92CA6123721" x="766" y="988" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_B7BD_A92CA6123721" x="892" y="977"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_B7BD_A92CA6123721" x="758" y="977"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_B0FD_C3609EBD8AFD" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_D42B1380_78A6_4579_B0FD_C3609EBD8AFD">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_B0FD_C3609EBD8AFD" text="+epo-ord:hasSellerOrderID" modelElement="EAID_dst2B1380_78A6_4579_B0FD_C3609EBD8AFD">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_B0FD_C3609EBD8AFD" x="2450" y="1196" width="108" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_817A_1DF5BE5981D8" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_24C53A6F_084E_4dbf_817A_1DF5BE5981D8">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_817A_1DF5BE5981D8" text="+epo:hasValidityPeriod" modelElement="EAID_dstC53A6F_084E_4dbf_817A_1DF5BE5981D8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_817A_1DF5BE5981D8" x="1016" y="1310" width="93" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_B0FD_C3609EBD8AFD" text="0..1" modelElement="EAID_dst2B1380_78A6_4579_B0FD_C3609EBD8AFD">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_B0FD_C3609EBD8AFD" x="2517" y="1122" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_817A_1DF5BE5981D8" text="0..1" modelElement="EAID_dstC53A6F_084E_4dbf_817A_1DF5BE5981D8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_817A_1DF5BE5981D8" x="1092" y="1333" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_B0FD_C3609EBD8AFD" x="953" y="1025"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_B0FD_C3609EBD8AFD" x="953" y="1265"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AC99_495d_B0FD_C3609EBD8AFD" x="2505" y="1265"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_AC99_495d_B0FD_C3609EBD8AFD" x="2505" y="1117"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_817A_1DF5BE5981D8" x="932" y="1025"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_817A_1DF5BE5981D8" x="932" y="1328"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AC99_495d_817A_1DF5BE5981D8" x="1111" y="1328"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_9B28_69541B862505" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4" modelElement="EAID_9866393B_8067_4f18_9B28_69541B862505">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_9B28_69541B862505" text="+epo:refersToProject" modelElement="EAID_dst66393B_8067_4f18_9B28_69541B862505">
@@ -1314,20 +1438,21 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_9B28_69541B862505" x="1010" y="1025"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_9B28_69541B862505" x="1009" y="1074"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_8FE6_3B40BD241A4B" source="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" target="EAID_FBD046CD_CD18_4d96_99E0_63CAC8A5D594" modelElement="EAID_E9E2A1B8_A705_4847_8FE6_3B40BD241A4B">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_8FE6_3B40BD241A4B" x="1303" y="353"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_8FE6_3B40BD241A4B" x="1303" y="313"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_82FA_E8F122CD0638" source="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" target="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" modelElement="EAID_D8788651_B092_4dea_82FA_E8F122CD0638">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_82FA_E8F122CD0638" x="1990" y="616"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_82FA_E8F122CD0638" x="1990" y="504"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_BE0A_37F252FE6245" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809" modelElement="EAID_F03F1621_7810_4b80_BE0A_37F252FE6245">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_BE0A_37F252FE6245" text="+epo-ord:specifiesOriginatorInformation" modelElement="EAID_dst3F1621_7810_4b80_BE0A_37F252FE6245">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_BE0A_37F252FE6245" x="1039" y="1135" width="161" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_A790_6F3EB673B453" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_D2FAB429_5D16_4718_A790_6F3EB673B453">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_A790_6F3EB673B453" text="+epo:specifiesBuyer" modelElement="EAID_dstFAB429_5D16_4718_A790_6F3EB673B453">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_A790_6F3EB673B453" x="419" y="627" width="81" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_BE0A_37F252FE6245" text="0..1" modelElement="EAID_dst3F1621_7810_4b80_BE0A_37F252FE6245">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_BE0A_37F252FE6245" x="1186" y="1166" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_A790_6F3EB673B453" text="1" modelElement="EAID_dstFAB429_5D16_4718_A790_6F3EB673B453">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_A790_6F3EB673B453" x="502" y="658" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_BE0A_37F252FE6245" x="1087" y="1025"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_BE0A_37F252FE6245" x="1087" y="1162"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AC99_495d_BE0A_37F252FE6245" x="1205" y="1162"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_A790_6F3EB673B453" x="892" y="1021"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_A790_6F3EB673B453" x="416" y="1021"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AC99_495d_A790_6F3EB673B453" x="416" y="647"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_AC99_495d_A790_6F3EB673B453" x="513" y="647"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_900E_D8D8F18E8521" source="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809" target="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" modelElement="EAID_C553180A_8F43_4db4_900E_D8D8F18E8521">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_900E_D8D8F18E8521" text="+epo-ord:isSpecificToOrderLine" modelElement="EAID_dst53180A_8F43_4db4_900E_D8D8F18E8521">
@@ -1340,17 +1465,6 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_900E_D8D8F18E8521" x="1447" y="1168"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AC99_495d_900E_D8D8F18E8521" x="1447" y="1005"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_86D1_A887FC375039" source="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" target="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" modelElement="EAID_AD18A153_57A6_4142_86D1_A887FC375039">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_86D1_A887FC375039" text="+epo-ord:isSpecificToOrderLine" modelElement="EAID_dst18A153_57A6_4142_86D1_A887FC375039">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_86D1_A887FC375039" x="1442" y="872" width="125" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_86D1_A887FC375039" text="0..*" modelElement="EAID_dst18A153_57A6_4142_86D1_A887FC375039">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_86D1_A887FC375039" x="1505" y="900" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_86D1_A887FC375039" x="1863" y="664"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_86D1_A887FC375039" x="1497" y="664"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AC99_495d_86D1_A887FC375039" x="1497" y="918"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_A7F9_22D9EFCB1693" source="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" target="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" modelElement="EAID_51057DA3_81A5_4e16_A7F9_22D9EFCB1693">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_A7F9_22D9EFCB1693" x="723" y="809"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_A7F9_22D9EFCB1693" x="913" y="809"/>
@@ -1418,32 +1532,14 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_ACA2_4C099B935E15" x="1611" y="1417"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_ACA2_4C099B935E15" x="1854" y="1417"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_9090_B37DC376C605" source="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" target="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" modelElement="EAID_6089809C_E481_4fb3_9090_B37DC376C605">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_9090_B37DC376C605" text="+epo:specifiesSeller" modelElement="EAID_dst89809C_E481_4fb3_9090_B37DC376C605">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_9090_B37DC376C605" x="502" y="894" width="80" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_9090_B37DC376C605" text="0..*" modelElement="EAID_dst89809C_E481_4fb3_9090_B37DC376C605">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_9090_B37DC376C605" x="565" y="917" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_9090_B37DC376C605" x="466" y="859"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_9090_B37DC376C605" x="466" y="912"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AC99_495d_9090_B37DC376C605" x="584" y="912"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_B308_C0F08C743DCF" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_97C17D51_4DF6_4979_B308_C0F08C743DCF">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_B308_C0F08C743DCF" x="754" y="270"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_B308_C0F08C743DCF" x="963" y="270"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_B8A6_42826FC39635" source="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" target="EAID_C3684D7C_E07D_415a_B935_B52376928738" modelElement="EAID_233516AD_8114_473d_B8A6_42826FC39635">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_B8A6_42826FC39635" x="878" y="485"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_B8A6_42826FC39635" x="548" y="485"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_8D27_E3F34E3AF36B" source="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_C00C71CA_F2D3_48ca_8D27_E3F34E3AF36B">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_8D27_E3F34E3AF36B" text="+epo:specifiesBuyer" modelElement="EAID_dst0C71CA_F2D3_48ca_8D27_E3F34E3AF36B">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_8D27_E3F34E3AF36B" x="422" y="671" width="81" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_8D27_E3F34E3AF36B" text="0..*" modelElement="EAID_dst0C71CA_F2D3_48ca_8D27_E3F34E3AF36B">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_8D27_E3F34E3AF36B" x="494" y="696" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_8D27_E3F34E3AF36B" x="462" y="800"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_8D27_E3F34E3AF36B" x="462" y="691"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AC99_495d_8D27_E3F34E3AF36B" x="513" y="691"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_8FA7_D8F2D6516D40" source="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809" target="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E" modelElement="EAID_74A55DED_4624_43a3_8FA7_D8F2D6516D40">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_8FA7_D8F2D6516D40" text="+epo-ord:concernsOriginator" modelElement="EAID_dstA55DED_4624_43a3_8FA7_D8F2D6516D40">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_8FA7_D8F2D6516D40" x="1219" y="1083" width="115" height="14"/>
@@ -1555,16 +1651,19 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_9723_9C69BB0EB7B4" x="1037" y="485"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AC99_495d_9723_9C69BB0EB7B4" x="1037" y="290"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_9F26_8CD173F2F4F7" source="EAID_EA36CA1F_5963_4ff6_86BE_1ACC9D34E843" target="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" modelElement="EAID_6A549AF3_1E2A_4cd7_9F26_8CD173F2F4F7">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_9F26_8CD173F2F4F7" text="+epo-ord:specifiesDeliveryAgreementLocation" modelElement="EAID_dst549AF3_1E2A_4cd7_9F26_8CD173F2F4F7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_9F26_8CD173F2F4F7" x="1613" y="1591" width="185" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_BFCF_A26F9C0B1D38" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" modelElement="EAID_4F4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_BFCF_A26F9C0B1D38" text="+epo:hasPriceSurchargeInformation" modelElement="EAID_dst4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_BFCF_A26F9C0B1D38" x="2014" y="700" width="144" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_9F26_8CD173F2F4F7" text="0..1" modelElement="EAID_dst549AF3_1E2A_4cd7_9F26_8CD173F2F4F7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_9F26_8CD173F2F4F7" x="1601" y="1614" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_BFCF_A26F9C0B1D38" text="0..1" modelElement="EAID_dst4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_BFCF_A26F9C0B1D38" x="2082" y="682" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_9F26_8CD173F2F4F7" x="1928" y="1432"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_9F26_8CD173F2F4F7" x="1928" y="1609"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AC99_495d_9F26_8CD173F2F4F7" x="1598" y="1609"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_BFCF_A26F9C0B1D38" x="2070" y="749"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_BFCF_A26F9C0B1D38" x="2070" y="677"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_8FE6_3B40BD241A4B" source="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" target="EAID_FBD046CD_CD18_4d96_99E0_63CAC8A5D594" modelElement="EAID_E9E2A1B8_A705_4847_8FE6_3B40BD241A4B">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_8FE6_3B40BD241A4B" x="1303" y="353"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_8FE6_3B40BD241A4B" x="1303" y="313"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_B731_D93BB56777D3" source="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" target="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" modelElement="EAID_308D4104_53D2_4be0_B731_D93BB56777D3">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_B731_D93BB56777D3" x="1532" y="551"/>
@@ -1618,19 +1717,27 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AC99_495d_B3EA_A725F5A385F7" x="1390" y="239"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_AC99_495d_B3EA_A725F5A385F7" x="1390" y="353"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_82FA_E8F122CD0638" source="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" target="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" modelElement="EAID_D8788651_B092_4dea_82FA_E8F122CD0638">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_82FA_E8F122CD0638" x="1990" y="616"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_82FA_E8F122CD0638" x="1990" y="504"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_9090_B37DC376C605" source="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" target="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" modelElement="EAID_6089809C_E481_4fb3_9090_B37DC376C605">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_9090_B37DC376C605" text="+epo:specifiesSeller" modelElement="EAID_dst89809C_E481_4fb3_9090_B37DC376C605">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_9090_B37DC376C605" x="502" y="894" width="80" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_9090_B37DC376C605" text="0..*" modelElement="EAID_dst89809C_E481_4fb3_9090_B37DC376C605">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_9090_B37DC376C605" x="565" y="917" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_9090_B37DC376C605" x="466" y="859"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_9090_B37DC376C605" x="466" y="912"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AC99_495d_9090_B37DC376C605" x="584" y="912"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_BFCF_A26F9C0B1D38" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" modelElement="EAID_4F4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_BFCF_A26F9C0B1D38" text="+epo:hasPriceSurchargeInformation" modelElement="EAID_dst4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_BFCF_A26F9C0B1D38" x="2014" y="700" width="144" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_8D27_E3F34E3AF36B" source="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_C00C71CA_F2D3_48ca_8D27_E3F34E3AF36B">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_8D27_E3F34E3AF36B" text="+epo:specifiesBuyer" modelElement="EAID_dst0C71CA_F2D3_48ca_8D27_E3F34E3AF36B">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_8D27_E3F34E3AF36B" x="422" y="671" width="81" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_BFCF_A26F9C0B1D38" text="0..1" modelElement="EAID_dst4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_BFCF_A26F9C0B1D38" x="2082" y="682" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_8D27_E3F34E3AF36B" text="0..*" modelElement="EAID_dst0C71CA_F2D3_48ca_8D27_E3F34E3AF36B">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_8D27_E3F34E3AF36B" x="494" y="696" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_BFCF_A26F9C0B1D38" x="2070" y="749"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_BFCF_A26F9C0B1D38" x="2070" y="677"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_8D27_E3F34E3AF36B" x="462" y="800"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_8D27_E3F34E3AF36B" x="462" y="691"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AC99_495d_8D27_E3F34E3AF36B" x="513" y="691"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_B742_4DC2F5EAF55E" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" modelElement="EAID_15B1CFC6_0B95_4c94_B742_4DC2F5EAF55E">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_B742_4DC2F5EAF55E" text="+epo-ord:hasPriceDiscountInformation" modelElement="EAID_dstB1CFC6_0B95_4c94_B742_4DC2F5EAF55E">
@@ -1643,8 +1750,19 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_B742_4DC2F5EAF55E" x="2177" y="576"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AC99_495d_B742_4DC2F5EAF55E" x="1532" y="576"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_22250BDC_AC99_495d_9F26_8CD173F2F4F7" source="EAID_EA36CA1F_5963_4ff6_86BE_1ACC9D34E843" target="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" modelElement="EAID_6A549AF3_1E2A_4cd7_9F26_8CD173F2F4F7">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AC99_495d_9F26_8CD173F2F4F7" text="+epo-ord:specifiesDeliveryAgreementLocation" modelElement="EAID_dst549AF3_1E2A_4cd7_9F26_8CD173F2F4F7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AC99_495d_9F26_8CD173F2F4F7" x="1613" y="1591" width="185" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AC99_495d_9F26_8CD173F2F4F7" text="0..1" modelElement="EAID_dst549AF3_1E2A_4cd7_9F26_8CD173F2F4F7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AC99_495d_9F26_8CD173F2F4F7" x="1601" y="1614" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AC99_495d_9F26_8CD173F2F4F7" x="1928" y="1432"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_9F26_8CD173F2F4F7" x="1928" y="1609"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AC99_495d_9F26_8CD173F2F4F7" x="1598" y="1609"/>
+			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_000A8819_EDF3_4cb3_9B22_BB629B0F2EBD" isFrame="false" modelElement="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_000A8819_EDF3_4cb3_9B22_BB629B0F2EBD" isFrame="false" modelElement="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_000A8819_EDF3_4cb3_8372_75A07B6AB066" modelElement="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_EDF3_4cb3_8372_75A07B6AB066" text="epo:Contract"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_EDF3_4cb3_8372_75A07B6AB066" x="523" y="558" width="219" height="85"/>
@@ -1667,7 +1785,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_000A8819_EDF3_4cb3_A889_D9AA2A5B456A" modelElement="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_EDF3_4cb3_A889_D9AA2A5B456A" text="epo-ord:DeliveryInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_EDF3_4cb3_A889_D9AA2A5B456A" x="822" y="222" width="226" height="75"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_EDF3_4cb3_A889_D9AA2A5B456A" x="822" y="222" width="226" height="85"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_000A8819_EDF3_4cb3_98C3_93AE6677F8CA" modelElement="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_EDF3_4cb3_98C3_93AE6677F8CA" text="epo-ord:AllowanceInformation"/>
@@ -1727,16 +1845,6 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_EDF3_4cb3_BCD6_23ABF38C12BE" x="1042" y="879"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_EDF3_4cb3_BCD6_23ABF38C12BE" x="1042" y="1165"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_000A8819_EDF3_4cb3_8346_839CB32AF64E" source="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" target="EAID_2424C22E_B54F_4b6f_BA47_E78DE21C76DE" modelElement="EAID_F48E8C16_CD7F_4664_8346_839CB32AF64E">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_EDF3_4cb3_8346_839CB32AF64E" text="+locn:geometry" modelElement="EAID_dst8E8C16_CD7F_4664_8346_839CB32AF64E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_EDF3_4cb3_8346_839CB32AF64E" x="283" y="241" width="64" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_EDF3_4cb3_8346_839CB32AF64E" text="0..1" modelElement="EAID_dst8E8C16_CD7F_4664_8346_839CB32AF64E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_EDF3_4cb3_8346_839CB32AF64E" x="283" y="264" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_EDF3_4cb3_8346_839CB32AF64E" x="451" y="259"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_EDF3_4cb3_8346_839CB32AF64E" x="280" y="259"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_000A8819_EDF3_4cb3_B0FD_C3609EBD8AFD" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_D42B1380_78A6_4579_B0FD_C3609EBD8AFD">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_EDF3_4cb3_B0FD_C3609EBD8AFD" text="+epo-ord:hasSellerOrderID" modelElement="EAID_dst2B1380_78A6_4579_B0FD_C3609EBD8AFD">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_EDF3_4cb3_B0FD_C3609EBD8AFD" x="428" y="538" width="108" height="14"/>
@@ -1748,6 +1856,16 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_EDF3_4cb3_B0FD_C3609EBD8AFD" x="482" y="818"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_EDF3_4cb3_B0FD_C3609EBD8AFD" x="482" y="507"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_000A8819_EDF3_4cb3_8346_839CB32AF64E" source="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" target="EAID_2424C22E_B54F_4b6f_BA47_E78DE21C76DE" modelElement="EAID_F48E8C16_CD7F_4664_8346_839CB32AF64E">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_EDF3_4cb3_8346_839CB32AF64E" text="+locn:geometry" modelElement="EAID_dst8E8C16_CD7F_4664_8346_839CB32AF64E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_EDF3_4cb3_8346_839CB32AF64E" x="283" y="241" width="64" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_EDF3_4cb3_8346_839CB32AF64E" text="0..1" modelElement="EAID_dst8E8C16_CD7F_4664_8346_839CB32AF64E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_EDF3_4cb3_8346_839CB32AF64E" x="283" y="264" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_EDF3_4cb3_8346_839CB32AF64E" x="451" y="259"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_EDF3_4cb3_8346_839CB32AF64E" x="280" y="259"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_000A8819_EDF3_4cb3_A8FE_020E2E87A51A" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" modelElement="EAID_C4D92701_64B7_43fe_A8FE_020E2E87A51A">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_EDF3_4cb3_A8FE_020E2E87A51A" text="+epo-ord:specifiesAllowanceInformation" modelElement="EAID_dstD92701_64B7_43fe_A8FE_020E2E87A51A">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_EDF3_4cb3_A8FE_020E2E87A51A" x="1071" y="996" width="123" height="27"/>
@@ -1920,20 +2038,10 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_EDF3_4cb3_BF21_25D103CB3656" text="0..1" modelElement="EAID_dst951C5B_94E2_4a5f_BF21_25D103CB3656">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_EDF3_4cb3_BF21_25D103CB3656" x="658" y="464" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_EDF3_4cb3_BF21_25D103CB3656" x="937" y="297"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_EDF3_4cb3_BF21_25D103CB3656" x="937" y="307"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_EDF3_4cb3_BF21_25D103CB3656" x="937" y="459"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_EDF3_4cb3_BF21_25D103CB3656" x="655" y="459"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_000A8819_EDF3_4cb3_941E_311C9FC4668A" source="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809" target="EAID_23E9784F_4AEE_4484_9BAC_28A7FEB05838" modelElement="EAID_976D38A5_94EF_4bae_941E_311C9FC4668A">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_EDF3_4cb3_941E_311C9FC4668A" text="+epo-ord:concernsOriginatorRequest" modelElement="EAID_dst6D38A5_94EF_4bae_941E_311C9FC4668A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_EDF3_4cb3_941E_311C9FC4668A" x="608" y="1366" width="147" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_EDF3_4cb3_941E_311C9FC4668A" text="0..1" modelElement="EAID_dst6D38A5_94EF_4bae_941E_311C9FC4668A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_EDF3_4cb3_941E_311C9FC4668A" x="697" y="1384" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_EDF3_4cb3_941E_311C9FC4668A" x="689" y="1340"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_EDF3_4cb3_941E_311C9FC4668A" x="689" y="1402"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_000A8819_EDF3_4cb3_B368_9AA9D2B6757D" source="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" target="EAID_EA36CA1F_5963_4ff6_86BE_1ACC9D34E843" modelElement="EAID_ED2DCABC_3EFA_4af4_B368_9AA9D2B6757D">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_EDF3_4cb3_B368_9AA9D2B6757D" text="+epo-ord:specifiesGeneralDeliveryAgreement" modelElement="EAID_dst2DCABC_3EFA_4af4_B368_9AA9D2B6757D">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_EDF3_4cb3_B368_9AA9D2B6757D" x="660" y="112" width="183" height="14"/>
@@ -1968,13 +2076,13 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_000A8819_EDF3_4cb3_BCA8_CFEC07ED34AE" source="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" target="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" modelElement="EAID_D8FEF002_D274_4157_BCA8_CFEC07ED34AE">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_EDF3_4cb3_BCA8_CFEC07ED34AE" text="+epo-ord:specifiesPlaceOfDelivery" modelElement="EAID_dstFEF002_D274_4157_BCA8_CFEC07ED34AE">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_EDF3_4cb3_BCA8_CFEC07ED34AE" x="654" y="241" width="138" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_EDF3_4cb3_BCA8_CFEC07ED34AE" x="654" y="242" width="138" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_EDF3_4cb3_BCA8_CFEC07ED34AE" text="0..1" modelElement="EAID_dstFEF002_D274_4157_BCA8_CFEC07ED34AE">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_EDF3_4cb3_BCA8_CFEC07ED34AE" x="654" y="264" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_EDF3_4cb3_BCA8_CFEC07ED34AE" x="654" y="265" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_EDF3_4cb3_BCA8_CFEC07ED34AE" x="822" y="259"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_EDF3_4cb3_BCA8_CFEC07ED34AE" x="651" y="259"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_EDF3_4cb3_BCA8_CFEC07ED34AE" x="822" y="262"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_EDF3_4cb3_BCA8_CFEC07ED34AE" x="651" y="260"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_000A8819_EDF3_4cb3_A940_494C66EC292F" source="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" target="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695" modelElement="EAID_A52635C6_3F1B_4466_A940_494C66EC292F">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_EDF3_4cb3_A940_494C66EC292F" text="+epo-ord:concernsConsignee" modelElement="EAID_dst2635C6_3F1B_4466_A940_494C66EC292F">
@@ -1983,7 +2091,7 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_EDF3_4cb3_A940_494C66EC292F" text="0..1" modelElement="EAID_dst2635C6_3F1B_4466_A940_494C66EC292F">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_EDF3_4cb3_A940_494C66EC292F" x="607" y="353" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_EDF3_4cb3_A940_494C66EC292F" x="869" y="297"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_EDF3_4cb3_A940_494C66EC292F" x="869" y="307"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_EDF3_4cb3_A940_494C66EC292F" x="869" y="348"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_EDF3_4cb3_A940_494C66EC292F" x="604" y="348"/>
 			</ownedElement>
@@ -2008,13 +2116,23 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_EDF3_4cb3_AF6D_C4779365607A" x="902" y="603"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_EDF3_4cb3_AF6D_C4779365607A" x="742" y="603"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_000A8819_EDF3_4cb3_941E_311C9FC4668A" source="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809" target="EAID_23E9784F_4AEE_4484_9BAC_28A7FEB05838" modelElement="EAID_976D38A5_94EF_4bae_941E_311C9FC4668A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_EDF3_4cb3_941E_311C9FC4668A" text="+epo-ord:concernsOriginatorRequest" modelElement="EAID_dst6D38A5_94EF_4bae_941E_311C9FC4668A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_EDF3_4cb3_941E_311C9FC4668A" x="608" y="1366" width="147" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_EDF3_4cb3_941E_311C9FC4668A" text="0..1" modelElement="EAID_dst6D38A5_94EF_4bae_941E_311C9FC4668A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_EDF3_4cb3_941E_311C9FC4668A" x="697" y="1384" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_EDF3_4cb3_941E_311C9FC4668A" x="689" y="1340"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_EDF3_4cb3_941E_311C9FC4668A" x="689" y="1402"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_000A8819_EDF3_4cb3_B731_D93BB56777D3" source="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" target="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" modelElement="EAID_308D4104_53D2_4be0_B731_D93BB56777D3">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_EDF3_4cb3_B731_D93BB56777D3" x="1092" y="1080"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_EDF3_4cb3_B731_D93BB56777D3" x="738" y="1080"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_EDF3_4cb3_B731_D93BB56777D3" x="738" y="1160"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_FC3EFF3F_9A22_4a45_83B7_8A32BC22CFBE" isFrame="false" modelElement="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_FC3EFF3F_9A22_4a45_83B7_8A32BC22CFBE" isFrame="false" modelElement="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_FC3EFF3F_9A22_4a45_A12E_00C2BE16F4B6" modelElement="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9A22_4a45_A12E_00C2BE16F4B6" text="epo:AgentInRole"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9A22_4a45_A12E_00C2BE16F4B6" x="569" y="63" width="174" height="85"/>
@@ -2139,7 +2257,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9A22_4a45_B7C9_925B517BC914" x="1037" y="275"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_04F29F40_7172_4127_9D37_0EBF552EA455" isFrame="false" modelElement="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_04F29F40_7172_4127_9D37_0EBF552EA455" isFrame="false" modelElement="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_04F29F40_7172_4127_9B44_2FCDD6AB5C9D" modelElement="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_7172_4127_9B44_2FCDD6AB5C9D" text="epo:MonetaryValue"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_7172_4127_9B44_2FCDD6AB5C9D" x="191" y="334" width="372" height="98"/>
@@ -2238,7 +2356,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_7172_4127_8FE6_3B40BD241A4B" x="699" y="383"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_E459BBE2_E929_4cb0_B4F7_6ABD198FEF62" isFrame="false" modelElement="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_E459BBE2_E929_4cb0_B4F7_6ABD198FEF62" isFrame="false" modelElement="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_E459BBE2_E929_4cb0_9B44_2FCDD6AB5C9D" modelElement="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_E929_4cb0_9B44_2FCDD6AB5C9D" text="epo:MonetaryValue"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_E929_4cb0_9B44_2FCDD6AB5C9D" x="757" y="264" width="267" height="98"/>
@@ -2346,10 +2464,10 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E929_4cb0_B731_D93BB56777D3" x="344" y="353"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_08CC4DDD_61A7_4ac7_8591_C19830AD66DB" isFrame="false" modelElement="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_08CC4DDD_61A7_4ac7_8591_C19830AD66DB" isFrame="false" modelElement="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_08CC4DDD_61A7_4ac7_9313_58C4BB4EB1A7" modelElement="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_61A7_4ac7_9313_58C4BB4EB1A7" text="epo-cat:Line"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61A7_4ac7_9313_58C4BB4EB1A7" x="482" y="626" width="171" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61A7_4ac7_9313_58C4BB4EB1A7" x="451" y="627" width="232" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_08CC4DDD_61A7_4ac7_B200_94202420C754" modelElement="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_61A7_4ac7_B200_94202420C754" text="epo-cat:Item"/>
@@ -2392,7 +2510,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_08CC4DDD_61A7_4ac7_B5B1_F96CAB80B7F4" modelElement="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_61A7_4ac7_B5B1_F96CAB80B7F4" text="epo-cat:ItemProperty"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61A7_4ac7_B5B1_F96CAB80B7F4" x="1225" y="766" width="219" height="90"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61A7_4ac7_B5B1_F96CAB80B7F4" x="1225" y="766" width="243" height="90"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_08CC4DDD_61A7_4ac7_A739_323DC2A3958E" modelElement="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_61A7_4ac7_A739_323DC2A3958E" text="epo-cat:Batch"/>
@@ -2417,16 +2535,15 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_84F1_8A3969FE662E" x="726" y="585"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61A7_4ac7_84F1_8A3969FE662E" x="726" y="231"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_8084_FD257C99FB89" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" modelElement="EAID_3570E246_3BA3_4795_8084_FD257C99FB89">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_61A7_4ac7_8084_FD257C99FB89" text="+epo-ord:hasTaxInformation" modelElement="EAID_dst70E246_3BA3_4795_8084_FD257C99FB89">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_61A7_4ac7_8084_FD257C99FB89" x="1478" y="425" width="115" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_BD03_7B202CFA4807" source="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" target="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" modelElement="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_61A7_4ac7_BD03_7B202CFA4807" text="+epo-cat:specifiesItem" modelElement="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_61A7_4ac7_BD03_7B202CFA4807" x="1072" y="624" width="92" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_61A7_4ac7_8084_FD257C99FB89" text="0..*" modelElement="EAID_dst70E246_3BA3_4795_8084_FD257C99FB89">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_61A7_4ac7_8084_FD257C99FB89" x="1556" y="389" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_61A7_4ac7_BD03_7B202CFA4807" text="1" modelElement="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_61A7_4ac7_BD03_7B202CFA4807" x="1158" y="647" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61A7_4ac7_8084_FD257C99FB89" x="1412" y="522"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_8084_FD257C99FB89" x="1544" y="522"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61A7_4ac7_8084_FD257C99FB89" x="1544" y="384"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61A7_4ac7_BD03_7B202CFA4807" x="683" y="642"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_BD03_7B202CFA4807" x="1166" y="642"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_B51A_14A66F3D627C" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_BBC722BA_3236_4fcb_B51A_14A66F3D627C">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_61A7_4ac7_B51A_14A66F3D627C" text="+epo:hasSerialID" modelElement="EAID_dstC722BA_3236_4fcb_B51A_14A66F3D627C">
@@ -2444,7 +2561,7 @@
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_61A7_4ac7_8070_7102E73439C9" x="1259" y="299" width="135" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_61A7_4ac7_8070_7102E73439C9" text="0..*" modelElement="EAID_dstCADBEA_BE8C_41f0_8070_7102E73439C9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_61A7_4ac7_8070_7102E73439C9" x="1331" y="249" width="100" height="10"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_61A7_4ac7_8070_7102E73439C9" x="1331" y="249" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61A7_4ac7_8070_7102E73439C9" x="1319" y="454"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_8070_7102E73439C9" x="1319" y="244"/>
@@ -2460,19 +2577,26 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_A201_D8391B5C67DF" x="1203" y="185"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61A7_4ac7_A201_D8391B5C67DF" x="920" y="185"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_BD03_7B202CFA4807" source="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" target="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" modelElement="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_61A7_4ac7_BD03_7B202CFA4807" text="+epo-cat:specifiesItem" modelElement="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_61A7_4ac7_BD03_7B202CFA4807" x="1072" y="623" width="92" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_8A07_9FF99AC0CF07" source="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" target="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" modelElement="EAID_082B76C7_EF6B_4c76_8A07_9FF99AC0CF07">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_61A7_4ac7_8A07_9FF99AC0CF07" text="+epo-ord:refersToCatalogueLine" modelElement="EAID_dst2B76C7_EF6B_4c76_8A07_9FF99AC0CF07">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_61A7_4ac7_8A07_9FF99AC0CF07" x="771" y="794" width="129" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_61A7_4ac7_BD03_7B202CFA4807" text="1" modelElement="EAID_dstE94395_6882_44e8_BD03_7B202CFA4807">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_61A7_4ac7_BD03_7B202CFA4807" x="1158" y="646" width="6" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_61A7_4ac7_8A07_9FF99AC0CF07" text="0..1" modelElement="EAID_dst2B76C7_EF6B_4c76_8A07_9FF99AC0CF07">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_61A7_4ac7_8A07_9FF99AC0CF07" x="883" y="817" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61A7_4ac7_BD03_7B202CFA4807" x="653" y="641"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_BD03_7B202CFA4807" x="1166" y="641"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61A7_4ac7_8A07_9FF99AC0CF07" x="659" y="812"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_8A07_9FF99AC0CF07" x="902" y="812"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_BCCC_37421BA960DE" source="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" target="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" modelElement="EAID_AA589EDA_B26B_44c3_BCCC_37421BA960DE">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61A7_4ac7_BCCC_37421BA960DE" x="567" y="776"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_BCCC_37421BA960DE" x="567" y="686"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_A0D6_59757CEC226D" source="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" target="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" modelElement="EAID_1F2E5010_8DA9_46f5_A0D6_59757CEC226D">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_61A7_4ac7_A0D6_59757CEC226D" text="+epo-cat:hasPrice" modelElement="EAID_dst2E5010_8DA9_46f5_A0D6_59757CEC226D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_61A7_4ac7_A0D6_59757CEC226D" x="936" y="977" width="72" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_61A7_4ac7_A0D6_59757CEC226D" text="0..*" modelElement="EAID_dst2E5010_8DA9_46f5_A0D6_59757CEC226D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_61A7_4ac7_A0D6_59757CEC226D" x="991" y="1000" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61A7_4ac7_A0D6_59757CEC226D" x="571" y="846"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_A0D6_59757CEC226D" x="571" y="995"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61A7_4ac7_A0D6_59757CEC226D" x="1010" y="995"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_A49B_8791C8D7CBEA" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_61A7_4ac7_A49B_8791C8D7CBEA" text="+epo:hasSellerItemID" modelElement="EAID_dst6B650B_17CC_499e_A49B_8791C8D7CBEA">
@@ -2507,8 +2631,8 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_61A7_4ac7_9551_9C0C13B80044" text="0..1" modelElement="EAID_dst87FBF1_89C8_4ed0_9551_9C0C13B80044">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_61A7_4ac7_9551_9C0C13B80044" x="617" y="201" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61A7_4ac7_9551_9C0C13B80044" x="563" y="626"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_9551_9C0C13B80044" x="563" y="196"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61A7_4ac7_9551_9C0C13B80044" x="560" y="627"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_9551_9C0C13B80044" x="560" y="196"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61A7_4ac7_9551_9C0C13B80044" x="636" y="196"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_99CE_63F041A42F06" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_3AA2C83C_532C_460c_99CE_63F041A42F06">
@@ -2550,13 +2674,13 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_A80A_3CDDD84D3629" source="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" target="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" modelElement="EAID_0692BD51_5113_4e40_A80A_3CDDD84D3629">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_61A7_4ac7_A80A_3CDDD84D3629" text="+epo-cat:describesItem" modelElement="EAID_dst92BD51_5113_4e40_A80A_3CDDD84D3629">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_61A7_4ac7_A80A_3CDDD84D3629" x="1258" y="713" width="95" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_61A7_4ac7_A80A_3CDDD84D3629" x="1267" y="713" width="95" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_61A7_4ac7_A80A_3CDDD84D3629" text="1" modelElement="EAID_dst92BD51_5113_4e40_A80A_3CDDD84D3629">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_61A7_4ac7_A80A_3CDDD84D3629" x="1327" y="691" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_61A7_4ac7_A80A_3CDDD84D3629" x="1336" y="691" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61A7_4ac7_A80A_3CDDD84D3629" x="1315" y="766"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_A80A_3CDDD84D3629" x="1315" y="686"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61A7_4ac7_A80A_3CDDD84D3629" x="1324" y="766"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_A80A_3CDDD84D3629" x="1324" y="686"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_B72E_BC6C99FF3009" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_61A7_4ac7_B72E_BC6C99FF3009" text="+epo:hasElectronicDigest 0..*" modelElement="EAID_dstE6AD20_DD67_4f31_B72E_BC6C99FF3009">
@@ -2587,15 +2711,16 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_61A7_4ac7_8018_10297955785C" x="1228" y="89"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_61A7_4ac7_8018_10297955785C" x="1228" y="89"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_8A07_9FF99AC0CF07" source="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" target="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" modelElement="EAID_082B76C7_EF6B_4c76_8A07_9FF99AC0CF07">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_61A7_4ac7_8A07_9FF99AC0CF07" text="+epo-ord:refersToCatalogueLine" modelElement="EAID_dst2B76C7_EF6B_4c76_8A07_9FF99AC0CF07">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_61A7_4ac7_8A07_9FF99AC0CF07" x="771" y="794" width="129" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_8084_FD257C99FB89" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" modelElement="EAID_3570E246_3BA3_4795_8084_FD257C99FB89">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_61A7_4ac7_8084_FD257C99FB89" text="+epo-ord:hasTaxInformation" modelElement="EAID_dst70E246_3BA3_4795_8084_FD257C99FB89">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_61A7_4ac7_8084_FD257C99FB89" x="1478" y="425" width="115" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_61A7_4ac7_8A07_9FF99AC0CF07" text="0..1" modelElement="EAID_dst2B76C7_EF6B_4c76_8A07_9FF99AC0CF07">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_61A7_4ac7_8A07_9FF99AC0CF07" x="883" y="817" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_61A7_4ac7_8084_FD257C99FB89" text="0..*" modelElement="EAID_dst70E246_3BA3_4795_8084_FD257C99FB89">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_61A7_4ac7_8084_FD257C99FB89" x="1556" y="389" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61A7_4ac7_8A07_9FF99AC0CF07" x="659" y="812"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_8A07_9FF99AC0CF07" x="902" y="812"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61A7_4ac7_8084_FD257C99FB89" x="1412" y="522"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_8084_FD257C99FB89" x="1544" y="522"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61A7_4ac7_8084_FD257C99FB89" x="1544" y="384"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_B93C_EED975A6974F" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_1BEBAC59_19C6_4908_B93C_EED975A6974F">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_61A7_4ac7_B93C_EED975A6974F" text="+epo:hasUUID" modelElement="EAID_dstEBAC59_19C6_4908_B93C_EED975A6974F">
@@ -2607,16 +2732,10 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61A7_4ac7_B93C_EED975A6974F" x="1228" y="156"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_B93C_EED975A6974F" x="920" y="156"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_A0D6_59757CEC226D" source="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" target="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" modelElement="EAID_1F2E5010_8DA9_46f5_A0D6_59757CEC226D">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_61A7_4ac7_A0D6_59757CEC226D" text="+epo-cat:hasPrice" modelElement="EAID_dst2E5010_8DA9_46f5_A0D6_59757CEC226D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_61A7_4ac7_A0D6_59757CEC226D" x="936" y="977" width="72" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_61A7_4ac7_A0D6_59757CEC226D" text="0..1" modelElement="EAID_dst2E5010_8DA9_46f5_A0D6_59757CEC226D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_61A7_4ac7_A0D6_59757CEC226D" x="991" y="1000" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61A7_4ac7_A0D6_59757CEC226D" x="571" y="846"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_A0D6_59757CEC226D" x="571" y="995"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61A7_4ac7_A0D6_59757CEC226D" x="1010" y="995"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_806C_38F93CA90719" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_33A89700_846B_47cb_93D9_9D4729194EA6" modelElement="EAID_4D92CD55_08CD_4d21_806C_38F93CA90719">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61A7_4ac7_806C_38F93CA90719" x="1610" y="288"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_806C_38F93CA90719" x="1610" y="259"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61A7_4ac7_806C_38F93CA90719" x="1729" y="259"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_B0FD_C3609EBD8AFD" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_D42B1380_78A6_4579_B0FD_C3609EBD8AFD">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_61A7_4ac7_B0FD_C3609EBD8AFD" text="+epo-ord:hasSellerOrderID" modelElement="EAID_dst2B1380_78A6_4579_B0FD_C3609EBD8AFD">
@@ -2641,8 +2760,8 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_BD51_7717D3E67FCB" source="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" target="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" modelElement="EAID_C33C0B35_4ADE_463d_BD51_7717D3E67FCB">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61A7_4ac7_BD51_7717D3E67FCB" x="1023" y="748"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_BD51_7717D3E67FCB" x="1023" y="668"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61A7_4ac7_BD51_7717D3E67FCB" x="653" y="668"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_BD51_7717D3E67FCB" x="1023" y="669"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61A7_4ac7_BD51_7717D3E67FCB" x="683" y="669"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_B50C_8F40D73778CB" source="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" target="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" modelElement="EAID_5E6E2C47_4590_4730_B50C_8F40D73778CB">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_61A7_4ac7_B50C_8F40D73778CB" text="+epo-cat:hasStandardisedUnitPrice" modelElement="EAID_dst6E2C47_4590_4730_B50C_8F40D73778CB">
@@ -2664,10 +2783,9 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61A7_4ac7_A013_1A7BA2859AFA" x="1077" y="872"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_A013_1A7BA2859AFA" x="1077" y="955"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_806C_38F93CA90719" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_33A89700_846B_47cb_93D9_9D4729194EA6" modelElement="EAID_4D92CD55_08CD_4d21_806C_38F93CA90719">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61A7_4ac7_806C_38F93CA90719" x="1610" y="288"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_806C_38F93CA90719" x="1610" y="259"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61A7_4ac7_806C_38F93CA90719" x="1729" y="259"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_BCCC_37421BA960DE" source="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" target="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" modelElement="EAID_AA589EDA_B26B_44c3_BCCC_37421BA960DE">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61A7_4ac7_BCCC_37421BA960DE" x="567" y="776"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_BCCC_37421BA960DE" x="567" y="687"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_B8FF_34E21440DAD9" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_61A7_4ac7_B8FF_34E21440DAD9" text="+epo:refersToPrevious 0..*" modelElement="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9">
@@ -2684,7 +2802,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_61A7_4ac7_B8FF_34E21440DAD9" x="1332" y="81"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_10A1F3B5_0417_4962_B616_A04C2DECC0B9" isFrame="false" modelElement="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_10A1F3B5_0417_4962_B616_A04C2DECC0B9" isFrame="false" modelElement="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_10A1F3B5_0417_4962_9B44_2FCDD6AB5C9D" modelElement="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0417_4962_9B44_2FCDD6AB5C9D" text="epo:MonetaryValue"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0417_4962_9B44_2FCDD6AB5C9D" x="1001" y="379" width="267" height="98"/>
@@ -2816,7 +2934,7 @@
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0417_4962_925D_13E9A7667A18" x="1150" y="340" width="85" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0417_4962_925D_13E9A7667A18" text="0..1" modelElement="EAID_dst123434_C2AD_43de_925D_13E9A7667A18">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0417_4962_925D_13E9A7667A18" x="1202" y="361" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0417_4962_925D_13E9A7667A18" x="1202" y="361" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0417_4962_925D_13E9A7667A18" x="1194" y="316"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0417_4962_925D_13E9A7667A18" x="1194" y="379"/>
@@ -2871,14 +2989,14 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_10A1F3B5_0417_4962_B3EA_A725F5A385F7" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0417_4962_B3EA_A725F5A385F7" text="+epo-cat:hasNetMonetaryValue" modelElement="EAID_dst92648E_ABC4_4408_B3EA_A725F5A385F7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0417_4962_B3EA_A725F5A385F7" x="1070" y="508" width="130" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0417_4962_B3EA_A725F5A385F7" x="1169" y="508" width="130" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0417_4962_B3EA_A725F5A385F7" text="1" modelElement="EAID_dst92648E_ABC4_4408_B3EA_A725F5A385F7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0417_4962_B3EA_A725F5A385F7" x="1146" y="482" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0417_4962_B3EA_A725F5A385F7" x="1245" y="482" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0417_4962_B3EA_A725F5A385F7" x="1021" y="735"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0417_4962_B3EA_A725F5A385F7" x="1134" y="735"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0417_4962_B3EA_A725F5A385F7" x="1134" y="477"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0417_4962_B3EA_A725F5A385F7" x="1021" y="738"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0417_4962_B3EA_A725F5A385F7" x="1233" y="738"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0417_4962_B3EA_A725F5A385F7" x="1233" y="477"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_10A1F3B5_0417_4962_BFCF_A26F9C0B1D38" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" modelElement="EAID_4F4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0417_4962_BFCF_A26F9C0B1D38" text="+epo:hasPriceSurchargeInformation" modelElement="EAID_dst4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
@@ -2891,18 +3009,29 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0417_4962_BFCF_A26F9C0B1D38" x="953" y="630"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0417_4962_BFCF_A26F9C0B1D38" x="826" y="630"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_10A1F3B5_0417_4962_9AB4_37A6F31DF36A" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_47E28283_E9BB_4790_9AB4_37A6F31DF36A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0417_4962_9AB4_37A6F31DF36A" text="+epo-ord:hasGrossMonetaryValue" modelElement="EAID_dstE28283_E9BB_4790_9AB4_37A6F31DF36A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0417_4962_9AB4_37A6F31DF36A" x="1024" y="519" width="139" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0417_4962_9AB4_37A6F31DF36A" text="0..1" modelElement="EAID_dstE28283_E9BB_4790_9AB4_37A6F31DF36A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0417_4962_9AB4_37A6F31DF36A" x="1122" y="482" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0417_4962_9AB4_37A6F31DF36A" x="1021" y="712"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0417_4962_9AB4_37A6F31DF36A" x="1110" y="712"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0417_4962_9AB4_37A6F31DF36A" x="1110" y="477"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_10A1F3B5_0417_4962_A0D6_59757CEC226D" source="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" target="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" modelElement="EAID_1F2E5010_8DA9_46f5_A0D6_59757CEC226D">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0417_4962_A0D6_59757CEC226D" text="+epo-cat:hasPrice" modelElement="EAID_dst2E5010_8DA9_46f5_A0D6_59757CEC226D">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0417_4962_A0D6_59757CEC226D" x="857" y="715" width="72" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0417_4962_A0D6_59757CEC226D" text="0..1" modelElement="EAID_dst2E5010_8DA9_46f5_A0D6_59757CEC226D">
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0417_4962_A0D6_59757CEC226D" text="0..*" modelElement="EAID_dst2E5010_8DA9_46f5_A0D6_59757CEC226D">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0417_4962_A0D6_59757CEC226D" x="912" y="738" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0417_4962_A0D6_59757CEC226D" x="545" y="733"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0417_4962_A0D6_59757CEC226D" x="931" y="733"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_55A5D1C5_EBDB_4ce5_AF0C_4249812776D9" isFrame="false" modelElement="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_55A5D1C5_EBDB_4ce5_AF0C_4249812776D9" isFrame="false" modelElement="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_55A5D1C5_EBDB_4ce5_AAE5_65D2B64C35E1" modelElement="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_EBDB_4ce5_AAE5_65D2B64C35E1" text="epo-ord:AllowanceChargeInformation"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_EBDB_4ce5_AAE5_65D2B64C35E1" x="450" y="307" width="300" height="70"/>
@@ -3000,7 +3129,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_EBDB_4ce5_B301_604581D5936A" x="761" y="116"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_201DD477_AEE9_4497_8193_049F4E8303A5" isFrame="false" modelElement="EAPK_70689CE1_2681_4a24_93B5_A80337180E43">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_201DD477_AEE9_4497_8193_049F4E8303A5" isFrame="false" modelElement="EAPK_C19B5FA7_AD57_4c09_8A50_D50200E83D15">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_201DD477_AEE9_4497_960F_C4C98C40706A" modelElement="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AEE9_4497_960F_C4C98C40706A" text="epo-ord:OrderLine"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AEE9_4497_960F_C4C98C40706A" x="1004" y="587" width="218" height="119"/>
@@ -3077,9 +3206,27 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AEE9_4497_98A8_802C2264F5DB" text="epo-ord:OrderResponseInformation"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AEE9_4497_98A8_802C2264F5DB" x="573" y="1109" width="187" height="46"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_A54D_801F70801F89" source="EAID_F655321A_F106_46f3_933E_53ADDFD9113B" target="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" modelElement="EAID_9343C3B2_DB33_4545_A54D_801F70801F89">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_A54D_801F70801F89" x="1137" y="962"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_A54D_801F70801F89" x="1137" y="706"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_817A_1DF5BE5981D8" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_24C53A6F_084E_4dbf_817A_1DF5BE5981D8">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEE9_4497_817A_1DF5BE5981D8" text="+epo:hasValidityPeriod" modelElement="EAID_dstC53A6F_084E_4dbf_817A_1DF5BE5981D8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEE9_4497_817A_1DF5BE5981D8" x="483" y="1234" width="93" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEE9_4497_817A_1DF5BE5981D8" text="0..1" modelElement="EAID_dstC53A6F_084E_4dbf_817A_1DF5BE5981D8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEE9_4497_817A_1DF5BE5981D8" x="559" y="1257" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_817A_1DF5BE5981D8" x="472" y="689"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_817A_1DF5BE5981D8" x="472" y="1252"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEE9_4497_817A_1DF5BE5981D8" x="578" y="1252"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_B01B_D11FF794AF2B" source="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB" target="EAID_F655321A_F106_46f3_933E_53ADDFD9113B" modelElement="EAID_41B39003_2ED7_40e3_B01B_D11FF794AF2B">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEE9_4497_B01B_D11FF794AF2B" text="+epo-ord:isSpecificToOrderResponseLine" modelElement="EAID_dstB39003_2ED7_40e3_B01B_D11FF794AF2B">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEE9_4497_B01B_D11FF794AF2B" x="1010" y="1069" width="163" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEE9_4497_B01B_D11FF794AF2B" text="0..*" modelElement="EAID_dstB39003_2ED7_40e3_B01B_D11FF794AF2B">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEE9_4497_B01B_D11FF794AF2B" x="1123" y="1037" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_B01B_D11FF794AF2B" x="760" y="1121"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_B01B_D11FF794AF2B" x="1111" y="1121"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEE9_4497_B01B_D11FF794AF2B" x="1111" y="1032"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_86D1_A887FC375039" source="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" target="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" modelElement="EAID_AD18A153_57A6_4142_86D1_A887FC375039">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEE9_4497_86D1_A887FC375039" text="+epo-ord:isSpecificToOrderLine" modelElement="EAID_dst18A153_57A6_4142_86D1_A887FC375039">
@@ -3104,13 +3251,13 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_91E7_AA8247B7CEDD" source="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" target="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" modelElement="EAID_AFC00307_2C3C_43a2_91E7_AA8247B7CEDD">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEE9_4497_91E7_AA8247B7CEDD" text="+epo-ord:isSubmittedForOrder" modelElement="EAID_dstC00307_2C3C_43a2_91E7_AA8247B7CEDD">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEE9_4497_91E7_AA8247B7CEDD" x="516" y="710" width="123" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEE9_4497_91E7_AA8247B7CEDD" x="540" y="710" width="123" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEE9_4497_91E7_AA8247B7CEDD" text="1" modelElement="EAID_dstC00307_2C3C_43a2_91E7_AA8247B7CEDD">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEE9_4497_91E7_AA8247B7CEDD" x="589" y="694" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEE9_4497_91E7_AA8247B7CEDD" x="613" y="694" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_91E7_AA8247B7CEDD" x="577" y="951"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_91E7_AA8247B7CEDD" x="577" y="689"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_91E7_AA8247B7CEDD" x="601" y="951"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_91E7_AA8247B7CEDD" x="601" y="689"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_8F33_D45D96E7471E" source="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" target="EAID_F655321A_F106_46f3_933E_53ADDFD9113B" modelElement="EAID_13CF78D6_E061_467c_8F33_D45D96E7471E">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEE9_4497_8F33_D45D96E7471E" text="+epo-ord:comprisesOrderResponseLine" modelElement="EAID_dstCF78D6_E061_467c_8F33_D45D96E7471E">
@@ -3141,52 +3288,33 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEE9_4497_B89D_FEC52A5F5DBC" text="0..1" modelElement="EAID_dst419AFF_EA5D_40db_B89D_FEC52A5F5DBC">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEE9_4497_B89D_FEC52A5F5DBC" x="236" y="694" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_B89D_FEC52A5F5DBC" x="545" y="967"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_B89D_FEC52A5F5DBC" x="224" y="967"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEE9_4497_B89D_FEC52A5F5DBC" x="224" y="689"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_8EE0_33C8C2F66C12" source="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" target="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" modelElement="EAID_F2F64E25_5DAC_4cec_8EE0_33C8C2F66C12">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEE9_4497_8EE0_33C8C2F66C12" text="+epo-ord:implementsContract" modelElement="EAID_dstF64E25_5DAC_4cec_8EE0_33C8C2F66C12">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEE9_4497_8EE0_33C8C2F66C12" x="661" y="893" width="120" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEE9_4497_8EE0_33C8C2F66C12" text="0..1" modelElement="EAID_dstF64E25_5DAC_4cec_8EE0_33C8C2F66C12">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEE9_4497_8EE0_33C8C2F66C12" x="743" y="872" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_8EE0_33C8C2F66C12" x="727" y="951"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_8EE0_33C8C2F66C12" x="727" y="869"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_B01B_D11FF794AF2B" source="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB" target="EAID_F655321A_F106_46f3_933E_53ADDFD9113B" modelElement="EAID_41B39003_2ED7_40e3_B01B_D11FF794AF2B">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEE9_4497_B01B_D11FF794AF2B" text="+epo-ord:isSpecificToOrderResponseLine" modelElement="EAID_dstB39003_2ED7_40e3_B01B_D11FF794AF2B">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEE9_4497_B01B_D11FF794AF2B" x="1010" y="1069" width="163" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEE9_4497_B01B_D11FF794AF2B" text="0..*" modelElement="EAID_dstB39003_2ED7_40e3_B01B_D11FF794AF2B">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEE9_4497_B01B_D11FF794AF2B" x="1123" y="1037" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_B01B_D11FF794AF2B" x="760" y="1121"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_B01B_D11FF794AF2B" x="1111" y="1121"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEE9_4497_B01B_D11FF794AF2B" x="1111" y="1032"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_B89D_FEC52A5F5DBC" x="545" y="967"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_B89D_FEC52A5F5DBC" x="224" y="967"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEE9_4497_B89D_FEC52A5F5DBC" x="224" y="689"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_80B9_C8B85FBF7E96" source="EAID_F655321A_F106_46f3_933E_53ADDFD9113B" target="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" modelElement="EAID_B2F5C9AF_E278_4ca2_80B9_C8B85FBF7E96">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEE9_4497_80B9_C8B85FBF7E96" text="+epo-ord:isSubmittedForOrderLine" modelElement="EAID_dstF5C9AF_E278_4ca2_80B9_C8B85FBF7E96">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEE9_4497_80B9_C8B85FBF7E96" x="989" y="760" width="139" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_8EE0_33C8C2F66C12" source="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" target="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" modelElement="EAID_F2F64E25_5DAC_4cec_8EE0_33C8C2F66C12">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEE9_4497_8EE0_33C8C2F66C12" text="+epo-ord:implementsContract" modelElement="EAID_dstF64E25_5DAC_4cec_8EE0_33C8C2F66C12">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEE9_4497_8EE0_33C8C2F66C12" x="661" y="893" width="120" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEE9_4497_80B9_C8B85FBF7E96" text="1..*" modelElement="EAID_dstF5C9AF_E278_4ca2_80B9_C8B85FBF7E96">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEE9_4497_80B9_C8B85FBF7E96" x="1076" y="714" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEE9_4497_8EE0_33C8C2F66C12" text="0..1" modelElement="EAID_dstF64E25_5DAC_4cec_8EE0_33C8C2F66C12">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEE9_4497_8EE0_33C8C2F66C12" x="743" y="872" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_80B9_C8B85FBF7E96" x="1069" y="962"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_80B9_C8B85FBF7E96" x="1069" y="706"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_8EE0_33C8C2F66C12" x="727" y="951"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_8EE0_33C8C2F66C12" x="727" y="869"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_BFCF_A26F9C0B1D38" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" modelElement="EAID_4F4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEE9_4497_BFCF_A26F9C0B1D38" text="+epo:hasPriceSurchargeInformation" modelElement="EAID_dst4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEE9_4497_BFCF_A26F9C0B1D38" x="1206" y="229" width="144" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_9B92_F1BE4B376642" source="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" target="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB" modelElement="EAID_ECF97AE3_C138_47de_9B92_F1BE4B376642">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEE9_4497_9B92_F1BE4B376642" text="+epo-ord:specifiesOrderResponseInformation" modelElement="EAID_dstF97AE3_C138_47de_9B92_F1BE4B376642">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEE9_4497_9B92_F1BE4B376642" x="567" y="1070" width="182" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEE9_4497_BFCF_A26F9C0B1D38" text="0..1" modelElement="EAID_dst4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEE9_4497_BFCF_A26F9C0B1D38" x="1206" y="252" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEE9_4497_9B92_F1BE4B376642" text="0..*" modelElement="EAID_dstF97AE3_C138_47de_9B92_F1BE4B376642">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEE9_4497_9B92_F1BE4B376642" x="674" y="1091" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_BFCF_A26F9C0B1D38" x="1605" y="808"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_BFCF_A26F9C0B1D38" x="1878" y="808"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEE9_4497_BFCF_A26F9C0B1D38" x="1878" y="247"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_AEE9_4497_BFCF_A26F9C0B1D38" x="1203" y="247"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_9B92_F1BE4B376642" x="666" y="1043"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_9B92_F1BE4B376642" x="666" y="1109"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_A54D_801F70801F89" source="EAID_F655321A_F106_46f3_933E_53ADDFD9113B" target="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" modelElement="EAID_9343C3B2_DB33_4545_A54D_801F70801F89">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_A54D_801F70801F89" x="1137" y="962"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_A54D_801F70801F89" x="1137" y="706"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_A790_6F3EB673B453" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_D2FAB429_5D16_4718_A790_6F3EB673B453">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEE9_4497_A790_6F3EB673B453" text="+epo:specifiesBuyer" modelElement="EAID_dstFAB429_5D16_4718_A790_6F3EB673B453">
@@ -3222,7 +3350,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_8FE0_29F2F5CFCD7E" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" modelElement="EAID_46338F2C_8F52_4c58_8FE0_29F2F5CFCD7E">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEE9_4497_8FE0_29F2F5CFCD7E" text="+epo-ord:comprisesOrderLine" modelElement="EAID_dst338F2C_8F52_4c58_8FE0_29F2F5CFCD7E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEE9_4497_8FE0_29F2F5CFCD7E" x="887" y="631" width="119" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEE9_4497_8FE0_29F2F5CFCD7E" x="877" y="628" width="119" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEE9_4497_8FE0_29F2F5CFCD7E" text="1..*" modelElement="EAID_dst338F2C_8F52_4c58_8FE0_29F2F5CFCD7E">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEE9_4497_8FE0_29F2F5CFCD7E" x="985" y="658" width="17" height="14"/>
@@ -3245,7 +3373,7 @@
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEE9_4497_A0D6_59757CEC226D" text="+epo-cat:hasPrice" modelElement="EAID_dst2E5010_8DA9_46f5_A0D6_59757CEC226D">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEE9_4497_A0D6_59757CEC226D" x="1339" y="800" width="72" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEE9_4497_A0D6_59757CEC226D" text="0..1" modelElement="EAID_dst2E5010_8DA9_46f5_A0D6_59757CEC226D">
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEE9_4497_A0D6_59757CEC226D" text="0..*" modelElement="EAID_dst2E5010_8DA9_46f5_A0D6_59757CEC226D">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEE9_4497_A0D6_59757CEC226D" x="1388" y="829" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_A0D6_59757CEC226D" x="1194" y="706"/>
@@ -3289,15 +3417,15 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_B918_7EEB88718C50" x="666" y="1155"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_B918_7EEB88718C50" x="666" y="1215"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_9B92_F1BE4B376642" source="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" target="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB" modelElement="EAID_ECF97AE3_C138_47de_9B92_F1BE4B376642">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEE9_4497_9B92_F1BE4B376642" text="+epo-ord:specifiesOrderResponseInformation" modelElement="EAID_dstF97AE3_C138_47de_9B92_F1BE4B376642">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEE9_4497_9B92_F1BE4B376642" x="567" y="1070" width="182" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_80B9_C8B85FBF7E96" source="EAID_F655321A_F106_46f3_933E_53ADDFD9113B" target="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" modelElement="EAID_B2F5C9AF_E278_4ca2_80B9_C8B85FBF7E96">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEE9_4497_80B9_C8B85FBF7E96" text="+epo-ord:isSubmittedForOrderLine" modelElement="EAID_dstF5C9AF_E278_4ca2_80B9_C8B85FBF7E96">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEE9_4497_80B9_C8B85FBF7E96" x="989" y="760" width="139" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEE9_4497_9B92_F1BE4B376642" text="0..*" modelElement="EAID_dstF97AE3_C138_47de_9B92_F1BE4B376642">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEE9_4497_9B92_F1BE4B376642" x="674" y="1091" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEE9_4497_80B9_C8B85FBF7E96" text="1..*" modelElement="EAID_dstF5C9AF_E278_4ca2_80B9_C8B85FBF7E96">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEE9_4497_80B9_C8B85FBF7E96" x="1076" y="714" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_9B92_F1BE4B376642" x="666" y="1043"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_9B92_F1BE4B376642" x="666" y="1109"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_80B9_C8B85FBF7E96" x="1069" y="962"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_80B9_C8B85FBF7E96" x="1069" y="706"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_8070_7102E73439C9" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_F7CADBEA_BE8C_41f0_8070_7102E73439C9">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEE9_4497_8070_7102E73439C9" text="+epo-cat:hasExternalSpecification" modelElement="EAID_dstCADBEA_BE8C_41f0_8070_7102E73439C9">
@@ -3345,6 +3473,20 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_B308_C0F08C743DCF" x="804" y="771"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_B308_C0F08C743DCF" x="804" y="570"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_B72E_BC6C99FF3009" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEE9_4497_B72E_BC6C99FF3009" text="+epo:hasElectronicDigest 0..*" modelElement="EAID_dstE6AD20_DD67_4f31_B72E_BC6C99FF3009">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEE9_4497_B72E_BC6C99FF3009" x="961" y="438" width="119" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEE9_4497_B72E_BC6C99FF3009" text="0..*" modelElement="EAID_dstE6AD20_DD67_4f31_B72E_BC6C99FF3009">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEE9_4497_B72E_BC6C99FF3009" x="955" y="434" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_B72E_BC6C99FF3009" x="952" y="468"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_B72E_BC6C99FF3009" x="952" y="468"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEE9_4497_B72E_BC6C99FF3009" x="971" y="468"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_AEE9_4497_B72E_BC6C99FF3009" x="971" y="429"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_AEE9_4497_B72E_BC6C99FF3009" x="952" y="429"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_AEE9_4497_B72E_BC6C99FF3009" x="952" y="429"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_AA00_34CA1CC60CA2" source="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_B9C9C412_36FA_46d5_AA00_34CA1CC60CA2">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEE9_4497_AA00_34CA1CC60CA2" text="+epo-cat:hasQualifiedValue" modelElement="EAID_dstC9C412_36FA_46d5_AA00_34CA1CC60CA2">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEE9_4497_AA00_34CA1CC60CA2" x="1505" y="703" width="112" height="14"/>
@@ -3379,19 +3521,17 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_AEE9_4497_B742_4DC2F5EAF55E" x="848" y="189"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_AEE9_4497_B742_4DC2F5EAF55E" x="848" y="303"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_B72E_BC6C99FF3009" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEE9_4497_B72E_BC6C99FF3009" text="+epo:hasElectronicDigest 0..*" modelElement="EAID_dstE6AD20_DD67_4f31_B72E_BC6C99FF3009">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEE9_4497_B72E_BC6C99FF3009" x="961" y="438" width="119" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_BFCF_A26F9C0B1D38" source="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" target="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" modelElement="EAID_4F4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AEE9_4497_BFCF_A26F9C0B1D38" text="+epo:hasPriceSurchargeInformation" modelElement="EAID_dst4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEE9_4497_BFCF_A26F9C0B1D38" x="1206" y="229" width="144" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEE9_4497_B72E_BC6C99FF3009" text="0..*" modelElement="EAID_dstE6AD20_DD67_4f31_B72E_BC6C99FF3009">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEE9_4497_B72E_BC6C99FF3009" x="955" y="434" width="100" height="10"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEE9_4497_BFCF_A26F9C0B1D38" text="0..1" modelElement="EAID_dst4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEE9_4497_BFCF_A26F9C0B1D38" x="1206" y="252" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_B72E_BC6C99FF3009" x="952" y="468"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_B72E_BC6C99FF3009" x="952" y="468"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEE9_4497_B72E_BC6C99FF3009" x="971" y="468"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_AEE9_4497_B72E_BC6C99FF3009" x="971" y="429"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_AEE9_4497_B72E_BC6C99FF3009" x="952" y="429"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_AEE9_4497_B72E_BC6C99FF3009" x="952" y="429"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_BFCF_A26F9C0B1D38" x="1605" y="808"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_BFCF_A26F9C0B1D38" x="1878" y="808"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEE9_4497_BFCF_A26F9C0B1D38" x="1878" y="247"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_AEE9_4497_BFCF_A26F9C0B1D38" x="1203" y="247"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_53A61934_F119_4692_8CC3_BFE2B530A2C4" isFrame="false" modelElement="EAPK_DC89455D_7112_440b_86BC_EA47E188896D">
@@ -3447,10 +3587,10 @@
 				<times created="2022-07-21 10:34:55" modified="2022-12-02 17:24:45"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
 			</element>
-			<element xmi:idref="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708" xmi:type="uml:Package" name="diagrams" scope="public">
-				<model package2="EAID_B9C3C97F_E0C7_4b01_BD55_8BE547657708" package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" tpos="1" ea_localid="242" ea_eleType="package"/>
+			<element xmi:idref="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A" xmi:type="uml:Package" name="diagrams" scope="public">
+				<model package2="EAID_3C885124_0F31_49dc_BD0A_CED2EA5A355A" package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" tpos="1" ea_localid="263" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 12:58:57" modified="2024-03-18 12:58:57" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:52:11" modified="2024-07-23 11:52:11" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3458,11 +3598,11 @@
 				<extendedProperties tagged="0" package_name="order only"/>
 				<packageproperties version="1.0" tpos="1"/>
 				<paths/>
-				<times created="2024-03-18 12:58:57" modified="2024-03-18 12:58:57"/>
+				<times created="2024-07-23 11:52:11" modified="2024-07-23 11:52:11"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAID_151E333E_CEC7_4c28_B222_35A41469D7C5" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708" tpos="0" ea_localid="2042" ea_eleType="element"/>
+				<model package="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A" tpos="0" ea_localid="2042" ea_eleType="element"/>
 				<properties documentation="Context: &#xA;Ordering, Despatch" isSpecification="false" sType="Note" nType="0" scope="public"/>
 				<project author="lps" version="1.0" phase="1.0" created="2022-08-25 15:01:36" modified="2022-08-25 15:02:00" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
@@ -3475,7 +3615,7 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_2692AC99_7B59_4a2a_9D1B_6ECD3CC99499" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708" tpos="0" ea_localid="2633" ea_eleType="element"/>
+				<model package="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A" tpos="0" ea_localid="2633" ea_eleType="element"/>
 				<properties documentation="We need codes for: https://docs.peppol.eu/poacc/upgrade-3/2022-Q4/codelist/UNCL1001_T01/&#xA;&#xA;220 code is plain Order." isSpecification="false" sType="Note" nType="0" scope="public"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2023-02-09 16:55:45" modified="2023-02-09 16:57:43" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
@@ -3488,7 +3628,7 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_4CD6F72F_C895_4f45_A897_6A3BE5805EC3" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708" tpos="0" ea_localid="2043" ea_eleType="element"/>
+				<model package="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A" tpos="0" ea_localid="2043" ea_eleType="element"/>
 				<properties documentation="Context: Expressing Needs" isSpecification="false" sType="Note" nType="0" scope="public"/>
 				<project author="lps" version="1.0" phase="1.0" created="2022-08-25 15:06:10" modified="2022-08-25 15:06:22" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
@@ -3501,7 +3641,7 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708" tpos="0" ea_localid="2053" ea_eleType="element"/>
+				<model package="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A" tpos="0" ea_localid="2053" ea_eleType="element"/>
 				<properties documentation="Note: Supplier is out of discussion. It is a third party. &#xA;We do not care who provides these service or products we care with whom business is done.&#xA;&#xA;PEPPOL - Invoice:&#xA;The supplier is the legal person or organization who provides a product and/or service.&#xA;&#xA;PEPPOL - Order: The supplier is the legal person or organisation who provides a product or service.&#xA;Examples of supplier roles: seller, despatch party, creditor, economic operator.&#xA;&#xA;" isSpecification="false" sType="Note" nType="0" scope="public"/>
 				<project author="lps" version="1.0" phase="1.0" created="2022-08-25 16:19:45" modified="2023-04-24 01:06:42" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
@@ -3515,10 +3655,10 @@
 					<NoteLink xmi:id="EAID_DA29E13C_0424_4173_A5A2_DD96859DF5FB" start="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444" end="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD"/>
 				</links>
 			</element>
-			<element xmi:idref="EAPK_9D6273BE_3306_4c89_ACDE_4EB42B089540" xmi:type="uml:Package" name="classes" scope="public">
-				<model package2="EAID_9D6273BE_3306_4c89_ACDE_4EB42B089540" package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" tpos="2" ea_localid="243" ea_eleType="package"/>
+			<element xmi:idref="EAPK_7D4F55D5_E4BB_4d9a_86CE_D56603763CE3" xmi:type="uml:Package" name="classes" scope="public">
+				<model package2="EAID_7D4F55D5_E4BB_4d9a_86CE_D56603763CE3" package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" tpos="2" ea_localid="264" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 12:59:01" modified="2024-03-18 12:59:03" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:52:27" modified="2024-07-23 11:52:27" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3526,13 +3666,13 @@
 				<extendedProperties tagged="0" package_name="order only"/>
 				<packageproperties version="1.0" tpos="2"/>
 				<paths/>
-				<times created="2024-03-18 12:59:01" modified="2024-03-18 12:59:01"/>
+				<times created="2024-07-23 11:52:27" modified="2024-07-23 11:52:27"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" xmi:type="uml:Class" name="epo-ord:AllowanceChargeInformation" scope="public">
-				<model package="EAPK_9D6273BE_3306_4c89_ACDE_4EB42B089540" tpos="0" ea_localid="2041" ea_eleType="element"/>
+				<model package="EAPK_7D4F55D5_E4BB_4d9a_86CE_D56603763CE3" tpos="0" ea_localid="2041" ea_eleType="element"/>
 				<properties documentation="Information about discounts, taxes, duties and fees imposed.&#xA;&#xA;WG approval 16/05/2023" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-08-24 16:55:21" modified="2024-03-18 12:59:12" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-08-24 16:55:21" modified="2024-07-23 11:52:35" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3581,9 +3721,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" xmi:type="uml:Class" name="epo-ord:AllowanceInformation" scope="public">
-				<model package="EAPK_9D6273BE_3306_4c89_ACDE_4EB42B089540" tpos="0" ea_localid="2040" ea_eleType="element"/>
+				<model package="EAPK_7D4F55D5_E4BB_4d9a_86CE_D56603763CE3" tpos="0" ea_localid="2040" ea_eleType="element"/>
 				<properties documentation="Information about the discounts imposed.&#xA;&#xA;WG approval 16/05/2023&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-08-24 16:53:48" modified="2024-03-18 12:59:12" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-08-24 16:53:48" modified="2024-07-23 11:52:35" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3592,14 +3732,16 @@
 				<links>
 					<Association xmi:id="EAID_2938C487_B424_424e_A34E_13EA1CB113F2" start="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" end="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
 					<Generalization xmi:id="EAID_308D4104_53D2_4be0_B731_D93BB56777D3" start="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" end="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1"/>
+					<Association xmi:id="EAID_F3984A8F_8800_4bd8_89A8_7BF01AA3F7CB" start="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" end="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
 					<Association xmi:id="EAID_15B1CFC6_0B95_4c94_B742_4DC2F5EAF55E" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA"/>
+					<Association xmi:id="EAID_38248DFF_252A_4130_A663_5B676B14A992" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA"/>
 					<Association xmi:id="EAID_C4D92701_64B7_43fe_A8FE_020E2E87A51A" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695" xmi:type="uml:Class" name="epo-ord:Consignee" scope="public">
-				<model package="EAPK_9D6273BE_3306_4c89_ACDE_4EB42B089540" tpos="0" ea_localid="2028" ea_eleType="element"/>
+				<model package="EAPK_7D4F55D5_E4BB_4d9a_86CE_D56603763CE3" tpos="0" ea_localid="2028" ea_eleType="element"/>
 				<properties documentation="A Role of an Agent that receives the Shipment of the Procurement (service, goods or works) and who is taking possession.&#xA;&#xA;Additional information:&#xA;The Role is carried out by the Customer or on behalf of the Customer.&#xA;The possession of the goods does not necessary imply ownership.&#xA;The Consignee may be the end-user or the beneficiary.&#xA;&#xA;(Consignee) Definition from PEPPOL Despatch:&#xA;The Consignee is the person or Organisation to which the products will be shipped and who is taking possession. The Role is carried out by the Customer or on behalf of the Customer.&#xA;&#xA;WG approval: 21/02/2023&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-08-11 15:53:11" modified="2024-03-18 12:59:12" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-08-11 15:53:11" modified="2024-07-23 11:52:35" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3614,9 +3756,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_1D470B74_66C6_4e95_82A9_28C6309EBB94" xmi:type="uml:Class" name="epo-ord:ContractInformation" scope="public">
-				<model package="EAPK_9D6273BE_3306_4c89_ACDE_4EB42B089540" tpos="0" ea_localid="2360" ea_eleType="element"/>
+				<model package="EAPK_7D4F55D5_E4BB_4d9a_86CE_D56603763CE3" tpos="0" ea_localid="2360" ea_eleType="element"/>
 				<properties documentation="Information about the Contract.&#xA;&#xA;WG approval 20/04/2023" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-12-01 16:09:27" modified="2024-03-18 12:59:12" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-12-01 16:09:27" modified="2024-07-23 11:52:35" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3630,9 +3772,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_EA36CA1F_5963_4ff6_86BE_1ACC9D34E843" xmi:type="uml:Class" name="epo-ord:DeliveryAgreement" scope="public">
-				<model package="EAPK_9D6273BE_3306_4c89_ACDE_4EB42B089540" tpos="0" ea_localid="2786" ea_eleType="element"/>
+				<model package="EAPK_7D4F55D5_E4BB_4d9a_86CE_D56603763CE3" tpos="0" ea_localid="2786" ea_eleType="element"/>
 				<properties documentation="Term applying to the delivery of goods, services and works.&#xA;&#xA;Additional Information:&#xA;Delivery terms identifier can normally be Incoterms accompanied by the description of specific conditions related to the delivery.&#xA;&#xA;WG approval 16/05/2023" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-03-08 14:00:57" modified="2024-03-18 12:59:12" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-03-08 14:00:57" modified="2024-07-23 11:52:35" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3662,9 +3804,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" xmi:type="uml:Class" name="epo-ord:DeliveryInformation" scope="public">
-				<model package="EAPK_9D6273BE_3306_4c89_ACDE_4EB42B089540" tpos="0" ea_localid="2087" ea_eleType="element"/>
+				<model package="EAPK_7D4F55D5_E4BB_4d9a_86CE_D56603763CE3" tpos="0" ea_localid="2087" ea_eleType="element"/>
 				<properties documentation="Information about the timing, the delivery destination, the delivery agreement and the involved parties. &#xA;&#xA;WG approval 16/05/2023&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-10-06 15:55:46" modified="2024-03-18 12:59:12" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-10-06 15:55:46" modified="2024-07-23 11:52:35" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3701,6 +3843,21 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
+					<attribute xmi:idref="EAID_F2A457C5_9C89_4b3d_AEFD_02FCEB4DACB5" name="epo-inv:hasActualDeliveryDate" scope="Public">
+						<initial/>
+						<documentation/>
+						<model ea_localid="2634" ea_guid="{F2A457C5-9C89-4b3d-AEFD-02FCEB4DACB5}"/>
+						<properties type="xsd:date" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="5"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
 				</attributes>
 				<links>
 					<Generalization xmi:id="EAID_8D08461D_427C_4617_A7FA_357936EA21A8" start="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" end="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
@@ -3711,14 +3868,15 @@
 					<Association xmi:id="EAID_ED2DCABC_3EFA_4af4_B368_9AA9D2B6757D" start="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" end="EAID_EA36CA1F_5963_4ff6_86BE_1ACC9D34E843"/>
 					<Association xmi:id="EAID_F0951C5B_94E2_4a5f_BF21_25D103CB3656" start="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
 					<Association xmi:id="EAID_F79B2205_58A2_42e8_ACA2_4C099B935E15" start="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" end="EAID_EA36CA1F_5963_4ff6_86BE_1ACC9D34E843"/>
+					<Association xmi:id="EAID_810B5419_84AA_4cbc_BD0F_1B682068D4FB" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A"/>
 					<Association xmi:id="EAID_B9BA1AAD_DA48_4953_9445_B3D0C269B4E6" start="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" end="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A"/>
 					<Association xmi:id="EAID_E35A5085_B775_40dd_87F4_44B260BCBB19" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" xmi:type="uml:Class" name="epo-ord:Order" scope="public">
-				<model package="EAPK_9D6273BE_3306_4c89_ACDE_4EB42B089540" tpos="0" ea_localid="2010" ea_eleType="element"/>
+				<model package="EAPK_7D4F55D5_E4BB_4d9a_86CE_D56603763CE3" tpos="0" ea_localid="2010" ea_eleType="element"/>
 				<properties documentation="A formal request of the Buyer to the Seller specifying the goods, services or works to be delivered.&#xA;&#xA;Additional Information:&#xA;A Buyer submits an Order for delivery of goods, services or works to a Seller.&#xA;&#xA;WG approval 23/04/2023&#xA;&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-08-10 16:12:29" modified="2024-03-18 12:59:12" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-08-10 16:12:29" modified="2024-07-23 11:52:35" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3772,6 +3930,7 @@
 					</attribute>
 				</attributes>
 				<links>
+					<Association xmi:id="EAID_24C53A6F_084E_4dbf_817A_1DF5BE5981D8" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
 					<Association xmi:id="EAID_29D3C49F_AF44_49ad_8519_B199CADD080B" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
 					<Association xmi:id="EAID_2C64F9E7_B02B_4433_AB2C_0A6E23A8559E" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
 					<Association xmi:id="EAID_36E7ABA9_FFB1_4212_81E5_12821EB05CDD" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_1D470B74_66C6_4e95_82A9_28C6309EBB94"/>
@@ -3794,13 +3953,14 @@
 					<Association xmi:id="EAID_F03F1621_7810_4b80_BE0A_37F252FE6245" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809"/>
 					<Association xmi:id="EAID_F78CF3B1_3FB3_43b9_B9AB_1FE660C3663F" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
 					<Association xmi:id="EAID_05ABFF05_AE37_4d14_9F45_D060A347AAB9" start="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" end="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+					<Association xmi:id="EAID_78E3CABC_FE13_4dc0_BA12_FFFFA0D54042" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
 					<Association xmi:id="EAID_AFC00307_2C3C_43a2_91E7_AA8247B7CEDD" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" xmi:type="uml:Class" name="epo-ord:OrderLine" scope="public">
-				<model package="EAPK_9D6273BE_3306_4c89_ACDE_4EB42B089540" tpos="0" ea_localid="2037" ea_eleType="element"/>
+				<model package="EAPK_7D4F55D5_E4BB_4d9a_86CE_D56603763CE3" tpos="0" ea_localid="2037" ea_eleType="element"/>
 				<properties documentation="Details concerning a given unit of goods, services or works requested in the Order.&#xA;&#xA;Additional information:&#xA;In general, an Order Line contains the Quantity and Price of the goods, services and goods requested in the Order. &#xA;However, in certain cases, the Price may not be known, as the Price may fluctuate from one day to the other. &#xA;&#xA;WG approval 20/04/2023" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-08-16 14:42:45" modified="2024-03-18 12:59:12" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-08-16 14:42:45" modified="2024-07-23 11:52:35" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3814,6 +3974,7 @@
 					<Association xmi:id="EAID_16C34048_F5E0_4885_8D46_5814F76AE356" start="EAID_1D470B74_66C6_4e95_82A9_28C6309EBB94" end="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
 					<Association xmi:id="EAID_2938C487_B424_424e_A34E_13EA1CB113F2" start="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" end="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
 					<Association xmi:id="EAID_46338F2C_8F52_4c58_8FE0_29F2F5CFCD7E" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
+					<Association xmi:id="EAID_8254F8D7_D6F0_4c63_A478_9179AAD0DF81" start="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" end="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
 					<Generalization xmi:id="EAID_9343C3B2_DB33_4545_A54D_801F70801F89" start="EAID_F655321A_F106_46f3_933E_53ADDFD9113B" end="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
 					<Association xmi:id="EAID_AD18A153_57A6_4142_86D1_A887FC375039" start="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" end="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
 					<Association xmi:id="EAID_ADDD985E_9817_4356_BF94_B8B6325FE628" start="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" end="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
@@ -3823,9 +3984,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E" xmi:type="uml:Class" name="epo-ord:Originator" scope="public">
-				<model package="EAPK_9D6273BE_3306_4c89_ACDE_4EB42B089540" tpos="0" ea_localid="2004" ea_eleType="element"/>
+				<model package="EAPK_7D4F55D5_E4BB_4d9a_86CE_D56603763CE3" tpos="0" ea_localid="2004" ea_eleType="element"/>
 				<properties documentation="A Role of an Agent that expresses the needs to trigger the Procurement.&#xA;&#xA;Additional Information:&#xA;The Originator is often the end-user or the Beneficiary.&#xA;&#xA;WG approval: 20/10/2022&#xA;&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-08-10 15:27:32" modified="2024-03-18 12:59:12" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-08-10 15:27:32" modified="2024-07-23 11:52:35" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3839,9 +4000,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809" xmi:type="uml:Class" name="epo-ord:OriginatorInformation" scope="public">
-				<model package="EAPK_9D6273BE_3306_4c89_ACDE_4EB42B089540" tpos="0" ea_localid="2362" ea_eleType="element"/>
+				<model package="EAPK_7D4F55D5_E4BB_4d9a_86CE_D56603763CE3" tpos="0" ea_localid="2362" ea_eleType="element"/>
 				<properties documentation="Information about the Originator of the Order.&#xA;&#xA;WG approval 20/03/2023" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-12-02 17:13:32" modified="2024-03-18 12:59:12" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-12-02 17:13:32" modified="2024-07-23 11:52:35" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3856,9 +4017,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" xmi:type="uml:Class" name="epo-ord:Seller" scope="public">
-				<model package="EAPK_9D6273BE_3306_4c89_ACDE_4EB42B089540" tpos="0" ea_localid="2018" ea_eleType="element"/>
+				<model package="EAPK_7D4F55D5_E4BB_4d9a_86CE_D56603763CE3" tpos="0" ea_localid="2018" ea_eleType="element"/>
 				<properties documentation="A Role of an Agent who transfers the ownership of the Procurement results (goods, services or works) to the Buyer.&#xA;&#xA;Additional information:&#xA;A Role of an Agent that sells a Procurement Result (goods, services or work) to a Buyer. &#xA;The Seller is bound by a Contract i.e. it has legal responsibility.&#xA;The Seller may or may not be the same as the Supplier. &#xA;The Seller may or may not issue the Invoice.&#xA;The Seller may or may not be the owner of the credit owed by the Buyer. &#xA;&#xA;WG acceptance 08/09/2022" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-08-11 12:59:20" modified="2024-03-18 12:59:12" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-08-11 12:59:20" modified="2024-07-23 11:52:35" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3871,13 +4032,14 @@
 					<Association xmi:id="EAID_6089809C_E481_4fb3_9090_B37DC376C605" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01"/>
 					<Association xmi:id="EAID_AEDF383B_4385_430e_B2D4_B5B5AAD55DB1" start="EAID_CF553CC8_8DC9_4ea2_B386_8ACB39A17657" end="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01"/>
 					<Association xmi:id="EAID_BF61F37A_DE72_4467_A025_043DE09FF216" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01"/>
+					<Association xmi:id="EAID_E8BF523C_66C7_4412_825C_9D63A7DB9BFF" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01"/>
 					<Association xmi:id="EAID_F0AC5841_AE12_4b29_9A54_29BA5C9C4A38" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" xmi:type="uml:Class" name="epo-ord:TaxInformation" scope="public">
-				<model package="EAPK_9D6273BE_3306_4c89_ACDE_4EB42B089540" tpos="0" ea_localid="2818" ea_eleType="element"/>
+				<model package="EAPK_7D4F55D5_E4BB_4d9a_86CE_D56603763CE3" tpos="0" ea_localid="2818" ea_eleType="element"/>
 				<properties documentation="Information about the imposition of mandatory levies required by law.&#xA;&#xA;WG approval 25/04/2023&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-03-23 17:15:13" modified="2024-03-18 12:59:12" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-03-23 17:15:13" modified="2024-07-23 11:52:35" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3923,6 +4085,9 @@
 					<Generalization xmi:id="EAID_F38D2FE9_AA8F_4ecb_A19A_9A7A0B30CF7E" start="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" end="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
 					<Association xmi:id="EAID_2EEE05CA_6A1E_4946_A54F_BC6967C07ADF" start="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" end="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
 					<Association xmi:id="EAID_3570E246_3BA3_4795_8084_FD257C99FB89" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
+					<Association xmi:id="EAID_8FE282D8_21BB_4e43_8F2A_1B37812ADCA1" start="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" end="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
+					<Association xmi:id="EAID_AF564753_2A12_4d02_8DB3_0F11F0819AB2" start="EAID_BE27BBA5_3E46_4b8b_96B2_9B6152688E23" end="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
+					<Association xmi:id="EAID_DB71486E_B9DA_432e_B070_BFF4ECEF7300" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
 					<Association xmi:id="EAID_FBD708FC_CE05_4098_ADF6_2FEC3A1BB755" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
 				</links>
 			</element>
@@ -3940,10 +4105,10 @@
 				<times created="2022-12-02 17:23:33" modified="2022-12-02 17:23:33"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
 			</element>
-			<element xmi:idref="EAPK_70689CE1_2681_4a24_93B5_A80337180E43" xmi:type="uml:Package" name="diagrams" scope="public">
-				<model package2="EAID_70689CE1_2681_4a24_93B5_A80337180E43" package="EAPK_44147FFC_CE0D_4cb8_94F5_0B4C7BAF6127" tpos="1" ea_localid="244" ea_eleType="package"/>
+			<element xmi:idref="EAPK_C19B5FA7_AD57_4c09_8A50_D50200E83D15" xmi:type="uml:Package" name="diagrams" scope="public">
+				<model package2="EAID_C19B5FA7_AD57_4c09_8A50_D50200E83D15" package="EAPK_44147FFC_CE0D_4cb8_94F5_0B4C7BAF6127" tpos="1" ea_localid="265" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 12:59:31" modified="2024-03-18 12:59:31" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:52:41" modified="2024-07-23 11:52:41" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3951,11 +4116,11 @@
 				<extendedProperties tagged="0" package_name="order response"/>
 				<packageproperties version="1.0" tpos="1"/>
 				<paths/>
-				<times created="2024-03-18 12:59:31" modified="2024-03-18 12:59:31"/>
+				<times created="2024-07-23 11:52:41" modified="2024-07-23 11:52:41"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAID_D7E32546_10E8_48f1_BCFD_D9808F73B52B" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_70689CE1_2681_4a24_93B5_A80337180E43" tpos="0" ea_localid="2013" ea_eleType="element"/>
+				<model package="EAPK_C19B5FA7_AD57_4c09_8A50_D50200E83D15" tpos="0" ea_localid="2013" ea_eleType="element"/>
 				<properties documentation="If contractually agreed, the Seller also may respond to the order, changing details that are acceptable by the Buyer.&#xA;-- If an order is accepted with change, the buyer and seller need to have an agreement between them regarding the processing of the changed order, i.e. when is a contract concluded and when can the items be shipped.&#xA;&#xA;Proposal: &#xA;If the order  response is &quot;Change&quot; then the Buyer will create (instantiate) a new order implementing the changes and superseding the previously sent order. " isSpecification="false" sType="Note" nType="0" scope="public"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2022-08-10 16:51:11" modified="2023-09-11 18:15:05" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
@@ -3967,10 +4132,10 @@
 					<NoteLink xmi:id="EAID_C2D6205A_51AB_4613_8874_119FEFAF6080" start="EAID_D7E32546_10E8_48f1_BCFD_D9808F73B52B" end="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556"/>
 				</links>
 			</element>
-			<element xmi:idref="EAPK_4B590216_59B8_4fc2_9DEA_627B4099D6D4" xmi:type="uml:Package" name="classes" scope="public">
-				<model package2="EAID_4B590216_59B8_4fc2_9DEA_627B4099D6D4" package="EAPK_44147FFC_CE0D_4cb8_94F5_0B4C7BAF6127" tpos="2" ea_localid="245" ea_eleType="package"/>
+			<element xmi:idref="EAPK_7E3D3F90_8267_466d_875D_B6B46A3BCBF0" xmi:type="uml:Package" name="classes" scope="public">
+				<model package2="EAID_7E3D3F90_8267_466d_875D_B6B46A3BCBF0" package="EAPK_44147FFC_CE0D_4cb8_94F5_0B4C7BAF6127" tpos="2" ea_localid="266" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 12:59:37" modified="2024-03-18 12:59:37" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:52:50" modified="2024-07-23 11:52:50" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -3978,13 +4143,13 @@
 				<extendedProperties tagged="0" package_name="order response"/>
 				<packageproperties version="1.0" tpos="2"/>
 				<paths/>
-				<times created="2024-03-18 12:59:37" modified="2024-03-18 12:59:37"/>
+				<times created="2024-07-23 11:52:50" modified="2024-07-23 11:52:50"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" xmi:type="uml:Class" name="epo-ord:OrderResponse" scope="public">
-				<model package="EAPK_4B590216_59B8_4fc2_9DEA_627B4099D6D4" tpos="0" ea_localid="2008" ea_eleType="element"/>
+				<model package="EAPK_7E3D3F90_8267_466d_875D_B6B46A3BCBF0" tpos="0" ea_localid="2008" ea_eleType="element"/>
 				<properties documentation="A formal reply from the Seller to the Buyer stating the Seller's ability to fulfil the order.&#xA;&#xA;Additional Information:&#xA;The Order Response is used to inform on the acceptance or rejection of an Order or to make a counter-offer.&#xA;&#xA;WG approval 20/04/2023&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-08-10 15:59:27" modified="2024-03-18 12:59:43" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-08-10 15:59:27" modified="2024-07-23 11:52:54" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4019,9 +4184,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB" xmi:type="uml:Class" name="epo-ord:OrderResponseInformation" scope="public">
-				<model package="EAPK_4B590216_59B8_4fc2_9DEA_627B4099D6D4" tpos="0" ea_localid="3096" ea_eleType="element"/>
+				<model package="EAPK_7E3D3F90_8267_466d_875D_B6B46A3BCBF0" tpos="0" ea_localid="3096" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-07-14 13:36:09" modified="2024-03-18 12:59:43" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-07-14 13:36:09" modified="2024-07-23 11:52:54" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4036,9 +4201,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_F655321A_F106_46f3_933E_53ADDFD9113B" xmi:type="uml:Class" name="epo-ord:OrderResponseLine" scope="public">
-				<model package="EAPK_4B590216_59B8_4fc2_9DEA_627B4099D6D4" tpos="0" ea_localid="2065" ea_eleType="element"/>
+				<model package="EAPK_7E3D3F90_8267_466d_875D_B6B46A3BCBF0" tpos="0" ea_localid="2065" ea_eleType="element"/>
 				<properties documentation="Details concerning the Seller's ability to fulfil a given Order Line.&#xA;&#xA;Additional Information:&#xA;The Order Response Line is used to inform on the acceptance or rejection of an Order Line or to make a counter-offer.&#xA;&#xA;WG approval 20/04/2023" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-09-05 11:45:03" modified="2024-03-18 12:59:43" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-09-05 11:45:03" modified="2024-07-23 11:52:54" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4051,10 +4216,10 @@
 					<Association xmi:id="EAID_41B39003_2ED7_40e3_B01B_D11FF794AF2B" start="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB" end="EAID_F655321A_F106_46f3_933E_53ADDFD9113B"/>
 				</links>
 			</element>
-			<element xmi:idref="EAPK_2B96F637_F575_4aab_B2D9_297DB63948D0" xmi:type="uml:Package" name="controlled vocabularies" scope="public">
-				<model package2="EAID_2B96F637_F575_4aab_B2D9_297DB63948D0" package="EAPK_44147FFC_CE0D_4cb8_94F5_0B4C7BAF6127" tpos="3" ea_localid="246" ea_eleType="package"/>
+			<element xmi:idref="EAPK_FDC814B4_C647_4a6e_87B5_5D2514CCB379" xmi:type="uml:Package" name="controlled vocabularies" scope="public">
+				<model package2="EAID_FDC814B4_C647_4a6e_87B5_5D2514CCB379" package="EAPK_44147FFC_CE0D_4cb8_94F5_0B4C7BAF6127" tpos="3" ea_localid="267" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 13:00:06" modified="2024-03-18 13:00:06" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:53:02" modified="2024-07-23 11:53:02" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4062,13 +4227,13 @@
 				<extendedProperties tagged="0" package_name="order response"/>
 				<packageproperties version="1.0" tpos="3"/>
 				<paths/>
-				<times created="2024-03-18 13:00:06" modified="2024-03-18 13:00:06"/>
+				<times created="2024-07-23 11:53:02" modified="2024-07-23 11:53:02"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAID_1E0B8798_161F_491d_ADC5_9FD206CC6125" xmi:type="uml:Enumeration" name="at-voc-new:ResponseStatus" scope="public">
-				<model package="EAPK_2B96F637_F575_4aab_B2D9_297DB63948D0" tpos="0" ea_localid="2069" ea_eleType="element"/>
+				<model package="EAPK_FDC814B4_C647_4a6e_87B5_5D2514CCB379" tpos="0" ea_localid="2069" ea_eleType="element"/>
 				<properties documentation="For Ordering:&#xA;https://docs.peppol.eu/poacc/upgrade-3/codelist/UNCL1229/&#xA;&#xA;For Catalogue:&#xA;https://service.unece.org/trade/uncefact/vocabulary/uncl4343/&#xA;&#xA;" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-09-05 11:16:19" modified="2024-03-18 13:00:10" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-09-05 11:16:19" modified="2024-07-23 11:53:07" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -4610,7 +4775,7 @@
 				</target>
 				<model ea_localid="4244"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="https://docs.peppol.eu/poacc/billing/3.0/codelist/UNCL5189/&#xA;&#xA;https://docs.peppol.eu/poacc/billing/3.0/codelist/UNCL7161/"/>
+				<documentation value="The justification for using the Allowance or the Charge.&#xA;&#xA;WG approval 10/06/2024&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasAllowanceChargeReason"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -4721,6 +4886,41 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_F3984A8F_8800_4bd8_89A8_7BF01AA3F7CB">
+				<source xmi:idref="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA">
+					<model ea_localid="2040" type="Class" name="epo-ord:AllowanceInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+					<model ea_localid="3581" type="Class" name="epo-inv:InvoiceLine"/>
+					<role name="epo-inv:isSpecificToInvoiceLine" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5360"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-inv:isSpecificToInvoiceLine"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_15B1CFC6_0B95_4c94_B742_4DC2F5EAF55E">
 				<source xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
 					<model ea_localid="1831" type="Class" name="epo-cat:Price"/>
@@ -4756,6 +4956,41 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_38248DFF_252A_4130_A663_5B676B14A992">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA">
+					<model ea_localid="2040" type="Class" name="epo-ord:AllowanceInformation"/>
+					<role name="epo-ord:specifiesAllowanceInformation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5359"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-ord:specifiesAllowanceInformation"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_C4D92701_64B7_43fe_A8FE_020E2E87A51A">
 				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
 					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
@@ -4852,7 +5087,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating that the instance of the concept involves the Consignee.&#xA;&#xA;WG approval 25/06/2024&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="1..*" rt="+epo-ful:specifiesConsignee"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -5348,6 +5583,41 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_810B5419_84AA_4cbc_BD0F_1B682068D4FB">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A">
+					<model ea_localid="2087" type="Class" name="epo-ord:DeliveryInformation"/>
+					<role name="epo-ord:specifiesDeliveryInformation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5340"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-ord:specifiesDeliveryInformation"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_B9BA1AAD_DA48_4953_9445_B3D0C269B4E6">
 				<source xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8">
 					<model ea_localid="2023" type="Class" name="epo-ful:ShipmentInformation"/>
@@ -5375,7 +5645,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Reference to a Delivery Information.&#xA;&#xA;WG approval 25/06/2024&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="1" rt="+epo-ful:refersToDeliveryInformation"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -5418,6 +5688,41 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_24C53A6F_084E_4dbf_817A_1DF5BE5981D8">
+				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
+					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
+					<model ea_localid="915" type="Class" name="epo:Period"/>
+					<role name="epo:hasValidityPeriod" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5374"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:hasValidityPeriod"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_29D3C49F_AF44_49ad_8519_B199CADD080B">
 				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
 					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
@@ -5550,7 +5855,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating that the instance of the concept involves the Despatcher.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo:specifiesDespatcher"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -5969,7 +6274,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The identifier of the Order given by the Seller.&#xA;&#xA;Additional Information:&#xA;This identifier is different than the identifier of the Order given by the Buyer and it is useful for internal purposes.&#xA;&#xA;WG approval 12/10/2023"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ord:hasSellerOrderID"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -6024,9 +6329,44 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo-ord:hasTotalChargeAmount" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasTotalChargeAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4311"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-ord:hasTotalChargeAmount"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_05ABFF05_AE37_4d14_9F45_D060A347AAB9">
+				<source xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67">
+					<model ea_localid="2116" type="Class" name="epo-ful:DespatchAdvice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
+					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
+					<role name="epo-ful:refersToOrder" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -6035,21 +6375,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4311"/>
+				<model ea_localid="3414"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Reference to an Order.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ord:hasTotalChargeAmount"/>
+				<labels rb="0..1" rt="+epo-ful:refersToOrder"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_05ABFF05_AE37_4d14_9F45_D060A347AAB9">
-				<source xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67">
-					<model ea_localid="2116" type="Class" name="epo-ful:DespatchAdvice"/>
+			<connector xmi:idref="EAID_78E3CABC_FE13_4dc0_BA12_FFFFA0D54042">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -6070,7 +6410,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3414"/>
+				<model ea_localid="5333"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
@@ -6202,7 +6542,7 @@
 				<target xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
 					<model ea_localid="1831" type="Class" name="epo-cat:Price"/>
 					<role name="epo-cat:hasPrice" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -6216,7 +6556,7 @@
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:hasPrice"/>
+				<labels rb="0..*" rt="+epo-cat:hasPrice"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -6256,6 +6596,41 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_8254F8D7_D6F0_4c63_A478_9179AAD0DF81">
+				<source xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+					<model ea_localid="3581" type="Class" name="epo-inv:InvoiceLine"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A">
+					<model ea_localid="2037" type="Class" name="epo-ord:OrderLine"/>
+					<role name="epo-inv:refersToOrderLine" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5382"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:refersToOrderLine"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_9343C3B2_DB33_4545_A54D_801F70801F89">
 				<source xmi:idref="EAID_F655321A_F106_46f3_933E_53ADDFD9113B">
 					<model ea_localid="2065" type="Class" name="epo-ord:OrderResponseLine"/>
@@ -6340,7 +6715,7 @@
 				<target xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A">
 					<model ea_localid="2037" type="Class" name="epo-ord:OrderLine"/>
 					<role name="epo-ful:refersToOrderLine" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -6352,9 +6727,9 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Reference to an Order Line.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:refersToOrderLine"/>
+				<labels rb="1" rt="+epo-ful:refersToOrderLine"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -6526,7 +6901,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating that the instance of the concept involves the Originator.&#xA;&#xA;WG approval 25/06/2024&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..*" rt="+epo-ful:specifiesOriginator"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -6664,7 +7039,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Accepted by Seller.&#xA;&#xA;WG approval 10/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="1..*" rt="+epo-ful:agreedBySeller"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -6742,6 +7117,41 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_E8BF523C_66C7_4412_825C_9D63A7DB9BFF">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01">
+					<model ea_localid="2018" type="Class" name="epo-ord:Seller"/>
+					<role name="epo:specifiesSeller" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5336"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo:specifiesSeller"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_F0AC5841_AE12_4b29_9A54_29BA5C9C4A38">
 				<source xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556">
 					<model ea_localid="2008" type="Class" name="epo-ord:OrderResponse"/>
@@ -6982,6 +7392,111 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_8FE282D8_21BB_4e43_8F2A_1B37812ADCA1">
+				<source xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+					<model ea_localid="3581" type="Class" name="epo-inv:InvoiceLine"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4">
+					<model ea_localid="2818" type="Class" name="epo-ord:TaxInformation"/>
+					<role name="epo-ord:hasTaxInformation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5405"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo-ord:hasTaxInformation"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_AF564753_2A12_4d02_8DB3_0F11F0819AB2">
+				<source xmi:idref="EAID_BE27BBA5_3E46_4b8b_96B2_9B6152688E23">
+					<model ea_localid="3614" type="Class" name="epo-inv:TaxBreakdownInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4">
+					<model ea_localid="2818" type="Class" name="epo-ord:TaxInformation"/>
+					<role name="epo-ord:hasTaxInformation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5388"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo-ord:hasTaxInformation"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_DB71486E_B9DA_432e_B070_BFF4ECEF7300">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4">
+					<model ea_localid="2818" type="Class" name="epo-ord:TaxInformation"/>
+					<role name="epo-ord:hasTaxInformation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5404"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo-ord:hasTaxInformation"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_FBD708FC_CE05_4098_ADF6_2FEC3A1BB755">
 				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
 					<model ea_localid="867" type="Class" name="epo:Contract"/>
@@ -7402,6 +7917,7 @@
 					<packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_xsd_decimal" name="xsd:decimal"/>
 					<packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_rdf_PlainLiteral" name="rdf:PlainLiteral"/>
 					<packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_xsd_dateTime" name="xsd:dateTime"/>
+					<packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_xsd_date" name="xsd:date"/>
 					<packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_xsd_boolean" name="xsd:boolean"/>
 				</packagedElement>
 			</packagedElement>
@@ -7409,27 +7925,29 @@
 		<profiles/>
 		<diagrams>
 			<diagram xmi:id="EAID_C451B2CC_DD71_461f_8B8E_B08F284A9D7E">
-				<model package="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708" localID="360" owner="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708" tpos="3"/>
+				<model package="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A" localID="360" owner="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A" tpos="3"/>
 				<properties name="order roles hierarchy" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-08-11 15:39:58" modified="2023-09-11 18:13:22"/>
+				<project author="lps" version="1.0" created="2022-08-11 15:39:58" modified="2024-07-23 10:32:51"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=791;DocSize.cy=1134;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=44A4918E;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=9046CC6F;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=913;Top=238;Right=1009;Bottom=308;" subject="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3" seqno="1" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=AB727BBA;"/>
-					<element geometry="Left=324;Top=86;Right=439;Bottom=156;" subject="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" seqno="2" style="DUID=8A0C6A9E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=337;Top=238;Right=427;Bottom=308;" subject="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695" seqno="3" style="DUID=A5BD283E;"/>
-					<element geometry="Left=859;Top=374;Right=1066;Bottom=561;" subject="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444" seqno="4" style="DUID=EAD26001;"/>
-					<element geometry="Left=485;Top=238;Right=575;Bottom=308;" subject="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E" seqno="5" style="DUID=05EE8F7E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=51;Top=222;Right=279;Bottom=323;" subject="EAID_96B284C4_E759_4bad_9655_04521F703750" seqno="6" style="BCol=-1;BFol=-1;DUID=14C0F730;LCol=-1;LWth=-1;NSL=0;black=0;bold=0;charset=0;fontsz=0;italic=0;pitch=0;ul=0;"/>
-					<element geometry="Left=780;Top=238;Right=876;Bottom=308;" subject="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" seqno="7" style="DUID=BEA19FF4;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=904;Top=86;Right=1019;Bottom=156;" subject="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" seqno="8" style="DUID=143237D3;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1052;Top=238;Right=1148;Bottom=308;" subject="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD" seqno="9" style="BCol=-1;BFol=-1;DUID=6AA2D74C;LCol=-1;LWth=-1;NSL=0;black=0;bold=0;charset=0;fontsz=0;italic=0;pitch=0;ul=0;"/>
-					<element geometry="Left=472;Top=359;Right=587;Bottom=414;" subject="EAID_4CD6F72F_C895_4f45_A897_6A3BE5805EC3" seqno="10" style="DUID=B4DBC56E;"/>
-					<element geometry="Left=325;Top=359;Right=440;Bottom=414;" subject="EAID_151E333E_CEC7_4c28_B222_35A41469D7C5" seqno="11" style="DUID=B9437A32;"/>
+					<element geometry="Left=546;Top=22;Right=717;Bottom=92;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" seqno="1" style="DUID=8FEC97BC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=788;Top=313;Right=884;Bottom=383;" subject="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3" seqno="2" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=AB727BBA;"/>
+					<element geometry="Left=317;Top=161;Right=432;Bottom=231;" subject="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" seqno="3" style="DUID=8A0C6A9E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=330;Top=313;Right=420;Bottom=383;" subject="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695" seqno="4" style="DUID=A5BD283E;"/>
+					<element geometry="Left=734;Top=449;Right=941;Bottom=636;" subject="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444" seqno="5" style="DUID=EAD26001;"/>
+					<element geometry="Left=478;Top=313;Right=568;Bottom=383;" subject="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E" seqno="6" style="DUID=05EE8F7E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=44;Top=297;Right=272;Bottom=398;" subject="EAID_96B284C4_E759_4bad_9655_04521F703750" seqno="7" style="BCol=-1;BFol=-1;DUID=14C0F730;LCol=-1;LWth=-1;NSL=0;black=0;bold=0;charset=0;fontsz=0;italic=0;pitch=0;ul=0;"/>
+					<element geometry="Left=655;Top=313;Right=751;Bottom=383;" subject="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" seqno="8" style="DUID=BEA19FF4;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=779;Top=161;Right=894;Bottom=231;" subject="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" seqno="9" style="DUID=143237D3;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=927;Top=313;Right=1023;Bottom=383;" subject="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD" seqno="10" style="BCol=-1;BFol=-1;DUID=6AA2D74C;LCol=-1;LWth=-1;NSL=0;black=0;bold=0;charset=0;fontsz=0;italic=0;pitch=0;ul=0;"/>
+					<element geometry="Left=465;Top=434;Right=580;Bottom=489;" subject="EAID_4CD6F72F_C895_4f45_A897_6A3BE5805EC3" seqno="11" style="DUID=B4DBC56E;"/>
+					<element geometry="Left=318;Top=434;Right=433;Bottom=489;" subject="EAID_151E333E_CEC7_4c28_B222_35A41469D7C5" seqno="12" style="DUID=B9437A32;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_ACAE27B9_7F0D_4491_BDBC_A13B860A4535" style="Mode=3;EOID=143237D3;SOID=AB727BBA;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_93385F64_990A_44d0_A266_DDF9F55EABCE" style="Mode=3;EOID=8FEC97BC;SOID=8A0C6A9E;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B6C50430_8249_4ddc_9657_EC6B3D521C37" style="Mode=3;EOID=AB727BBA;SOID=EAD26001;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=10;SY=5;EX=10;EY=5;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_2902C23F_2D24_4d06_924C_BF1F30BDA6CD" style="Mode=3;EOID=BEA19FF4;SOID=EAD26001;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_DA29E13C_0424_4173_A5A2_DD96859DF5FB" style="Mode=3;EOID=6AA2D74C;SOID=EAD26001;Color=-1;LWidth=0;Hidden=0;"/>
@@ -7437,17 +7955,18 @@
 					<element geometry="SX=4;SY=1;EX=4;EY=9;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_504EDC48_0B7F_4532_83B7_20456106C5AD" style="Mode=3;EOID=A5BD283E;SOID=B9437A32;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;EX=31;EY=-33;SX=-7;SY=-2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D2C94CC0_A14F_4c9c_B4C0_912C9C11EC4E" style="Mode=3;EOID=143237D3;SOID=6AA2D74C;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-5;SY=8;EX=-5;EY=8;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8713966E_EA7B_4ed9_8ABC_CDD0FA9EF71E" style="Mode=3;EOID=8A0C6A9E;SOID=A5BD283E;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;EX=22;EY=-22;SX=22;SY=27;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4657FAEB_1A34_4ef7_947D_E6C47AAC7527" style="Mode=3;EOID=8FEC97BC;SOID=143237D3;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=4;SY=0;EX=4;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A88E2729_62D9_493c_8105_4D93D49DFA8A" style="Mode=3;EOID=143237D3;SOID=BEA19FF4;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BF3FF147_D995_4e17_B9C6_7721498D7537" style="Mode=3;EOID=8A0C6A9E;SOID=05EE8F7E;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-50;SY=-50;EX=-45;EY=-35;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BD5C98D5_43D4_41be_9C21_84470056CF01" style="Mode=3;EOID=8A0C6A9E;SOID=14C0F730;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_22250BDC_AC99_495d_9AAD_3A4E9486D937">
-				<model package="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708" localID="361" owner="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708" tpos="1"/>
-				<properties name="order" type="Logical" documentation="The identifier of the Order given by the Seller.&#xA;&#xA;Additional Information:&#xA;This identifier is different than the identifier of the Order given by the Buyer and it is useful for internal purposes.&#xA;&#xA;WG approval 12/10/2023"/>
-				<project author="lps" version="1.0" created="2022-08-24 16:12:01" modified="2023-10-12 17:47:59"/>
+				<model package="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A" localID="361" owner="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A" tpos="1"/>
+				<properties name="order" type="Logical"/>
+				<project author="lps" version="1.0" created="2022-08-24 16:12:01" modified="2024-07-23 10:31:49"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=791;DocSize.cy=1134;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=EC047A54;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=A8616A48;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
@@ -7472,7 +7991,7 @@
 					<element geometry="Left=1773;Top=900;Right=2081;Bottom=1024;" subject="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" seqno="18" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=A2681485;"/>
 					<element geometry="Left=2147;Top=828;Right=2393;Bottom=968;" subject="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" seqno="19" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=CE099E96;"/>
 					<element geometry="Left=1593;Top=1108;Right=1818;Bottom=1178;" subject="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" seqno="20" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=99A7BCDE;"/>
-					<element geometry="Left=2159;Top=1098;Right=2378;Bottom=1188;" subject="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" seqno="21" style="DUID=8F115D9C;NSL=0;"/>
+					<element geometry="Left=2159;Top=1098;Right=2402;Bottom=1188;" subject="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" seqno="21" style="DUID=8F115D9C;NSL=0;"/>
 					<element geometry="Left=892;Top=898;Right=1131;Bottom=1025;" subject="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" seqno="22" style="DUID=1306BB96;NSL=0;"/>
 					<element geometry="Left=2027;Top=749;Right=2217;Bottom=803;" subject="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" seqno="23" style="DUID=46DC6ECE;NSL=0;"/>
 					<element geometry="Left=1832;Top=434;Right=2132;Bottom=504;" subject="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" seqno="24" style="DUID=EEA90BD8;"/>
@@ -7486,7 +8005,7 @@
 					<element geometry="Left=1115;Top=1580;Right=1286;Bottom=1650;" subject="EAID_2424C22E_B54F_4b6f_BA47_E78DE21C76DE" seqno="32" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=270C82D8;"/>
 					<element geometry="Left=1171;Top=353;Right=1438;Bottom=451;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="33" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=5CE5CCD3;"/>
 					<element geometry="Left=1111;Top=1277;Right=1287;Bottom=1362;" subject="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" seqno="34" style="DUID=1F8F8C9C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="SX=0;SY=0;EX=-6;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=129:CY=14:OX=-7:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-5:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_082B76C7_EF6B_4c76_8A07_9FF99AC0CF07" style="Mode=3;EOID=A2681485;SOID=C2D9832A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BBC722BA_3236_4fcb_B51A_14A66F3D627C" style="Mode=2;EOID=C53AE989;SOID=CE099E96;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=30;EX=0;EY=45;EDGE=2;SCTR.LEFT=2377;SCTR.TOP=-868;SCTR.RIGHT=2408;SCTR.BOTTOM=-853;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=2393:-868$2408:-868$2408:-853$2393:-853$;" subject="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24" style="Mode=3;EOID=CE099E96;SOID=CE099E96;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_E507D198_1A41_4b43_873A_F9E88411186D" style="Mode=3;EOID=C53AE989;SOID=CE099E96;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA" style="Mode=3;EOID=C53AE989;SOID=CE099E96;Color=-1;LWidth=0;Hidden=1;"/>
@@ -7496,9 +8015,10 @@
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=30;EX=0;EY=45;EDGE=2;SCTR.LEFT=2377;SCTR.TOP=-868;SCTR.RIGHT=2408;SCTR.BOTTOM=-853;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=2393:-868$2408:-868$2408:-853$2393:-853$;" subject="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991" style="Mode=3;EOID=CE099E96;SOID=CE099E96;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=30;EX=0;EY=45;EDGE=2;SCTR.LEFT=2377;SCTR.TOP=-868;SCTR.RIGHT=2408;SCTR.BOTTOM=-853;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=2393:-868$2408:-868$2408:-853$2393:-853$;" subject="EAID_AF2B738F_531D_4495_9397_CE5771200854" style="Mode=3;EOID=CE099E96;SOID=CE099E96;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_ECEFDC69_19B4_47d7_A201_D8391B5C67DF" style="Mode=3;EOID=C53AE989;SOID=CE099E96;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="EDGE=4;SX=1;SY=0;EX=1;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=64:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F48E8C16_CD7F_4664_8346_839CB32AF64E" style="Mode=3;EOID=270C82D8;SOID=301B04EC;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BBC722BA_3236_4fcb_B51A_14A66F3D627C" style="Mode=2;EOID=C53AE989;SOID=CE099E96;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SX=0;SY=-1;EX=0;EY=-1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_CBE972DE_D8B8_42a5_A6A1_F386873985BC" style="Mode=3;EOID=5CE5CCD3;SOID=1306BB96;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=0;SY=-18;EX=-4;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=125:CY=14:OX=77:OY=-28:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1497:-664$;" subject="EAID_AD18A153_57A6_4142_86D1_A887FC375039" style="Mode=3;EOID=C2D9832A;SOID=D69CCAC2;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=8;SY=0;EX=0;EY=-10;$LLB=;LLT=;LMT=;LMB=;LRT=CX=135:CY=14:OX=17:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=2278:-218$;" subject="EAID_F7CADBEA_BE8C_41f0_8070_7102E73439C9" style="Mode=3;EOID=A3D5D06B;SOID=CE099E96;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-4;SY=-7;EX=-4;EY=-7;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9F9DDC4D_D1D7_4c74_943A_79D432082022" style="Mode=2;EOID=543087BC;SOID=1306BB96;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=-6;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=129:CY=14:OX=-7:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-5:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_082B76C7_EF6B_4c76_8A07_9FF99AC0CF07" style="Mode=3;EOID=A2681485;SOID=C2D9832A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=-18;EX=5;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=63:OY=-16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1710:-979$;" subject="EAID_0AC5D04E_7364_4118_9D94_CE93A68B3CF9" style="Mode=3;EOID=99A7BCDE;SOID=C2D9832A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=69;SY=0;EX=0;EY=-5;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=72:CY=14:OX=-12:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-8:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1570:-781$;" subject="EAID_1F2E5010_8DA9_46f5_A0D6_59757CEC226D" style="Mode=3;EOID=46DC6ECE;SOID=C2D9832A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=1;SY=0;EX=1;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C6F7D14A_11BF_430e_ABED_4C9AC22FFF2A" style="Mode=3;EOID=C53AE989;SOID=9E0DCB3A;Color=-1;LWidth=0;Hidden=1;"/>
@@ -7507,22 +8027,22 @@
 					<element geometry="EDGE=3;SX=73;SY=0;EX=0;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=94:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=717:-402$;" subject="EAID_3220FB6D_76C7_486a_9953_EA1E6D255A89" style="Mode=3;EOID=5CE5CCD3;SOID=21A0BB07;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_3EC00346_DC8E_4fd4_8A9A_9A4173CBD283" style="Mode=3;EOID=6C3FCA0B;SOID=21A0BB07;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="EDGE=3;SX=8;SY=0;EX=8;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=49:OY=-13:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_FD687C05_7D35_48ab_B0AA_8C6787D5DF46" style="Mode=2;EOID=6C3FCA0B;SOID=21A0BB07;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_97C17D51_4DF6_4979_B308_C0F08C743DCF" style="Mode=2;EOID=A3D5D06B;SOID=21A0BB07;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=8;SY=0;EX=0;EY=-10;$LLB=;LLT=;LMT=;LMB=;LRT=CX=135:CY=14:OX=17:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=2278:-218$;" subject="EAID_F7CADBEA_BE8C_41f0_8070_7102E73439C9" style="Mode=3;EOID=A3D5D06B;SOID=CE099E96;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-110;SY=0;EX=0;EY=-14;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=3:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=5:OY=6:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7129001E_A2EF_4905_B7BD_A92CA6123721" style="Mode=3;EOID=5C383724;SOID=1306BB96;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=4;SX=1;SY=0;EX=1;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=64:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F48E8C16_CD7F_4664_8346_839CB32AF64E" style="Mode=3;EOID=270C82D8;SOID=301B04EC;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=159:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_52CB7369_B0C2_4acc_A513_76150076F808" style="Mode=3;EOID=C53AE989;SOID=CE099E96;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-58;SY=0;EX=-6;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=108:CY=14:OX=60:OY=74:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=953:-1265$2505:-1265$;" subject="EAID_D42B1380_78A6_4579_B0FD_C3609EBD8AFD" style="Mode=3;EOID=C53AE989;SOID=1306BB96;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=56:CY=14:OX=34:OY=-15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_C70B3C1A_A0BD_494b_BEE6_89F708783872" style="Mode=3;EOID=9E0DCB3A;SOID=301B04EC;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;EX=-108;EY=0;SX=-37;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1461:-1117$;" subject="EAID_CEDC5261_E7FF_4ca6_8255_6B2812DC1B0C" style="Mode=3;EOID=C53AE989;SOID=301B04EC;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="EDGE=2;EX=77;EY=0;SX=0;SY=-14;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=46:OY=36:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2588:-1629$;" subject="EAID_4A4FE890_B03B_430a_A719_E1852BEECBEE" style="Mode=3;EOID=C53AE989;SOID=301B04EC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=28;SY=-6;EX=54;EY=2;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=80:CY=14:OX=11:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=2:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_BF61F37A_DE72_4467_A025_043DE09FF216" style="Mode=2;EOID=6B779B12;SOID=1306BB96;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-99;SY=0;EX=0;EY=-16;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=113:CY=14:OX=3:OY=-5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=2:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=912:-845$;" subject="EAID_813DC23D_A612_4ba0_B319_00C96CEA60BC" style="Mode=3;EOID=1F2661FE;SOID=1306BB96;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-78;SY=0;EX=0;EY=-7;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=154:CY=14:OX=-12:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-8:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=933:-1403$;" subject="EAID_E35A5085_B775_40dd_87F4_44B260BCBB19" style="Mode=3;EOID=4EB6EA7E;SOID=1306BB96;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-104;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=154:CY=14:OX=-12:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-8:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=907:-1396$;" subject="EAID_E35A5085_B775_40dd_87F4_44B260BCBB19" style="Mode=3;EOID=4EB6EA7E;SOID=1306BB96;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=6;SY=32;EX=6;EY=-17;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=-10:OY=-6:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-1:OY=5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_46338F2C_8F52_4c58_8FE0_29F2F5CFCD7E" style="Mode=3;EOID=C2D9832A;SOID=1306BB96;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=85;SY=0;EX=0;EY=6;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=148:CY=14:OX=-2:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1096:-640$;" subject="EAID_7A1163CB_9C26_4b4f_BCD6_23ABF38C12BE" style="Mode=3;EOID=D69CCAC2;SOID=1306BB96;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=44;SY=0;EX=0;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=162:CY=14:OX=-22:OY=-7:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1055:-565$;" subject="EAID_C4D92701_64B7_43fe_A8FE_020E2E87A51A" style="Mode=3;EOID=BC38C02C;SOID=1306BB96;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=76;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=161:CY=14:OX=-3:OY=-9:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1087:-1162$;" subject="EAID_F03F1621_7810_4b80_BE0A_37F252FE6245" style="Mode=3;EOID=08F8EE82;SOID=1306BB96;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=30;EX=0;EY=45;EDGE=2;SCTR.LEFT=2377;SCTR.TOP=-868;SCTR.RIGHT=2408;SCTR.BOTTOM=-853;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=2393:-868$2408:-868$2408:-853$2393:-853$;" subject="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F" style="Mode=3;EOID=CE099E96;SOID=CE099E96;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
-					<element geometry="SX=0;SY=-60;EX=0;EY=24;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=81:CY=14:OX=-11:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=-3:OY=6:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=416:-1021$416:-647$;" subject="EAID_D2FAB429_5D16_4718_A790_6F3EB673B453" style="Mode=3;EOID=6C3FCA0B;SOID=1306BB96;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-4;SY=-7;EX=-4;EY=-7;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9F9DDC4D_D1D7_4c74_943A_79D432082022" style="Mode=2;EOID=543087BC;SOID=1306BB96;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-58;SY=0;EX=-6;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=108:CY=14:OX=60:OY=74:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=953:-1265$2505:-1265$;" subject="EAID_D42B1380_78A6_4579_B0FD_C3609EBD8AFD" style="Mode=3;EOID=C53AE989;SOID=1306BB96;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-110;SY=0;EX=0;EY=-14;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=3:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=5:OY=6:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7129001E_A2EF_4905_B7BD_A92CA6123721" style="Mode=3;EOID=5C383724;SOID=1306BB96;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=0;EY=-9;SX=-79;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=93:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=932:-1328$;" subject="EAID_24C53A6F_084E_4dbf_817A_1DF5BE5981D8" style="Mode=3;EOID=1F8F8C9C;SOID=1306BB96;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=1;SY=0;EX=-2;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=84:CY=14:OX=51:OY=-15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9866393B_8067_4f18_9B28_69541B862505" style="Mode=3;EOID=13B63273;SOID=1306BB96;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=1;SY=0;EX=1;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8DBBB829_4470_4b0d_A142_494C41C8807D" style="Mode=3;EOID=5CE5CCD3;SOID=1306BB96;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_2C64F9E7_B02B_4433_AB2C_0A6E23A8559E" style="Mode=3;EOID=5CE5CCD3;SOID=1306BB96;Color=-1;LWidth=0;Hidden=1;"/>
@@ -7531,10 +8051,11 @@
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F78CF3B1_3FB3_43b9_B9AB_1FE660C3663F" style="Mode=3;EOID=5CE5CCD3;SOID=1306BB96;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C753CDC6_88B6_449b_B44C_0F56A31472A7" style="Mode=3;EOID=5CE5CCD3;SOID=1306BB96;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C3F576CC_0DFC_40d6_86C4_6F47177DB0C6" style="Mode=3;EOID=5CE5CCD3;SOID=1306BB96;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=73:CY=14:OX=35:OY=10:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_E9E2A1B8_A705_4847_8FE6_3B40BD241A4B" style="Mode=3;EOID=4865D813;SOID=5CE5CCD3;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=76;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=161:CY=14:OX=-3:OY=-9:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1087:-1162$;" subject="EAID_F03F1621_7810_4b80_BE0A_37F252FE6245" style="Mode=3;EOID=08F8EE82;SOID=1306BB96;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-1;EX=0;EY=-1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_CBE972DE_D8B8_42a5_A6A1_F386873985BC" style="Mode=3;EOID=5CE5CCD3;SOID=1306BB96;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=0;SY=24;EX=-1;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D8788651_B092_4dea_82FA_E8F122CD0638" style="Mode=3;EOID=EEA90BD8;SOID=D69CCAC2;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-60;EX=0;EY=24;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=81:CY=14:OX=-11:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=-3:OY=6:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=416:-1021$416:-647$;" subject="EAID_D2FAB429_5D16_4718_A790_6F3EB673B453" style="Mode=3;EOID=6C3FCA0B;SOID=1306BB96;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=-6;EX=-54;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=125:CY=14:OX=56:OY=20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1447:-1168$;" subject="EAID_C553180A_8F43_4db4_900E_D8D8F18E8521" style="Mode=3;EOID=C2D9832A;SOID=08F8EE82;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=-18;EX=-4;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=125:CY=14:OX=77:OY=-28:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1497:-664$;" subject="EAID_AD18A153_57A6_4142_86D1_A887FC375039" style="Mode=3;EOID=C2D9832A;SOID=D69CCAC2;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9EDDC1AB_FC05_462d_A479_433862DD01D8" style="Mode=3;EOID=1F8F8C9C;SOID=1F2661FE;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=0;SY=20;EX=-30;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=913:-809$;" subject="EAID_51057DA3_81A5_4e16_A7F9_22D9EFCB1693" style="Mode=3;EOID=543087BC;SOID=1F2661FE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=-33;EX=-1;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=116:CY=14:OX=65:OY=-25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1198:-1429$;" subject="EAID_A52635C6_3F1B_4466_A940_494C66EC292F" style="Mode=3;EOID=EB0F8D18;SOID=4EB6EA7E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=138:CY=14:OX=79:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D8FEF002_D274_4157_BCA8_CFEC07ED34AE" style="Mode=3;EOID=301B04EC;SOID=4EB6EA7E;Color=-1;LWidth=0;Hidden=0;"/>
@@ -7543,9 +8064,9 @@
 					<element geometry="SX=-1;SY=19;EX=-1;EY=20;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=183:CY=14:OX=-8:OY=-6:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_ED2DCABC_3EFA_4af4_B368_9AA9D2B6757D" style="Mode=3;EOID=9A4F3D24;SOID=4EB6EA7E;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=4;SY=-21;EX=4;EY=-20;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=182:CY=14:OX=-11:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F79B2205_58A2_42e8_ACA2_4C099B935E15" style="Mode=3;EOID=9A4F3D24;SOID=4EB6EA7E;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F0951C5B_94E2_4a5f_BF21_25D103CB3656" style="Mode=3;EOID=C53AE989;SOID=4EB6EA7E;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SX=-117;SY=0;EX=0;EY=-8;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=80:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=466:-912$;" subject="EAID_6089809C_E481_4fb3_9090_B37DC376C605" style="Mode=3;EOID=6B779B12;SOID=1F2661FE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_97C17D51_4DF6_4979_B308_C0F08C743DCF" style="Mode=2;EOID=A3D5D06B;SOID=21A0BB07;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=0;SY=0;EX=0;EY=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=114:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_233516AD_8114_473d_B8A6_42826FC39635" style="Mode=3;EOID=499B44CD;SOID=543087BC;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-121;SY=0;EX=0;EY=-20;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=81:CY=14:OX=-8:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=462:-691$;" subject="EAID_C00C71CA_F2D3_48ca_8D27_E3F34E3AF36B" style="Mode=3;EOID=6C3FCA0B;SOID=1F2661FE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=11;SY=0;EX=0;EY=-23;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=589:-978$;" subject="EAID_9DBEA51D_27BB_47b3_9536_602D5F0E8782" style="Mode=3;EOID=A2681485;SOID=1F2661FE;Color=-1;LWidth=0;TREE=OS;Hidden=1;"/>
 					<element geometry="SX=6;SY=-1;EX=-1;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=61:OY=17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=3:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_74A55DED_4624_43a3_8FA7_D8F2D6516D40" style="Mode=2;EOID=F00A394A;SOID=08F8EE82;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=-30;EX=70;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=147:CY=14:OX=6:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-1:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_976D38A5_94EF_4bae_941E_311C9FC4668A" style="Mode=3;EOID=864A1AAE;SOID=08F8EE82;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=4;EY=0;SX=0;SY=29;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=45:OY=-25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2515:-179$;" subject="EAID_3AA2C83C_532C_460c_99CE_63F041A42F06" style="Mode=3;EOID=C53AE989;SOID=A3D5D06B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -7557,8 +8078,8 @@
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_37004BE7_04CF_4073_8177_20D687239937" style="Mode=3;EOID=499B44CD;SOID=B5A4C3BA;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-2;SY=0;EX=-72;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=32:OY=47:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1009:-1235$2439:-1235$;" subject="EAID_EC04B8A5_6281_4f14_8017_204CCE05A2CC" style="Mode=3;EOID=C53AE989;SOID=13B63273;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=-40;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1037:-485$;" subject="EAID_618070AC_783D_48ae_9723_9C69BB0EB7B4" style="Mode=3;EOID=A3D5D06B;SOID=543087BC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-95;SY=0;EX=23;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1728:-776$;" subject="EAID_9EA3B8C3_695C_4b42_8481_D40EEC904171" style="Mode=3;EOID=99A7BCDE;SOID=46DC6ECE;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
-					<element geometry="EDGE=3;SX=-11;SY=0;EX=0;EY=6;$LLB=;LLT=;LMT=;LMB=;LRT=CX=185:CY=14:OX=12:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1928:-1609$;" subject="EAID_6A549AF3_1E2A_4cd7_9F26_8CD173F2F4F7" style="Mode=3;EOID=301B04EC;SOID=9A4F3D24;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-33;SY=4;EX=4;EY=-12;$LLB=;LLT=;LMT=;LMB=;LRT=CX=144:CY=14:OX=95:OY=18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4F4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38" style="Mode=3;EOID=D69CCAC2;SOID=46DC6ECE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=73:CY=14:OX=35:OY=10:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_E9E2A1B8_A705_4847_8FE6_3B40BD241A4B" style="Mode=3;EOID=4865D813;SOID=5CE5CCD3;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=15;EX=-105;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1877:-551$;" subject="EAID_308D4104_53D2_4be0_B731_D93BB56777D3" style="Mode=3;EOID=EEA90BD8;SOID=BC38C02C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-38;SY=4;EX=-30;EY=35;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=125:CY=14:OX=65:OY=-55:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_2938C487_B424_424e_A34E_13EA1CB113F2" style="Mode=3;EOID=C2D9832A;SOID=BC38C02C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-105;SY=0;EX=0;EY=19;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85:CY=14:OX=7:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1877:-383$;" subject="EAID_516CC611_B255_4c67_AAF8_2E19960E553F" style="Mode=3;EOID=5CE5CCD3;SOID=EEA90BD8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -7567,10 +8088,11 @@
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_DF35A308_9DDF_4d5b_980E_9D85403496D0" style="Mode=3;EOID=301B04EC;SOID=46DC6ECE;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=3;SX=-21;SY=0;EX=0;EY=42;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=2259:-1056$;" subject="EAID_6D569FED_815F_45f4_87EA_C0E83DC5C9AF" style="Mode=3;EOID=1F8F8C9C;SOID=46DC6ECE;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="SX=84;SY=0;EX=86;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=130:CY=14:OX=98:OY=-23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2206:-239$1390:-239$;" subject="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7" style="Mode=3;EOID=5CE5CCD3;SOID=46DC6ECE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9EDDC1AB_FC05_462d_A479_433862DD01D8" style="Mode=3;EOID=1F8F8C9C;SOID=1F2661FE;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SX=-95;SY=0;EX=36;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1741:-803$;" subject="EAID_1F622DE3_2DEE_491f_A5F1_B592E89F9030" style="Mode=3;EOID=99A7BCDE;SOID=46DC6ECE;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
-					<element geometry="SX=0;SY=24;EX=-1;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D8788651_B092_4dea_82FA_E8F122CD0638" style="Mode=3;EOID=EEA90BD8;SOID=D69CCAC2;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=-33;SY=4;EX=4;EY=-12;$LLB=;LLT=;LMT=;LMB=;LRT=CX=144:CY=14:OX=95:OY=18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4F4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38" style="Mode=3;EOID=D69CCAC2;SOID=46DC6ECE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=63;SY=0;EX=0;EY=35;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=2230:-1067$;" subject="EAID_A0FABF7A_1814_4dd4_BD97_28BD0C9F2F49" style="Mode=3;EOID=99A7BCDE;SOID=46DC6ECE;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
+					<element geometry="SX=-117;SY=0;EX=0;EY=-8;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=80:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=466:-912$;" subject="EAID_6089809C_E481_4fb3_9090_B37DC376C605" style="Mode=3;EOID=6B779B12;SOID=1F2661FE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-95;SY=0;EX=23;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1728:-776$;" subject="EAID_9EA3B8C3_695C_4b42_8481_D40EEC904171" style="Mode=3;EOID=99A7BCDE;SOID=46DC6ECE;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
+					<element geometry="SX=-121;SY=0;EX=0;EY=-20;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=81:CY=14:OX=-8:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=462:-691$;" subject="EAID_C00C71CA_F2D3_48ca_8D27_E3F34E3AF36B" style="Mode=3;EOID=6C3FCA0B;SOID=1F2661FE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=139:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_47E28283_E9BB_4790_9AB4_37A6F31DF36A" style="Mode=3;EOID=5CE5CCD3;SOID=46DC6ECE;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=1;SX=55;SY=0;EX=0;EY=-10;$LLB=;LLT=;LMT=;LMB=;LRT=CX=154:CY=14:OX=10:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2177:-576$;" subject="EAID_15B1CFC6_0B95_4c94_B742_4DC2F5EAF55E" style="Mode=3;EOID=BC38C02C;SOID=46DC6ECE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-139;SY=0;EX=0;EY=-8;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1788:-1327$;" subject="EAID_8FF88923_D9FB_4937_B866_FABECBC1DB55" style="Mode=3;EOID=1F8F8C9C;SOID=A2681485;Color=-1;LWidth=0;TREE=OS;Hidden=1;"/>
 					<element geometry="SX=106;SY=0;EX=0;EY=35;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=2033:-1108$;" subject="EAID_F475E438_48A3_41f5_A736_268C91FF8AF2" style="Mode=3;EOID=99A7BCDE;SOID=A2681485;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
@@ -7579,16 +8101,16 @@
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_5E6E2C47_4590_4730_B50C_8F40D73778CB" style="Mode=3;EOID=46DC6ECE;SOID=A2681485;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9D9C4956_D3A6_47cd_966E_C37D023DC755" style="Mode=3;EOID=D69CCAC2;SOID=A2681485;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EX=-91;EY=0;SX=0;SY=-5;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BC94D054_08DB_4bb5_A279_498213B45F8E" style="Mode=3;EOID=21A0BB07;SOID=1F2661FE;Color=-1;LWidth=0;TREE=OS;Hidden=1;"/>
-					<element geometry="SX=11;SY=0;EX=0;EY=-23;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=589:-978$;" subject="EAID_9DBEA51D_27BB_47b3_9536_602D5F0E8782" style="Mode=3;EOID=A2681485;SOID=1F2661FE;Color=-1;LWidth=0;TREE=OS;Hidden=1;"/>
-					<element geometry="SX=63;SY=0;EX=0;EY=35;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=2230:-1067$;" subject="EAID_A0FABF7A_1814_4dd4_BD97_28BD0C9F2F49" style="Mode=3;EOID=99A7BCDE;SOID=46DC6ECE;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
+					<element geometry="EDGE=3;SX=-11;SY=0;EX=0;EY=6;$LLB=;LLT=;LMT=;LMB=;LRT=CX=185:CY=14:OX=12:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1928:-1609$;" subject="EAID_6A549AF3_1E2A_4cd7_9F26_8CD173F2F4F7" style="Mode=3;EOID=301B04EC;SOID=9A4F3D24;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-95;SY=0;EX=36;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1741:-803$;" subject="EAID_1F622DE3_2DEE_491f_A5F1_B592E89F9030" style="Mode=3;EOID=99A7BCDE;SOID=46DC6ECE;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_000A8819_EDF3_4cb3_9B22_BB629B0F2EBD">
-				<model package="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708" localID="371" owner="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708" tpos="5"/>
+				<model package="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A" localID="371" owner="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A" tpos="5"/>
 				<properties name="order information hubs" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-12-01 16:09:04" modified="2024-03-12 16:16:38"/>
+				<project author="lps" version="1.0" created="2022-12-01 16:09:04" modified="2024-07-23 10:33:10"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=791;DocSize.cy=1134;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=E27B0218;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=235198B6;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
@@ -7605,23 +8127,23 @@
 					<element geometry="Left=597;Top=1160;Right=897;Bottom=1230;" subject="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" seqno="10" style="DUID=7DBD414C;NSL=0;"/>
 					<element geometry="Left=981;Top=1165;Right=1119;Bottom=1226;" subject="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" seqno="11" style="NSL=0;DUID=AB3B9B70;"/>
 					<element geometry="Left=1092;Top=1048;Right=1230;Bottom=1102;" subject="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" seqno="12" style="DUID=ED29D87B;NSL=0;"/>
-					<element geometry="Left=822;Top=222;Right=1048;Bottom=297;" subject="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" seqno="13" style="DUID=11A29A9A;NSL=0;"/>
+					<element geometry="Left=822;Top=222;Right=1048;Bottom=307;" subject="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" seqno="13" style="DUID=11A29A9A;NSL=0;"/>
 					<element geometry="Left=499;Top=324;Right=604;Bottom=367;" subject="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695" seqno="14" style="NSL=0;DUID=08DB7FE0;"/>
 					<element geometry="Left=902;Top=572;Right=1056;Bottom=642;" subject="EAID_1D470B74_66C6_4e95_82A9_28C6309EBB94" seqno="15" style="DUID=EFAF4224;"/>
 					<element geometry="Left=880;Top=752;Right=1119;Bottom=879;" subject="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" seqno="16" style="NSL=0;DUID=5DE61B2B;"/>
 					<element geometry="Left=1253;Top=780;Right=1437;Bottom=850;" subject="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" seqno="17" style="NSL=0;DUID=368F1D1D;"/>
 					<element geometry="Left=523;Top=558;Right=742;Bottom=643;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="18" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=9130A52F;"/>
 					<element geometry="SX=77;SY=-4;EX=-8;EY=26;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=148:CY=14:OX=80:OY=-22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=19:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7A1163CB_9C26_4b4f_BCD6_23ABF38C12BE" style="Mode=3;EOID=AB3B9B70;SOID=5DE61B2B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=4;SX=1;SY=0;EX=1;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=64:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F48E8C16_CD7F_4664_8346_839CB32AF64E" style="Mode=3;EOID=D2FF0AED;SOID=F7E0C537;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C753CDC6_88B6_449b_B44C_0F56A31472A7" style="Mode=3;EOID=B00C2A3D;SOID=5DE61B2B;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=4;EX=-16;EY=0;SX=0;SY=43;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=342:-772$;" subject="EAID_F78CF3B1_3FB3_43b9_B9AB_1FE660C3663F" style="Mode=3;EOID=B00C2A3D;SOID=5DE61B2B;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A110770D_19E8_400c_A438_44EEAB172389" style="Mode=3;EOID=B00C2A3D;SOID=5DE61B2B;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_29D3C49F_AF44_49ad_8519_B199CADD080B" style="Mode=3;EOID=B00C2A3D;SOID=5DE61B2B;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_2C64F9E7_B02B_4433_AB2C_0A6E23A8559E" style="Mode=3;EOID=B00C2A3D;SOID=5DE61B2B;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8DBBB829_4470_4b0d_A142_494C41C8807D" style="Mode=3;EOID=B00C2A3D;SOID=5DE61B2B;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=0;SY=-3;EX=-69;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=108:CY=14:OX=61:OY=26:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=482:-818$;" subject="EAID_D42B1380_78A6_4579_B0FD_C3609EBD8AFD" style="Mode=3;EOID=9D073F5D;SOID=5DE61B2B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C3F576CC_0DFC_40d6_86C4_6F47177DB0C6" style="Mode=3;EOID=B00C2A3D;SOID=5DE61B2B;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=4;SX=1;SY=0;EX=1;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=64:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F48E8C16_CD7F_4664_8346_839CB32AF64E" style="Mode=3;EOID=D2FF0AED;SOID=F7E0C537;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=-38;EX=5;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=123:CY=27:OX=74:OY=-34:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1166:-853$;" subject="EAID_C4D92701_64B7_43fe_A8FE_020E2E87A51A" style="Mode=3;EOID=ED29D87B;SOID=5DE61B2B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=3;SX=1;SY=0;EX=1;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_CBE972DE_D8B8_42a5_A6A1_F386873985BC" style="Mode=3;EOID=B00C2A3D;SOID=5DE61B2B;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=93:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_24C53A6F_084E_4dbf_817A_1DF5BE5981D8" style="Mode=3;EOID=EA02C216;SOID=5DE61B2B;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=-97;SY=-2;EX=24;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=154:CY=14:OX=80:OY=23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_36E7ABA9_FFB1_4212_81E5_12821EB05CDD" style="Mode=3;EOID=EFAF4224;SOID=5DE61B2B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=4;SY=-3;EX=4;EY=-3;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=-4:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-1:OY=5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_46338F2C_8F52_4c58_8FE0_29F2F5CFCD7E" style="Mode=3;EOID=368F1D1D;SOID=5DE61B2B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=96;SY=0;EX=0;EY=-11;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=154:CY=14:OX=15:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=3:OY=5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1095:-270$;" subject="EAID_E35A5085_B775_40dd_87F4_44B260BCBB19" style="Mode=3;EOID=11A29A9A;SOID=5DE61B2B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -7638,9 +8160,9 @@
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D8788651_B092_4dea_82FA_E8F122CD0638" style="Mode=3;EOID=7DBD414C;SOID=AB3B9B70;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=-14;EX=-8;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=125:CY=14:OX=84:OY=41:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1337:-1209$;" subject="EAID_AD18A153_57A6_4142_86D1_A887FC375039" style="Mode=3;EOID=368F1D1D;SOID=AB3B9B70;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=-6;EX=-72;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=125:CY=14:OX=61:OY=66:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1273:-1081$;" subject="EAID_2938C487_B424_424e_A34E_13EA1CB113F2" style="Mode=3;EOID=368F1D1D;SOID=ED29D87B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C753CDC6_88B6_449b_B44C_0F56A31472A7" style="Mode=3;EOID=B00C2A3D;SOID=5DE61B2B;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C3F576CC_0DFC_40d6_86C4_6F47177DB0C6" style="Mode=3;EOID=B00C2A3D;SOID=5DE61B2B;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EX=0;EY=4;SX=2;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=94:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=937:-459$;" subject="EAID_F0951C5B_94E2_4a5f_BF21_25D103CB3656" style="Mode=3;EOID=9D073F5D;SOID=11A29A9A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=147:CY=14:OX=73:OY=-18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_976D38A5_94EF_4bae_941E_311C9FC4668A" style="Mode=3;EOID=F771DD0B;SOID=A2DEB53A;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;SX=1;SY=0;EX=1;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_CBE972DE_D8B8_42a5_A6A1_F386873985BC" style="Mode=3;EOID=B00C2A3D;SOID=5DE61B2B;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=-69;SY=0;EX=0;EY=-28;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=183:CY=14:OX=20:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=866:-132$;" subject="EAID_ED2DCABC_3EFA_4af4_B368_9AA9D2B6757D" style="Mode=3;EOID=49FC0F50;SOID=11A29A9A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=21;EX=46;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=86:CY=27:OX=111:OY=-60:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1391:-238$;" subject="EAID_ADDD985E_9817_4356_BF94_B8B6325FE628" style="Mode=3;EOID=368F1D1D;SOID=11A29A9A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=103;SY=-11;EX=-32;EY=-8;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=112:CY=14:OX=65:OY=37:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=7:OY=5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_DCA21CBC_3D4F_480a_B24B_49A69CC51624" style="Mode=3;EOID=EA02C216;SOID=11A29A9A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -7648,11 +8170,12 @@
 					<element geometry="SX=-66;SY=0;EX=0;EY=-3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=116:CY=14:OX=9:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=869:-348$;" subject="EAID_A52635C6_3F1B_4466_A940_494C66EC292F" style="Mode=3;EOID=08DB7FE0;SOID=11A29A9A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=8;EX=1;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=86:CY=27:OX=59:OY=-44:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=6:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1346:-599$;" subject="EAID_16C34048_F5E0_4885_8D46_5814F76AE356" style="Mode=3;EOID=368F1D1D;SOID=EFAF4224;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=5;SY=4;EX=5;EY=-3;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=108:CY=14:OX=17:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=5:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_A79DC2F8_C373_4894_AF6D_C4779365607A" style="Mode=3;EOID=9130A52F;SOID=EFAF4224;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=147:CY=14:OX=73:OY=-18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_976D38A5_94EF_4bae_941E_311C9FC4668A" style="Mode=3;EOID=F771DD0B;SOID=A2DEB53A;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=-5;EX=-9;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=738:-1080$;" subject="EAID_308D4104_53D2_4be0_B731_D93BB56777D3" style="Mode=3;EOID=7DBD414C;SOID=ED29D87B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_FC3EFF3F_9A22_4a45_83B7_8A32BC22CFBE">
-				<model package="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708" localID="425" owner="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708" tpos="8"/>
+				<model package="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A" localID="425" owner="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A" tpos="8"/>
 				<properties name="order invoicee" type="Logical"/>
 				<project author="andreea" version="1.0" created="2023-03-20 18:21:19" modified="2024-03-13 13:59:58"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
@@ -7683,7 +8206,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_04F29F40_7172_4127_9D37_0EBF552EA455">
-				<model package="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708" localID="431" owner="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708" tpos="9"/>
+				<model package="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A" localID="431" owner="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A" tpos="9"/>
 				<properties name="order total amounts" type="Logical"/>
 				<project author="andreea" version="1.0" created="2023-03-23 16:38:04" modified="2023-10-04 14:18:37"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
@@ -7707,7 +8230,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_E459BBE2_E929_4cb0_B4F7_6ABD198FEF62">
-				<model package="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708" localID="432" owner="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708" tpos="6"/>
+				<model package="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A" localID="432" owner="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A" tpos="6"/>
 				<properties name="order allowance charge general" type="Logical"/>
 				<project author="andreea" version="1.0" created="2023-03-23 17:03:09" modified="2023-09-11 18:11:31"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
@@ -7737,11 +8260,11 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_08CC4DDD_61A7_4ac7_8591_C19830AD66DB">
-				<model package="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708" localID="436" owner="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708" tpos="2"/>
+				<model package="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A" localID="436" owner="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A" tpos="2"/>
 				<properties name="order line" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-03-28 16:30:46" modified="2024-03-13 13:57:50"/>
+				<project author="andreea" version="1.0" created="2023-03-28 16:30:46" modified="2024-07-23 10:32:11"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=885E1157;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=26F57CAF;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
@@ -7749,7 +8272,7 @@
 					<element geometry="Left=1444;Top=288;Right=1683;Bottom=384;" subject="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" seqno="1" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=35A5A742;"/>
 					<element geometry="Left=1010;Top=955;Right=1100;Bottom=1025;" subject="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" seqno="2" style="DUID=DFF0309A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=950;Top=335;Right=1173;Bottom=423;" subject="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E" seqno="3" style="DUID=747250D5;NSL=0;"/>
-					<element geometry="Left=1225;Top=766;Right=1444;Bottom=856;" subject="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" seqno="4" style="DUID=43F84573;NSL=0;"/>
+					<element geometry="Left=1225;Top=766;Right=1468;Bottom=856;" subject="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" seqno="4" style="DUID=43F84573;NSL=0;"/>
 					<element geometry="Left=1728;Top=384;Right=1818;Bottom=444;" subject="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A" seqno="5" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=13B97371;"/>
 					<element geometry="Left=1729;Top=228;Right=1819;Bottom=288;" subject="EAID_33A89700_846B_47cb_93D9_9D4729194EA6" seqno="6" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=6236F7C7;"/>
 					<element geometry="Left=1612;Top=539;Right=1702;Bottom=599;" subject="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12" seqno="7" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=A6676228;"/>
@@ -7759,22 +8282,23 @@
 					<element geometry="Left=475;Top=776;Right=659;Bottom=846;" subject="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" seqno="11" style="NSL=0;DUID=1CD191BF;"/>
 					<element geometry="Left=636;Top=94;Right=920;Bottom=231;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="12" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=35F1ADB6;"/>
 					<element geometry="Left=1166;Top=454;Right=1412;Bottom=686;" subject="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" seqno="13" style="NSL=0;DUID=FE41CC0C;"/>
-					<element geometry="Left=482;Top=626;Right=653;Bottom=686;" subject="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" seqno="14" style="NSL=0;DUID=56D2D6CC;"/>
+					<element geometry="Left=451;Top=627;Right=683;Bottom=687;" subject="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" seqno="14" style="NSL=0;DUID=56D2D6CC;"/>
 					<element geometry="SX=0;SY=-15;EX=-52;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=63:OY=68:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=2:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=726:-585$;" subject="EAID_15464872_BFB6_40bb_84F1_8A3969FE662E" style="Mode=3;EOID=35F1ADB6;SOID=FE41CC0C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=48;EX=-19;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=56:OY=36:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1544:-522$;" subject="EAID_3570E246_3BA3_4795_8084_FD257C99FB89" style="Mode=3;EOID=35A5A742;SOID=FE41CC0C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=31;SY=16;EX=99;EY=-89;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=92:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807" style="Mode=3;EOID=FE41CC0C;SOID=56D2D6CC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=40;EX=79;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=69:CY=14:OX=42:OY=60:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=857:-530$;" subject="EAID_BBC722BA_3236_4fcb_B51A_14A66F3D627C" style="Mode=3;EOID=35F1ADB6;SOID=FE41CC0C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=19;EX=3;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=135:CY=14:OX=82:OY=50:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F7CADBEA_BE8C_41f0_8070_7102E73439C9" style="Mode=3;EOID=93433B5A;SOID=FE41CC0C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=19;EX=3;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=135:CY=14:OX=82:OY=50:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F7CADBEA_BE8C_41f0_8070_7102E73439C9" style="Mode=3;EOID=93433B5A;SOID=FE41CC0C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-102;SY=0;EX=0;EY=-48;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=159:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1187:-210$;" subject="EAID_52CB7369_B0C2_4acc_A513_76150076F808" style="Mode=3;EOID=35F1ADB6;SOID=FE41CC0C;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="SX=-86;SY=0;EX=0;EY=-23;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=9:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1203:-185$;" subject="EAID_ECEFDC69_19B4_47d7_A201_D8391B5C67DF" style="Mode=3;EOID=35F1ADB6;SOID=FE41CC0C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=73;EX=0;EY=97;EDGE=2;SCTR.LEFT=1389;SCTR.TOP=-497;SCTR.RIGHT=1438;SCTR.BOTTOM=-473;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1412:-497$1438:-497$1438:-473$1412:-473$;" subject="EAID_AF2B738F_531D_4495_9397_CE5771200854" style="Mode=3;EOID=FE41CC0C;SOID=FE41CC0C;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
-					<element geometry="SX=31;SY=16;EX=99;EY=-89;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=92:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807" style="Mode=3;EOID=FE41CC0C;SOID=56D2D6CC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=1;SY=-1;EX=1;EY=-2;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=129:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_082B76C7_EF6B_4c76_8A07_9FF99AC0CF07" style="Mode=3;EOID=FBE8BC48;SOID=1CD191BF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=-98;EX=0;EY=-24;EDGE=2;SCTR.LEFT=1389;SCTR.TOP=-668;SCTR.RIGHT=1492;SCTR.BOTTOM=-594;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1412:-668$1492:-668$1492:-594$1412:-594$;" subject="EAID_574DB5D8_4929_4670_9014_608B3C5534ED" style="Mode=3;EOID=FE41CC0C;SOID=FE41CC0C;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
-					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_AA589EDA_B26B_44c3_BCCC_37421BA960DE" style="Mode=3;EOID=56D2D6CC;SOID=1CD191BF;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EX=0;EY=-5;SX=4;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=72:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=571:-995$;" subject="EAID_1F2E5010_8DA9_46f5_A0D6_59757CEC226D" style="Mode=3;EOID=DFF0309A;SOID=1CD191BF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=-36;EX=-106;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=38:OY=24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=672:-606$;" subject="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA" style="Mode=3;EOID=35F1ADB6;SOID=FE41CC0C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=0;SY=10;EX=10;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=121:CY=14:OX=75:OY=23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=788:-560$;" subject="EAID_E507D198_1A41_4b43_873A_F9E88411186D" style="Mode=3;EOID=35F1ADB6;SOID=FE41CC0C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=32;EX=0;EY=47;EDGE=2;SCTR.LEFT=1389;SCTR.TOP=-538;SCTR.RIGHT=1457;SCTR.BOTTOM=-523;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1412:-538$1457:-538$1457:-523$1412:-523$;" subject="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24" style="Mode=3;EOID=FE41CC0C;SOID=FE41CC0C;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=104;EX=100;EY=0;EDGE=2;SCTR.LEFT=1389;SCTR.TOP=-466;SCTR.RIGHT=1437;SCTR.BOTTOM=-451;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1412:-466$1437:-466$1437:-451$1389:-451$1389:-454$;" subject="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F" style="Mode=3;EOID=FE41CC0C;SOID=FE41CC0C;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="EDGE=2;SX=4;SY=3;EX=4;EY=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=123:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7EF1D4F7_398F_4f04_A19A_C5D793FA14E3" style="Mode=3;EOID=A6676228;SOID=FE41CC0C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=-4;SY=0;EX=0;EY=-34;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=563:-196$;" subject="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044" style="Mode=3;EOID=35F1ADB6;SOID=56D2D6CC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-7;SY=0;EX=0;EY=-34;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=560:-196$;" subject="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044" style="Mode=3;EOID=35F1ADB6;SOID=56D2D6CC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=27;SY=0;EX=58;EY=0;EDGE=3;SCTR.LEFT=1316;SCTR.TOP=-778;SCTR.RIGHT=1347;SCTR.BOTTOM=-685;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1316:-686$1316:-778$1347:-778$1347:-686$;" subject="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991" style="Mode=3;EOID=FE41CC0C;SOID=FE41CC0C;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="SX=2;SY=37;EX=2;EY=37;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=8:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3AA2C83C_532C_460c_99CE_63F041A42F06" style="Mode=3;EOID=35F1ADB6;SOID=93433B5A;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=49;SY=0;EX=0;EY=-7;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=-10:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-3:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1612:-421$;" subject="EAID_0D4101FD_7720_417c_B62C_6F674CDB3888" style="Mode=3;EOID=13B97371;SOID=35A5A742;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -7783,24 +8307,24 @@
 					<element geometry="SX=-10;SY=-4;EX=-9;EY=-4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=95:CY=14:OX=45:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0692BD51_5113_4e40_A80A_3CDDD84D3629" style="Mode=3;EOID=FE41CC0C;SOID=43F84573;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=1411;SCTR.TOP=-125;SCTR.RIGHT=1440;SCTR.BOTTOM=-91;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=117:OY=25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=1423:-125$1440:-125$1440:-91$1423:-91$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=93433B5A;SOID=93433B5A;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=1202;SCTR.TOP=-89;SCTR.RIGHT=1269;SCTR.BOTTOM=-63;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=50:OY=-23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=1269:-81$1269:-63$1202:-63$1202:-89$1228:-89$;" subject="EAID_39F3583F_0D40_4e9f_8018_10297955785C" style="Mode=3;EOID=93433B5A;SOID=93433B5A;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=1;SY=-1;EX=1;EY=-2;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=129:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_082B76C7_EF6B_4c76_8A07_9FF99AC0CF07" style="Mode=3;EOID=FBE8BC48;SOID=1CD191BF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=48;EX=-19;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=56:OY=36:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1544:-522$;" subject="EAID_3570E246_3BA3_4795_8084_FD257C99FB89" style="Mode=3;EOID=35A5A742;SOID=FE41CC0C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=-6;SY=6;EX=-6;EY=6;$LLB=;LLT=;LMT=;LMB=;LRT=CX=59:CY=14:OX=16:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1BEBAC59_19C6_4908_B93C_EED975A6974F" style="Mode=3;EOID=35F1ADB6;SOID=93433B5A;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EX=0;EY=-5;SX=4;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=72:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=571:-995$;" subject="EAID_1F2E5010_8DA9_46f5_A0D6_59757CEC226D" style="Mode=3;EOID=DFF0309A;SOID=1CD191BF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=47;SY=0;EX=0;EY=-1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=-1:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1610:-259$;" subject="EAID_4D92CD55_08CD_4d21_806C_38F93CA90719" style="Mode=3;EOID=6236F7C7;SOID=35A5A742;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-5;SY=0;EX=0;EY=34;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=108:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=205:-128$;" subject="EAID_D42B1380_78A6_4579_B0FD_C3609EBD8AFD" style="Mode=3;EOID=35F1ADB6;SOID=2089BE1C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_46338F2C_8F52_4c58_8FE0_29F2F5CFCD7E" style="Mode=3;EOID=1CD191BF;SOID=2089BE1C;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=-33;SY=0;EX=0;EY=-12;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1023:-668$;" subject="EAID_C33C0B35_4ADE_463d_BD51_7717D3E67FCB" style="Mode=3;EOID=56D2D6CC;SOID=FBE8BC48;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-33;SY=0;EX=0;EY=-12;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1023:-669$;" subject="EAID_C33C0B35_4ADE_463d_BD51_7717D3E67FCB" style="Mode=3;EOID=56D2D6CC;SOID=FBE8BC48;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-34;SY=-4;EX=-34;EY=-4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=140:CY=14:OX=40:OY=-14:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_5E6E2C47_4590_4730_B50C_8F40D73778CB" style="Mode=3;EOID=DFF0309A;SOID=FBE8BC48;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=22;SY=-2;EX=22;EY=-2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=72:CY=14:OX=39:OY=-41:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3C28A6D1_3F44_48a1_A013_1A7BA2859AFA" style="Mode=3;EOID=DFF0309A;SOID=FBE8BC48;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=47;SY=0;EX=0;EY=-1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=-1:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1610:-259$;" subject="EAID_4D92CD55_08CD_4d21_806C_38F93CA90719" style="Mode=3;EOID=6236F7C7;SOID=35A5A742;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_AA589EDA_B26B_44c3_BCCC_37421BA960DE" style="Mode=3;EOID=56D2D6CC;SOID=1CD191BF;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=1332;SCTR.TOP=-88;SCTR.RIGHT=1385;SCTR.BOTTOM=-55;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=83:OY=-25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=1385:-81$1385:-55$1332:-55$1332:-81$;" subject="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9" style="Mode=3;EOID=93433B5A;SOID=93433B5A;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_10A1F3B5_0417_4962_B616_A04C2DECC0B9">
-				<model package="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708" localID="443" owner="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708" tpos="7"/>
+				<model package="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A" localID="443" owner="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A" tpos="7"/>
 				<properties name="order allowance charge and tax" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-04-24 10:46:55" modified="2023-06-01 10:42:25"/>
+				<project author="andreea" version="1.0" created="2023-04-24 10:46:55" modified="2024-07-23 10:33:28"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=734AC2A8;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=9D7AB0B6;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
@@ -7826,7 +8350,7 @@
 					<element geometry="SX=114;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=852:-275$;" subject="EAID_2EEE05CA_6A1E_4946_A54F_BC6967C07ADF" style="Mode=3;EOID=B265E645;SOID=D526AF09;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=-31;EX=-1;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=59:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1390:-306$;" subject="EAID_0D4101FD_7720_417c_B62C_6F674CDB3888" style="Mode=3;EOID=FF6DCAA7;SOID=B265E645;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=102;SY=41;EX=-44;EY=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=-2:OY=-5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-7:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4D92CD55_08CD_4d21_806C_38F93CA90719" style="Mode=3;EOID=5B961546;SOID=B265E645;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=60;SY=-3;EX=60;EY=-3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85:CY=14:OX=48:OY=-21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_87123434_C2AD_43de_925D_13E9A7667A18" style="Mode=3;EOID=5223389D;SOID=B265E645;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=60;SY=-3;EX=60;EY=-3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85:CY=14:OX=48:OY=-21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_87123434_C2AD_43de_925D_13E9A7667A18" style="Mode=3;EOID=5223389D;SOID=B265E645;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-53;SY=-5;EX=-53;EY=-5;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=51:OY=-18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_470D1B16_C07B_4868_91B2_799578663395" style="Mode=3;EOID=5223389D;SOID=B265E645;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=1;SY=0;EX=0;EY=3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=501:-425$;" subject="EAID_308D4104_53D2_4be0_B731_D93BB56777D3" style="Mode=3;EOID=D526AF09;SOID=4FCAC2B5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=-1;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=93:OY=17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=499:-816$;" subject="EAID_46338F2C_8F52_4c58_8FE0_29F2F5CFCD7E" style="Mode=3;EOID=DAC9EFAA;SOID=E4E0C5E1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -7840,13 +8364,14 @@
 					<element geometry="SX=30;SY=-34;EX=30;EY=-34;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C753CDC6_88B6_449b_B44C_0F56A31472A7" style="Mode=3;EOID=5223389D;SOID=E4E0C5E1;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=35;SY=-42;EX=35;EY=-44;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C3F576CC_0DFC_40d6_86C4_6F47177DB0C6" style="Mode=3;EOID=5223389D;SOID=E4E0C5E1;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=33;SY=-9;EX=33;EY=-9;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_CBE972DE_D8B8_42a5_A6A1_F386873985BC" style="Mode=3;EOID=5223389D;SOID=E4E0C5E1;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SX=0;SY=-6;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=130:CY=14:OX=73:OY=26:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1134:-735$;" subject="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7" style="Mode=3;EOID=5223389D;SOID=4F72A100;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-9;EX=99;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=130:CY=14:OX=73:OY=26:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1233:-738$;" subject="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7" style="Mode=3;EOID=5223389D;SOID=4F72A100;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-23;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=144:CY=14:OX=1:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=953:-630$;" subject="EAID_4F4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38" style="Mode=3;EOID=AD15F09F;SOID=4F72A100;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=17;EX=-24;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=139:CY=14:OX=60:OY=37:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1110:-712$;" subject="EAID_47E28283_E9BB_4790_9AB4_37A6F31DF36A" style="Mode=3;EOID=5223389D;SOID=4F72A100;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=3;SY=-4;EX=3;EY=-4;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=72:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1F2E5010_8DA9_46f5_A0D6_59757CEC226D" style="Mode=3;EOID=4F72A100;SOID=DAC9EFAA;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_55A5D1C5_EBDB_4ce5_AF0C_4249812776D9">
-				<model package="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708" localID="466" owner="EAPK_B9C3C97F_E0C7_4b01_BD55_8BE547657708" tpos="4"/>
+				<model package="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A" localID="466" owner="EAPK_3C885124_0F31_49dc_BD0A_CED2EA5A355A" tpos="4"/>
 				<properties name="order information hubs hierarchy" type="Logical"/>
 				<project author="andreea" version="1.0" created="2023-06-01 11:04:06" modified="2023-07-14 13:39:49"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
@@ -7879,11 +8404,11 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_201DD477_AEE9_4497_8193_049F4E8303A5">
-				<model package="EAPK_70689CE1_2681_4a24_93B5_A80337180E43" localID="375" owner="EAPK_70689CE1_2681_4a24_93B5_A80337180E43"/>
+				<model package="EAPK_C19B5FA7_AD57_4c09_8A50_D50200E83D15" localID="375" owner="EAPK_C19B5FA7_AD57_4c09_8A50_D50200E83D15"/>
 				<properties name="order response" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-12-15 14:54:41" modified="2023-09-11 18:15:16"/>
+				<project author="lps" version="1.0" created="2022-12-15 14:54:41" modified="2024-07-04 16:44:31"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=791;DocSize.cy=1134;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=0;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=8FAD85F5;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=21B39637;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
@@ -7907,30 +8432,31 @@
 					<element geometry="Left=1040;Top=962;Right=1188;Bottom=1032;" subject="EAID_F655321A_F106_46f3_933E_53ADDFD9113B" seqno="17" style="DUID=73B616E3;NSL=0;"/>
 					<element geometry="Left=444;Top=604;Right=683;Bottom=689;" subject="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" seqno="18" style="DUID=D2264175;NSL=0;"/>
 					<element geometry="Left=1004;Top=587;Right=1222;Bottom=706;" subject="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" seqno="19" style="DUID=5EE01C02;NSL=0;"/>
-					<element geometry="SX=24;SY=2;EX=24;EY=2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9343C3B2_DB33_4545_A54D_801F70801F89" style="Mode=3;EOID=5EE01C02;SOID=73B616E3;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=63;SY=0;EX=0;EY=35;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1592:-765$;" subject="EAID_A0FABF7A_1814_4dd4_BD97_28BD0C9F2F49" style="Mode=3;EOID=EA1C4C23;SOID=F301CE71;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
+					<element geometry="EX=0;EY=5;SX=-91;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=93:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=472:-1252$;" subject="EAID_24C53A6F_084E_4dbf_817A_1DF5BE5981D8" style="Mode=3;EOID=CC926770;SOID=D2264175;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=11;EX=-3;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=163:CY=14:OX=69:OY=32:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1111:-1121$;" subject="EAID_41B39003_2ED7_40e3_B01B_D11FF794AF2B" style="Mode=3;EOID=73B616E3;SOID=9EBF25D8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;SX=-21;SY=0;EX=0;EY=42;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1927:-1550$;" subject="EAID_6D569FED_815F_45f4_87EA_C0E83DC5C9AF" style="Mode=3;EOID=CC926770;SOID=F301CE71;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="SX=0;SY=1;EX=-8;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=125:CY=14:OX=75:OY=-16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_AD18A153_57A6_4142_86D1_A887FC375039" style="Mode=3;EOID=5EE01C02;SOID=8BC8ABCD;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=1;EX=-79;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=125:CY=14:OX=65:OY=-37:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1034:-329$;" subject="EAID_2938C487_B424_424e_A34E_13EA1CB113F2" style="Mode=3;EOID=5EE01C02;SOID=E3CC8F4E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-37;SY=-10;EX=-35;EY=-9;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=123:CY=14:OX=69:OY=16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_AFC00307_2C3C_43a2_91E7_AA8247B7CEDD" style="Mode=2;EOID=D2264175;SOID=E42F2F52;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-13;SY=-13;EX=-11;EY=-12;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=123:CY=14:OX=69:OY=16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_AFC00307_2C3C_43a2_91E7_AA8247B7CEDD" style="Mode=2;EOID=D2264175;SOID=E42F2F52;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=34;SY=-13;EX=34;EY=-12;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=157:CY=14:OX=-3:OY=-7:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-5:OY=8:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_13CF78D6_E061_467c_8F33_D45D96E7471E" style="Mode=2;EOID=73B616E3;SOID=E42F2F52;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=2;EX=0;EY=-14;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=96:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=112:-995$112:-532$;" subject="EAID_F0AC5841_AE12_4b29_9A54_29BA5C9C4A38" style="Mode=3;EOID=DA6D8719;SOID=E42F2F52;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=30;EX=-18;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=54:OY=31:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=224:-967$;" subject="EAID_F1419AFF_EA5D_40db_B89D_FEC52A5F5DBC" style="Mode=3;EOID=58B7DA6A;SOID=E42F2F52;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=0;EY=-49;SX=50;SY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=120:CY=14:OX=61:OY=19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=4:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F2F64E25_5DAC_4cec_8EE0_33C8C2F66C12" style="Mode=3;EOID=9D5FAD98;SOID=E42F2F52;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=11;EX=-3;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=163:CY=14:OX=69:OY=32:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1111:-1121$;" subject="EAID_41B39003_2ED7_40e3_B01B_D11FF794AF2B" style="Mode=3;EOID=73B616E3;SOID=9EBF25D8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-44;SY=2;EX=-44;EY=2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=139:CY=14:OX=66:OY=49:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-5:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B2F5C9AF_E278_4ca2_80B9_C8B85FBF7E96" style="Mode=3;EOID=5EE01C02;SOID=73B616E3;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=12;EX=0;EY=-1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=144:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1878:-808$1878:-247$;" subject="EAID_4F4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38" style="Mode=3;EOID=8BC8ABCD;SOID=F301CE71;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=182:CY=14:OX=90:OY=-21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_ECF97AE3_C138_47de_9B92_F1BE4B376642" style="Mode=3;EOID=9EBF25D8;SOID=E42F2F52;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-95;SY=0;EX=36;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1421:-847$;" subject="EAID_1F622DE3_2DEE_491f_A5F1_B592E89F9030" style="Mode=3;EOID=EA1C4C23;SOID=F301CE71;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
+					<element geometry="SX=24;SY=2;EX=24;EY=2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9343C3B2_DB33_4545_A54D_801F70801F89" style="Mode=3;EOID=5EE01C02;SOID=73B616E3;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-95;SY=0;EX=23;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1408:-820$;" subject="EAID_9EA3B8C3_695C_4b42_8481_D40EEC904171" style="Mode=3;EOID=EA1C4C23;SOID=F301CE71;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=81:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D2FAB429_5D16_4718_A790_6F3EB673B453" style="Mode=2;EOID=58B7DA6A;SOID=D2264175;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=22;SY=0;EX=0;EY=3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=162:CY=14:OX=-15:OY=-10:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=585:-327$;" subject="EAID_C4D92701_64B7_43fe_A8FE_020E2E87A51A" style="Mode=3;EOID=E3CC8F4E;SOID=D2264175;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-9;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=148:CY=14:OX=-2:OY=-8:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=554:-246$;" subject="EAID_7A1163CB_9C26_4b4f_BCD6_23ABF38C12BE" style="Mode=3;EOID=8BC8ABCD;SOID=D2264175;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=3;SY=-5;EX=3;EY=-5;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=4:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_46338F2C_8F52_4c58_8FE0_29F2F5CFCD7E" style="Mode=2;EOID=5EE01C02;SOID=D2264175;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=3;SY=-5;EX=3;EY=-5;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=-6:OY=-5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_46338F2C_8F52_4c58_8FE0_29F2F5CFCD7E" style="Mode=2;EOID=5EE01C02;SOID=D2264175;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-44;SY=0;EX=0;EY=-9;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=80:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=519:-527$;" subject="EAID_BF61F37A_DE72_4467_A025_043DE09FF216" style="Mode=3;EOID=DA6D8719;SOID=D2264175;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=81;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=72:CY=14:OX=-2:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-8:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1194:-820$;" subject="EAID_1F2E5010_8DA9_46f5_A0D6_59757CEC226D" style="Mode=3;EOID=F301CE71;SOID=5EE01C02;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=-5;EX=-43;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=34:OY=-29:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1342:-651$;" subject="EAID_0AC5D04E_7364_4118_9D94_CE93A68B3CF9" style="Mode=3;EOID=EA1C4C23;SOID=5EE01C02;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=85;SY=0;EX=0;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=129:CY=14:OX=-2:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-5:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1198:-372$;" subject="EAID_082B76C7_EF6B_4c76_8A07_9FF99AC0CF07" style="Mode=3;EOID=3483CF6A;SOID=5EE01C02;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=-12;EX=-5;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=125:CY=14:OX=69:OY=-24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=930:-1144$;" subject="EAID_9898A4B0_1319_468d_ACED_450943028D41" style="Mode=3;EOID=4EB7D866;SOID=9EBF25D8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=112:CY=14:OX=80:OY=-26:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_89C3F218_90EF_42ed_B918_7EEB88718C50" style="Mode=3;EOID=CC926770;SOID=9EBF25D8;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=182:CY=14:OX=90:OY=-21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_ECF97AE3_C138_47de_9B92_F1BE4B376642" style="Mode=3;EOID=9EBF25D8;SOID=E42F2F52;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-44;SY=2;EX=-44;EY=2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=139:CY=14:OX=66:OY=49:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-5:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B2F5C9AF_E278_4ca2_80B9_C8B85FBF7E96" style="Mode=3;EOID=5EE01C02;SOID=73B616E3;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=2;SY=-13;EX=2;EY=-13;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=135:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F7CADBEA_BE8C_41f0_8070_7102E73439C9" style="Mode=3;EOID=15959C54;SOID=B82062F1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=4;SCTR.LEFT=720;SCTR.TOP=-479;SCTR.RIGHT=758;SCTR.BOTTOM=-416;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=2:OY=-25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=757:-416$720:-416$720:-479$757:-479$;" subject="EAID_39F3583F_0D40_4e9f_8018_10297955785C" style="Mode=3;EOID=15959C54;SOID=15959C54;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=816;SCTR.TOP=-409;SCTR.RIGHT=892;SCTR.BOTTOM=-385;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=97:OY=-21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=892:-407$892:-385$816:-385$816:-407$;" subject="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9" style="Mode=3;EOID=15959C54;SOID=15959C54;Color=-1;LWidth=0;Hidden=0;"/>
@@ -7942,9 +8468,9 @@
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_5E6E2C47_4590_4730_B50C_8F40D73778CB" style="Mode=3;EOID=F301CE71;SOID=3483CF6A;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_3C28A6D1_3F44_48a1_A013_1A7BA2859AFA" style="Mode=3;EOID=F301CE71;SOID=3483CF6A;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=20;SY=0;EX=0;EY=35;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1495:-684$;" subject="EAID_E93A74BB_614F_4b1c_AE59_F45CD626BB7A" style="Mode=3;EOID=EA1C4C23;SOID=3483CF6A;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
-					<element geometry="SX=-95;SY=0;EX=36;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1421:-847$;" subject="EAID_1F622DE3_2DEE_491f_A5F1_B592E89F9030" style="Mode=3;EOID=EA1C4C23;SOID=F301CE71;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
+					<element geometry="SX=63;SY=0;EX=0;EY=35;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1592:-765$;" subject="EAID_A0FABF7A_1814_4dd4_BD97_28BD0C9F2F49" style="Mode=3;EOID=EA1C4C23;SOID=F301CE71;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="SX=-139;SY=0;EX=0;EY=-8;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1336:-1664$;" subject="EAID_8FF88923_D9FB_4937_B866_FABECBC1DB55" style="Mode=3;EOID=CC926770;SOID=3483CF6A;Color=-1;LWidth=0;TREE=OS;Hidden=1;"/>
-					<element geometry="SX=-95;SY=0;EX=23;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1408:-820$;" subject="EAID_9EA3B8C3_695C_4b42_8481_D40EEC904171" style="Mode=3;EOID=EA1C4C23;SOID=F301CE71;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=940;SCTR.TOP=-468;SCTR.RIGHT=971;SCTR.BOTTOM=-429;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=124:OY=27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=952:-468$971:-468$971:-429$952:-429$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=15959C54;SOID=15959C54;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=30;EX=0;EY=45;EDGE=2;SCTR.LEFT=1551;SCTR.TOP=-487;SCTR.RIGHT=1582;SCTR.BOTTOM=-472;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1567:-487$1582:-487$1582:-472$1567:-472$;" subject="EAID_AF2B738F_531D_4495_9397_CE5771200854" style="Mode=3;EOID=B82062F1;SOID=B82062F1;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=30;EX=0;EY=45;EDGE=2;SCTR.LEFT=1551;SCTR.TOP=-487;SCTR.RIGHT=1582;SCTR.BOTTOM=-472;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1567:-487$1582:-487$1582:-472$1567:-472$;" subject="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991" style="Mode=3;EOID=B82062F1;SOID=B82062F1;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=30;EX=0;EY=45;EDGE=2;SCTR.LEFT=1551;SCTR.TOP=-487;SCTR.RIGHT=1582;SCTR.BOTTOM=-472;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1567:-487$1582:-487$1582:-472$1567:-472$;" subject="EAID_574DB5D8_4929_4670_9014_608B3C5534ED" style="Mode=3;EOID=B82062F1;SOID=B82062F1;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
@@ -7954,7 +8480,7 @@
 					<element geometry="SX=0;SY=-10;EX=82;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=112:CY=14:OX=4:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B9C9C412_36FA_46d5_AA00_34CA1CC60CA2" style="Mode=3;EOID=EA1C4C23;SOID=8FEE6E8B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-8;SY=0;EX=0;EY=-6;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=95:CY=14:OX=5:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1742:-523$;" subject="EAID_0692BD51_5113_4e40_A80A_3CDDD84D3629" style="Mode=3;EOID=B82062F1;SOID=8FEE6E8B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=-16;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=154:CY=14:OX=79:OY=-25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1910:-836$1910:-189$848:-189$;" subject="EAID_15B1CFC6_0B95_4c94_B742_4DC2F5EAF55E" style="Mode=3;EOID=E3CC8F4E;SOID=F301CE71;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=940;SCTR.TOP=-468;SCTR.RIGHT=971;SCTR.BOTTOM=-429;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=124:OY=27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=952:-468$971:-468$971:-429$952:-429$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=15959C54;SOID=15959C54;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=12;EX=0;EY=-1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=144:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1878:-808$1878:-247$;" subject="EAID_4F4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38" style="Mode=3;EOID=8BC8ABCD;SOID=F301CE71;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=106;SY=0;EX=0;EY=35;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1581:-684$;" subject="EAID_F475E438_48A3_41f5_A736_268C91FF8AF2" style="Mode=3;EOID=EA1C4C23;SOID=3483CF6A;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 				</elements>
 			</diagram>
diff --git a/implementation/ePO_core/model2owl-config/config-parameters.xsl b/implementation/ePO_core/model2owl-config/config-parameters.xsl
index f7357d1a..fa8c550f 100644
--- a/implementation/ePO_core/model2owl-config/config-parameters.xsl
+++ b/implementation/ePO_core/model2owl-config/config-parameters.xsl
@@ -122,11 +122,11 @@
     <!--    owl:incompatibleWith -->
     <xsl:variable name="incompatibleWith" select="'3.1.0'"/>
     <!--    owl:versionInfo -->
-    <xsl:variable name="versionInfo" select="'4.1.0'"/>
+    <xsl:variable name="versionInfo" select="'4.2.0'"/>
     <!--    bibo:status-->
     <xsl:variable name="ontologyStatus" select="'Semantic Specification Release'"/>
     <!--    owl:priorVersion -->
-    <xsl:variable name="priorVersion" select="'4.0.2'"/>
+    <xsl:variable name="priorVersion" select="'4.1.0'"/>
     <!--    vann:preferredNamespaceUri -->
     <xsl:variable name="preferredNamespaceUri" select="'http://data.europa.eu/a4g/ontology#'"/>
     <!--    vann:preferredNamespacePrefix -->
diff --git a/implementation/ePO_core/model2owl-config/namespaces.xml b/implementation/ePO_core/model2owl-config/namespaces.xml
index 78137353..10d4c769 100644
--- a/implementation/ePO_core/model2owl-config/namespaces.xml
+++ b/implementation/ePO_core/model2owl-config/namespaces.xml
@@ -13,14 +13,15 @@
     <prefix name="org" value="http://www.w3.org/ns/org#" importURI="http://www.w3.org/ns/org#"/>
     <prefix name="skos" value="http://www.w3.org/2004/02/skos/core#" importURI="http://www.w3.org/2004/02/skos/core"/>
 
-    <prefix name="epo" value="http://data.europa.eu/a4g/ontology#" importURI="http://data.europa.eu/a4g/ontology#core"/>
+    <prefix name="epo" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-cat" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-con" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-ord" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-not" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-ful" value="http://data.europa.eu/a4g/ontology#"/>
-    <prefix name="epo-acc" value="http://data.europa.eu/a4g/ontology#" importURI="http://data.europa.eu/a4g/ontology#acc"/>
+    <prefix name="epo-acc" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-sub" value="http://data.europa.eu/a4g/ontology#"/>
+    <prefix name="epo-inv" value="http://data.europa.eu/a4g/ontology#"/>
 
     <prefix name="nuts" value="http://data.europa.eu/nuts/"/>
     <prefix name="espd" value="https://github.com/ESPD/ESPD-EDM/"/>
diff --git a/implementation/ePO_core/xmi_conceptual_model/ePO_core.xml b/implementation/ePO_core/xmi_conceptual_model/ePO_core.xml
index 4b0e7c0c..2ed5b876 100644
--- a/implementation/ePO_core/xmi_conceptual_model/ePO_core.xml
+++ b/implementation/ePO_core/xmi_conceptual_model/ePO_core.xml
@@ -4,47 +4,47 @@
 	<uml:Model xmi:type="uml:Model" name="EA_Model">
 		<packagedElement xmi:type="uml:Package" xmi:id="EAPK_DB0C4677_88DC_4767_8DE5_76387A40E5AE" name="ePO">
 			<packagedElement xmi:type="uml:Package" xmi:id="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" name="eProcurementOntology">
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_03490E2B_19F2_47c3_BE70_0ED3FC280AF1"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_03EE3ECF_9EFF_4bf9_A068_667A0CDFBA55"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_155C7FA7_6962_4810_AED6_D94302F09660"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_20C55572_E53F_4e04_A828_75F42C4318A2"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_24A53112_91DE_40c0_B978_81AE2B81BF17"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_24F90E61_753D_4cf6_8358_F904A686244F"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_28150437_F427_4fd1_A8F1_E76DB6160274"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_2F3555E6_B9A6_4208_9A19_747532DBC93F"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_34185A69_499F_47f1_8C0E_32D2FDF93E0A"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_40B3A0DE_5AC9_467f_A6C8_9365E51D44B5"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_46C02EA3_5EA6_48ea_9F81_DB71EAB73C34" name="monetary value - completion"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_4C442DBD_D8E5_4d12_A2A1_A7DEA1E5A1B0"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_5774D0B1_FD6B_4941_9166_7C66D155CDF2"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_68D5E5EA_FC7A_4339_81EA_0B04F7E45A43" name="role relations"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_6D0F1BE0_EAAB_45e5_A5E4_27CEF50C4AEE"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_8A4B2A45_E204_4d18_923B_C062EFED7F92"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_954E4827_D178_4ebc_9EE2_A6F61F870DB6"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_9AC5B7BC_A46F_4781_BEC6_8F4C43A57375"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_9E4FA39A_DB0C_4c05_BA06_515432E59702"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_A07ACD80_0370_46e1_9700_9AB5F7313EA7"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_A3FE9B4C_382E_40dc_958E_D9BF99277B20" name="agent relations"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_B4C14031_6888_4fe3_A7BA_FCC3A6DFD2D4"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_B4D0C52E_CCFA_47ce_BC07_A09D9044B69E"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_BC642D11_1E40_47fb_B461_D8E61394AC5F"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_BF31E977_E54E_4706_9C28_3C22B15A8113"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_C0FA4596_11C5_4b97_AB06_08AA082CD52B"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_C8769750_6B24_4bcb_A1CC_44703211E656"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_D4B88387_1DF7_47e8_A57F_3E11F136E2A8"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_D6C95713_EB11_4af7_8A46_9B20895C7AD2"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_D964D718_09AD_453d_9261_B680435DC8F5"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_DA25DD8C_13A3_468b_9508_6BD01DF20BAF"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_DD64E73D_237E_4f7a_9F41_C132E65F5A8C"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_DE4D587C_087C_40fa_B63D_56DEA2854500"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_DF46765F_128C_4cd8_8E8A_A6EC221BAB4F" name="technique"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_EABD8F02_7B1E_48f0_A20E_C4A2122FB1CD"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_EED92360_39E2_48e3_93F3_A9FAE5CE18B1"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_F889D07C_8647_44f2_9C6E_449B3E20BCF2" name="procurement object relations"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_F990707E_C758_4479_B2F5_BD41CC5DDBC9"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_FBCD0D5C_5298_43ea_8182_0CD2C2717FB5"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_FBF5331A_BB9B_4776_8349_0AFFD331805A"/>
 				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" name="diagrams">
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_03490E2B_19F2_47c3_BE70_0ED3FC280AF1"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_03EE3ECF_9EFF_4bf9_A068_667A0CDFBA55"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_155C7FA7_6962_4810_AED6_D94302F09660"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_20C55572_E53F_4e04_A828_75F42C4318A2"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_24A53112_91DE_40c0_B978_81AE2B81BF17"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_24F90E61_753D_4cf6_8358_F904A686244F"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_28150437_F427_4fd1_A8F1_E76DB6160274"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_2F3555E6_B9A6_4208_9A19_747532DBC93F"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_34185A69_499F_47f1_8C0E_32D2FDF93E0A"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_40B3A0DE_5AC9_467f_A6C8_9365E51D44B5"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_46C02EA3_5EA6_48ea_9F81_DB71EAB73C34" name="monetary value - completion"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_4C442DBD_D8E5_4d12_A2A1_A7DEA1E5A1B0"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_5774D0B1_FD6B_4941_9166_7C66D155CDF2"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_68D5E5EA_FC7A_4339_81EA_0B04F7E45A43" name="role relations"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_6D0F1BE0_EAAB_45e5_A5E4_27CEF50C4AEE"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_8A4B2A45_E204_4d18_923B_C062EFED7F92"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_954E4827_D178_4ebc_9EE2_A6F61F870DB6"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_9AC5B7BC_A46F_4781_BEC6_8F4C43A57375"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_9E4FA39A_DB0C_4c05_BA06_515432E59702"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_A07ACD80_0370_46e1_9700_9AB5F7313EA7"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_A3FE9B4C_382E_40dc_958E_D9BF99277B20" name="agent relations"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_B4C14031_6888_4fe3_A7BA_FCC3A6DFD2D4"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_B4D0C52E_CCFA_47ce_BC07_A09D9044B69E"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_BC642D11_1E40_47fb_B461_D8E61394AC5F"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_BF31E977_E54E_4706_9C28_3C22B15A8113"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_C0FA4596_11C5_4b97_AB06_08AA082CD52B"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_C8769750_6B24_4bcb_A1CC_44703211E656"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_D4B88387_1DF7_47e8_A57F_3E11F136E2A8"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_D6C95713_EB11_4af7_8A46_9B20895C7AD2"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_D964D718_09AD_453d_9261_B680435DC8F5"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_DA25DD8C_13A3_468b_9508_6BD01DF20BAF"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_DD64E73D_237E_4f7a_9F41_C132E65F5A8C"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_DE4D587C_087C_40fa_B63D_56DEA2854500"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_DF46765F_128C_4cd8_8E8A_A6EC221BAB4F" name="technique"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_EABD8F02_7B1E_48f0_A20E_C4A2122FB1CD"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_EED92360_39E2_48e3_93F3_A9FAE5CE18B1"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_F889D07C_8647_44f2_9C6E_449B3E20BCF2" name="procurement object relations"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_F990707E_C758_4479_B2F5_BD41CC5DDBC9"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_FBCD0D5C_5298_43ea_8182_0CD2C2717FB5"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_FBF5331A_BB9B_4776_8349_0AFFD331805A"/>
 					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_B734BB7B_9769_4212_99E0_41BB15EB13D0" name="monetary value">
 						<ownedComment xmi:type="uml:Comment" xmi:id="EAID_C451EC7C_9778_40f3_B90C_6DEFC3C6D8BB" body="Used in F18 and other standard forms.">
 							<annotatedElement xmi:idref="EAID_547A511C_F377_4405_82EA_14ABA20458B6"/>
@@ -89,18 +89,458 @@
 							<annotatedElement xmi:idref="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC"/>
 						</ownedComment>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_715C5E37_AD21_40eb_91D0_A082D4C6829E" name="empirical types">
+						<ownedComment xmi:type="uml:Comment" xmi:id="EAID_AFD1E4C5_9D57_4c0a_B916_E199FA70A0DC" body="it cannot be a specialization of the Duration. proposal to be deprecated in 5.0.0; needs further investigation.">
+							<annotatedElement xmi:idref="EAID_7D0E71D7_D624_4144_8134_2500CE9AB392"/>
+						</ownedComment>
+					</packagedElement>
 				</packagedElement>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" name="classes">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_B583795A_4207_48be_8D99_A257C58911C6" name="classes">
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" name="adms:Identifier">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_DD21A105_2536_4ae0_A606_3868B9A27714" name="skos:notation">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000001_2536_4ae0_A606_3868B9A27714" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000002_2536_4ae0_A606_3868B9A27714" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_EC13F7E5_C9A2_45ce_A2E4_3AFC67778C5B" name="adms:schemaAgency">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000003_C9A2_45ce_A2E4_3AFC67778C5B" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000004_C9A2_45ce_A2E4_3AFC67778C5B" value="*"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_291D3917_532F_4950_B4BF_22835EC1F3E6" name="epo:hasScheme">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000005_532F_4950_B4BF_22835EC1F3E6" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000006_532F_4950_B4BF_22835EC1F3E6" value="*"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_34EA5DFD_574A_4a69_9F19_59FCED4CCEFC" name="epo:hasSchemeVersion">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000007_574A_4a69_9F19_59FCED4CCEFC" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000008_574A_4a69_9F19_59FCED4CCEFC" value="*"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_016185BE_FF6A_41c6_A77B_474BD1F071E0">
+						<memberEnd xmi:idref="EAID_dst6185BE_FF6A_41c6_A77B_474BD1F071E0"/>
+						<memberEnd xmi:idref="EAID_src6185BE_FF6A_41c6_A77B_474BD1F071E0"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6185BE_FF6A_41c6_A77B_474BD1F071E0" association="EAID_016185BE_FF6A_41c6_A77B_474BD1F071E0">
+							<type xmi:idref="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6">
+						<memberEnd xmi:idref="EAID_dst57F338_A3A5_457d_AE66_986280A7B2F6"/>
+						<memberEnd xmi:idref="EAID_src57F338_A3A5_457d_AE66_986280A7B2F6"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src57F338_A3A5_457d_AE66_986280A7B2F6" association="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6">
+							<type xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0BDB5E69_CB31_4e1e_B095_115C894CFE58">
+						<memberEnd xmi:idref="EAID_dstDB5E69_CB31_4e1e_B095_115C894CFE58"/>
+						<memberEnd xmi:idref="EAID_srcDB5E69_CB31_4e1e_B095_115C894CFE58"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDB5E69_CB31_4e1e_B095_115C894CFE58" association="EAID_0BDB5E69_CB31_4e1e_B095_115C894CFE58">
+							<type xmi:idref="EAID_A8D775E4_EEB9_4502_B8A1_C1DD5D555864"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_11702782_CA5B_4035_84B7_1E5035469B29">
+						<memberEnd xmi:idref="EAID_dst702782_CA5B_4035_84B7_1E5035469B29"/>
+						<memberEnd xmi:idref="EAID_src702782_CA5B_4035_84B7_1E5035469B29"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src702782_CA5B_4035_84B7_1E5035469B29" association="EAID_11702782_CA5B_4035_84B7_1E5035469B29">
+							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_12549564_CE07_4367_8550_00BC16191558">
+						<memberEnd xmi:idref="EAID_dst549564_CE07_4367_8550_00BC16191558"/>
+						<memberEnd xmi:idref="EAID_src549564_CE07_4367_8550_00BC16191558"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src549564_CE07_4367_8550_00BC16191558" association="EAID_12549564_CE07_4367_8550_00BC16191558">
+							<type xmi:idref="EAID_025C0172_297F_4458_9268_2B10478B6736"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_15464872_BFB6_40bb_84F1_8A3969FE662E">
+						<memberEnd xmi:idref="EAID_dst464872_BFB6_40bb_84F1_8A3969FE662E"/>
+						<memberEnd xmi:idref="EAID_src464872_BFB6_40bb_84F1_8A3969FE662E"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src464872_BFB6_40bb_84F1_8A3969FE662E" association="EAID_15464872_BFB6_40bb_84F1_8A3969FE662E">
+							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1BEBAC59_19C6_4908_B93C_EED975A6974F">
+						<memberEnd xmi:idref="EAID_dstEBAC59_19C6_4908_B93C_EED975A6974F"/>
+						<memberEnd xmi:idref="EAID_srcEBAC59_19C6_4908_B93C_EED975A6974F"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcEBAC59_19C6_4908_B93C_EED975A6974F" association="EAID_1BEBAC59_19C6_4908_B93C_EED975A6974F">
+							<type xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_20A26F01_4C0B_48e1_A688_6DFFDE0D20A5">
+						<memberEnd xmi:idref="EAID_dstA26F01_4C0B_48e1_A688_6DFFDE0D20A5"/>
+						<memberEnd xmi:idref="EAID_srcA26F01_4C0B_48e1_A688_6DFFDE0D20A5"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA26F01_4C0B_48e1_A688_6DFFDE0D20A5" association="EAID_20A26F01_4C0B_48e1_A688_6DFFDE0D20A5">
+							<type xmi:idref="EAID_905EBE80_E994_48ec_B0A6_4F3CEC5EEDC0"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_23CC2B92_731F_4428_B333_8582A36D1244">
+						<memberEnd xmi:idref="EAID_dstCC2B92_731F_4428_B333_8582A36D1244"/>
+						<memberEnd xmi:idref="EAID_srcCC2B92_731F_4428_B333_8582A36D1244"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCC2B92_731F_4428_B333_8582A36D1244" association="EAID_23CC2B92_731F_4428_B333_8582A36D1244">
+							<type xmi:idref="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_27A758A5_D658_4005_919F_992C4207B974">
+						<memberEnd xmi:idref="EAID_dstA758A5_D658_4005_919F_992C4207B974"/>
+						<memberEnd xmi:idref="EAID_srcA758A5_D658_4005_919F_992C4207B974"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA758A5_D658_4005_919F_992C4207B974" association="EAID_27A758A5_D658_4005_919F_992C4207B974">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_319F106B_6066_4ba7_B084_12D7110FE9E0">
+						<memberEnd xmi:idref="EAID_dst9F106B_6066_4ba7_B084_12D7110FE9E0"/>
+						<memberEnd xmi:idref="EAID_src9F106B_6066_4ba7_B084_12D7110FE9E0"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9F106B_6066_4ba7_B084_12D7110FE9E0" association="EAID_319F106B_6066_4ba7_B084_12D7110FE9E0">
+							<type xmi:idref="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_31D80540_9E04_44d6_B0B4_339ED74111CC">
+						<memberEnd xmi:idref="EAID_dstD80540_9E04_44d6_B0B4_339ED74111CC"/>
+						<memberEnd xmi:idref="EAID_srcD80540_9E04_44d6_B0B4_339ED74111CC"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD80540_9E04_44d6_B0B4_339ED74111CC" association="EAID_31D80540_9E04_44d6_B0B4_339ED74111CC">
+							<type xmi:idref="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_36284C1D_C098_4082_BE39_99AFCAAF2C1F">
+						<memberEnd xmi:idref="EAID_dst284C1D_C098_4082_BE39_99AFCAAF2C1F"/>
+						<memberEnd xmi:idref="EAID_src284C1D_C098_4082_BE39_99AFCAAF2C1F"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src284C1D_C098_4082_BE39_99AFCAAF2C1F" association="EAID_36284C1D_C098_4082_BE39_99AFCAAF2C1F">
+							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3AA2C83C_532C_460c_99CE_63F041A42F06">
+						<memberEnd xmi:idref="EAID_dstA2C83C_532C_460c_99CE_63F041A42F06"/>
+						<memberEnd xmi:idref="EAID_srcA2C83C_532C_460c_99CE_63F041A42F06"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA2C83C_532C_460c_99CE_63F041A42F06" association="EAID_3AA2C83C_532C_460c_99CE_63F041A42F06">
+							<type xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_4A4FE890_B03B_430a_A719_E1852BEECBEE">
+						<memberEnd xmi:idref="EAID_dst4FE890_B03B_430a_A719_E1852BEECBEE"/>
+						<memberEnd xmi:idref="EAID_src4FE890_B03B_430a_A719_E1852BEECBEE"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src4FE890_B03B_430a_A719_E1852BEECBEE" association="EAID_4A4FE890_B03B_430a_A719_E1852BEECBEE">
+							<type xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_4DC15699_2F72_40f6_B574_D054957B5730">
+						<memberEnd xmi:idref="EAID_dstC15699_2F72_40f6_B574_D054957B5730"/>
+						<memberEnd xmi:idref="EAID_srcC15699_2F72_40f6_B574_D054957B5730"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC15699_2F72_40f6_B574_D054957B5730" association="EAID_4DC15699_2F72_40f6_B574_D054957B5730">
+							<type xmi:idref="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_51A6863A_1079_4af7_AE53_091E3E0514AF">
+						<memberEnd xmi:idref="EAID_dstA6863A_1079_4af7_AE53_091E3E0514AF"/>
+						<memberEnd xmi:idref="EAID_srcA6863A_1079_4af7_AE53_091E3E0514AF"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA6863A_1079_4af7_AE53_091E3E0514AF" association="EAID_51A6863A_1079_4af7_AE53_091E3E0514AF">
+							<type xmi:idref="EAID_C215EC75_82FD_45d3_832A_B3989A897692"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_527F57B4_08F1_4183_A0A9_C1CCAB84A53A">
+						<memberEnd xmi:idref="EAID_dst7F57B4_08F1_4183_A0A9_C1CCAB84A53A"/>
+						<memberEnd xmi:idref="EAID_src7F57B4_08F1_4183_A0A9_C1CCAB84A53A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src7F57B4_08F1_4183_A0A9_C1CCAB84A53A" association="EAID_527F57B4_08F1_4183_A0A9_C1CCAB84A53A">
+							<type xmi:idref="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_52CB7369_B0C2_4acc_A513_76150076F808">
+						<memberEnd xmi:idref="EAID_dstCB7369_B0C2_4acc_A513_76150076F808"/>
+						<memberEnd xmi:idref="EAID_srcCB7369_B0C2_4acc_A513_76150076F808"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCB7369_B0C2_4acc_A513_76150076F808" association="EAID_52CB7369_B0C2_4acc_A513_76150076F808">
+							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_55771AD3_C775_4324_AEBA_EA277D05F7E8">
+						<memberEnd xmi:idref="EAID_dst771AD3_C775_4324_AEBA_EA277D05F7E8"/>
+						<memberEnd xmi:idref="EAID_src771AD3_C775_4324_AEBA_EA277D05F7E8"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src771AD3_C775_4324_AEBA_EA277D05F7E8" association="EAID_55771AD3_C775_4324_AEBA_EA277D05F7E8">
+							<type xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_5A707B7A_A266_46a0_9CA9_EBF5B2C9D483">
+						<memberEnd xmi:idref="EAID_dst707B7A_A266_46a0_9CA9_EBF5B2C9D483"/>
+						<memberEnd xmi:idref="EAID_src707B7A_A266_46a0_9CA9_EBF5B2C9D483"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src707B7A_A266_46a0_9CA9_EBF5B2C9D483" association="EAID_5A707B7A_A266_46a0_9CA9_EBF5B2C9D483">
+							<type xmi:idref="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_605B2EA3_201D_47cb_BCF7_9C5A5DD40C4B">
+						<memberEnd xmi:idref="EAID_dst5B2EA3_201D_47cb_BCF7_9C5A5DD40C4B"/>
+						<memberEnd xmi:idref="EAID_src5B2EA3_201D_47cb_BCF7_9C5A5DD40C4B"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src5B2EA3_201D_47cb_BCF7_9C5A5DD40C4B" association="EAID_605B2EA3_201D_47cb_BCF7_9C5A5DD40C4B">
+							<type xmi:idref="EAID_3E3C6304_E823_43a1_8914_2046342E8F96"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_608CC8C6_3A48_4541_8467_9DDA71E8D534">
+						<memberEnd xmi:idref="EAID_dst8CC8C6_3A48_4541_8467_9DDA71E8D534"/>
+						<memberEnd xmi:idref="EAID_src8CC8C6_3A48_4541_8467_9DDA71E8D534"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8CC8C6_3A48_4541_8467_9DDA71E8D534" association="EAID_608CC8C6_3A48_4541_8467_9DDA71E8D534">
+							<type xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_63091EE9_B21F_4dae_99AF_66217D43BDA9">
+						<memberEnd xmi:idref="EAID_dst091EE9_B21F_4dae_99AF_66217D43BDA9"/>
+						<memberEnd xmi:idref="EAID_src091EE9_B21F_4dae_99AF_66217D43BDA9"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src091EE9_B21F_4dae_99AF_66217D43BDA9" association="EAID_63091EE9_B21F_4dae_99AF_66217D43BDA9">
+							<type xmi:idref="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_67F11C76_D909_4610_841A_BB8035525574">
+						<memberEnd xmi:idref="EAID_dstF11C76_D909_4610_841A_BB8035525574"/>
+						<memberEnd xmi:idref="EAID_srcF11C76_D909_4610_841A_BB8035525574"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF11C76_D909_4610_841A_BB8035525574" association="EAID_67F11C76_D909_4610_841A_BB8035525574">
+							<type xmi:idref="EAID_93ACA540_2668_42d3_BE40_C921C05C776E"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6F3635F3_387D_467a_95E2_ACDA293AE181">
+						<memberEnd xmi:idref="EAID_dst3635F3_387D_467a_95E2_ACDA293AE181"/>
+						<memberEnd xmi:idref="EAID_src3635F3_387D_467a_95E2_ACDA293AE181"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3635F3_387D_467a_95E2_ACDA293AE181" association="EAID_6F3635F3_387D_467a_95E2_ACDA293AE181">
+							<type xmi:idref="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_774EE008_B895_41f1_B319_1174DD83D564">
+						<memberEnd xmi:idref="EAID_dst4EE008_B895_41f1_B319_1174DD83D564"/>
+						<memberEnd xmi:idref="EAID_src4EE008_B895_41f1_B319_1174DD83D564"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src4EE008_B895_41f1_B319_1174DD83D564" association="EAID_774EE008_B895_41f1_B319_1174DD83D564">
+							<type xmi:idref="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_77553B39_DB4D_4388_9D1B_8C8E24EB522C">
+						<memberEnd xmi:idref="EAID_dst553B39_DB4D_4388_9D1B_8C8E24EB522C"/>
+						<memberEnd xmi:idref="EAID_src553B39_DB4D_4388_9D1B_8C8E24EB522C"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src553B39_DB4D_4388_9D1B_8C8E24EB522C" association="EAID_77553B39_DB4D_4388_9D1B_8C8E24EB522C">
+							<type xmi:idref="EAID_9E80131F_7D1C_452d_98B2_308983569ECB"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7DD90B0C_4D89_4d64_AC1D_F32A308572D4">
+						<memberEnd xmi:idref="EAID_dstD90B0C_4D89_4d64_AC1D_F32A308572D4"/>
+						<memberEnd xmi:idref="EAID_srcD90B0C_4D89_4d64_AC1D_F32A308572D4"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD90B0C_4D89_4d64_AC1D_F32A308572D4" association="EAID_7DD90B0C_4D89_4d64_AC1D_F32A308572D4">
+							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7F56C70D_D0B9_4ad4_9CB4_9A6821D5E3E1">
+						<memberEnd xmi:idref="EAID_dst56C70D_D0B9_4ad4_9CB4_9A6821D5E3E1"/>
+						<memberEnd xmi:idref="EAID_src56C70D_D0B9_4ad4_9CB4_9A6821D5E3E1"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src56C70D_D0B9_4ad4_9CB4_9A6821D5E3E1" association="EAID_7F56C70D_D0B9_4ad4_9CB4_9A6821D5E3E1">
+							<type xmi:idref="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA">
+						<memberEnd xmi:idref="EAID_dst6B650B_17CC_499e_A49B_8791C8D7CBEA"/>
+						<memberEnd xmi:idref="EAID_src6B650B_17CC_499e_A49B_8791C8D7CBEA"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6B650B_17CC_499e_A49B_8791C8D7CBEA" association="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA">
+							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_84490705_94B3_445f_ACA6_A903591C3651">
+						<memberEnd xmi:idref="EAID_dst490705_94B3_445f_ACA6_A903591C3651"/>
+						<memberEnd xmi:idref="EAID_src490705_94B3_445f_ACA6_A903591C3651"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src490705_94B3_445f_ACA6_A903591C3651" association="EAID_84490705_94B3_445f_ACA6_A903591C3651">
+							<type xmi:idref="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_95FB9493_C207_456a_A0EF_B68899832EE8">
+						<memberEnd xmi:idref="EAID_dstFB9493_C207_456a_A0EF_B68899832EE8"/>
+						<memberEnd xmi:idref="EAID_srcFB9493_C207_456a_A0EF_B68899832EE8"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFB9493_C207_456a_A0EF_B68899832EE8" association="EAID_95FB9493_C207_456a_A0EF_B68899832EE8">
+							<type xmi:idref="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_96C5B633_908F_48e5_82F6_C10FBDBF1DE3">
+						<memberEnd xmi:idref="EAID_dstC5B633_908F_48e5_82F6_C10FBDBF1DE3"/>
+						<memberEnd xmi:idref="EAID_srcC5B633_908F_48e5_82F6_C10FBDBF1DE3"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC5B633_908F_48e5_82F6_C10FBDBF1DE3" association="EAID_96C5B633_908F_48e5_82F6_C10FBDBF1DE3">
+							<type xmi:idref="EAID_3C8EEF69_1346_4dbe_B505_7C2D920B97B9"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9843F34E_C9D3_471a_9622_B002A7A25EA7">
+						<memberEnd xmi:idref="EAID_dst43F34E_C9D3_471a_9622_B002A7A25EA7"/>
+						<memberEnd xmi:idref="EAID_src43F34E_C9D3_471a_9622_B002A7A25EA7"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src43F34E_C9D3_471a_9622_B002A7A25EA7" association="EAID_9843F34E_C9D3_471a_9622_B002A7A25EA7">
+							<type xmi:idref="EAID_8374872A_B283_4698_9E00_72FD255BAFCB"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9F290187_06CC_4af8_83C9_F475091E0C14">
+						<memberEnd xmi:idref="EAID_dst290187_06CC_4af8_83C9_F475091E0C14"/>
+						<memberEnd xmi:idref="EAID_src290187_06CC_4af8_83C9_F475091E0C14"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src290187_06CC_4af8_83C9_F475091E0C14" association="EAID_9F290187_06CC_4af8_83C9_F475091E0C14">
+							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A489FF3B_9E63_4b65_9418_542A437B67E4">
+						<memberEnd xmi:idref="EAID_dst89FF3B_9E63_4b65_9418_542A437B67E4"/>
+						<memberEnd xmi:idref="EAID_src89FF3B_9E63_4b65_9418_542A437B67E4"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src89FF3B_9E63_4b65_9418_542A437B67E4" association="EAID_A489FF3B_9E63_4b65_9418_542A437B67E4">
+							<type xmi:idref="EAID_9E80131F_7D1C_452d_98B2_308983569ECB"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_AA0E8762_9556_4ad9_8F4A_5A66B59C8A95">
+						<memberEnd xmi:idref="EAID_dst0E8762_9556_4ad9_8F4A_5A66B59C8A95"/>
+						<memberEnd xmi:idref="EAID_src0E8762_9556_4ad9_8F4A_5A66B59C8A95"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0E8762_9556_4ad9_8F4A_5A66B59C8A95" association="EAID_AA0E8762_9556_4ad9_8F4A_5A66B59C8A95">
+							<type xmi:idref="EAID_3124967E_D23F_4c3b_9B72_E02C23A08D68"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_ABF2C561_D263_44c6_A9E0_140763A1B061">
+						<memberEnd xmi:idref="EAID_dstF2C561_D263_44c6_A9E0_140763A1B061"/>
+						<memberEnd xmi:idref="EAID_srcF2C561_D263_44c6_A9E0_140763A1B061"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF2C561_D263_44c6_A9E0_140763A1B061" association="EAID_ABF2C561_D263_44c6_A9E0_140763A1B061">
+							<type xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_ACCA405B_7FF7_41ad_9ACB_A1015C643C97">
+						<memberEnd xmi:idref="EAID_dstCA405B_7FF7_41ad_9ACB_A1015C643C97"/>
+						<memberEnd xmi:idref="EAID_srcCA405B_7FF7_41ad_9ACB_A1015C643C97"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCA405B_7FF7_41ad_9ACB_A1015C643C97" association="EAID_ACCA405B_7FF7_41ad_9ACB_A1015C643C97">
+							<type xmi:idref="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_BBC722BA_3236_4fcb_B51A_14A66F3D627C">
+						<memberEnd xmi:idref="EAID_dstC722BA_3236_4fcb_B51A_14A66F3D627C"/>
+						<memberEnd xmi:idref="EAID_srcC722BA_3236_4fcb_B51A_14A66F3D627C"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC722BA_3236_4fcb_B51A_14A66F3D627C" association="EAID_BBC722BA_3236_4fcb_B51A_14A66F3D627C">
+							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C6F7D14A_11BF_430e_ABED_4C9AC22FFF2A">
+						<memberEnd xmi:idref="EAID_dstF7D14A_11BF_430e_ABED_4C9AC22FFF2A"/>
+						<memberEnd xmi:idref="EAID_srcF7D14A_11BF_430e_ABED_4C9AC22FFF2A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF7D14A_11BF_430e_ABED_4C9AC22FFF2A" association="EAID_C6F7D14A_11BF_430e_ABED_4C9AC22FFF2A">
+							<type xmi:idref="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C7C433B7_9297_4921_9069_80DF68AD408A">
+						<memberEnd xmi:idref="EAID_dstC433B7_9297_4921_9069_80DF68AD408A"/>
+						<memberEnd xmi:idref="EAID_srcC433B7_9297_4921_9069_80DF68AD408A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC433B7_9297_4921_9069_80DF68AD408A" association="EAID_C7C433B7_9297_4921_9069_80DF68AD408A">
+							<type xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_CEDC5261_E7FF_4ca6_8255_6B2812DC1B0C">
+						<memberEnd xmi:idref="EAID_dstDC5261_E7FF_4ca6_8255_6B2812DC1B0C"/>
+						<memberEnd xmi:idref="EAID_srcDC5261_E7FF_4ca6_8255_6B2812DC1B0C"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDC5261_E7FF_4ca6_8255_6B2812DC1B0C" association="EAID_CEDC5261_E7FF_4ca6_8255_6B2812DC1B0C">
+							<type xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044">
+						<memberEnd xmi:idref="EAID_dst87FBF1_89C8_4ed0_9551_9C0C13B80044"/>
+						<memberEnd xmi:idref="EAID_src87FBF1_89C8_4ed0_9551_9C0C13B80044"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src87FBF1_89C8_4ed0_9551_9C0C13B80044" association="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044">
+							<type xmi:idref="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D42B1380_78A6_4579_B0FD_C3609EBD8AFD">
+						<memberEnd xmi:idref="EAID_dst2B1380_78A6_4579_B0FD_C3609EBD8AFD"/>
+						<memberEnd xmi:idref="EAID_src2B1380_78A6_4579_B0FD_C3609EBD8AFD"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2B1380_78A6_4579_B0FD_C3609EBD8AFD" association="EAID_D42B1380_78A6_4579_B0FD_C3609EBD8AFD">
+							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D56DDC19_B837_4e3f_B996_A8D529DA32A2">
+						<memberEnd xmi:idref="EAID_dst6DDC19_B837_4e3f_B996_A8D529DA32A2"/>
+						<memberEnd xmi:idref="EAID_src6DDC19_B837_4e3f_B996_A8D529DA32A2"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6DDC19_B837_4e3f_B996_A8D529DA32A2" association="EAID_D56DDC19_B837_4e3f_B996_A8D529DA32A2">
+							<type xmi:idref="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D9C75333_AC70_477b_AA0D_15C3CB11CC0C">
+						<memberEnd xmi:idref="EAID_dstC75333_AC70_477b_AA0D_15C3CB11CC0C"/>
+						<memberEnd xmi:idref="EAID_srcC75333_AC70_477b_AA0D_15C3CB11CC0C"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC75333_AC70_477b_AA0D_15C3CB11CC0C" association="EAID_D9C75333_AC70_477b_AA0D_15C3CB11CC0C">
+							<type xmi:idref="EAID_86057FC2_7717_4160_8952_6A9F572F43B2"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_DA6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D">
+						<memberEnd xmi:idref="EAID_dst6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D"/>
+						<memberEnd xmi:idref="EAID_src6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D" association="EAID_DA6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D">
+							<type xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_E507D198_1A41_4b43_873A_F9E88411186D">
+						<memberEnd xmi:idref="EAID_dst07D198_1A41_4b43_873A_F9E88411186D"/>
+						<memberEnd xmi:idref="EAID_src07D198_1A41_4b43_873A_F9E88411186D"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src07D198_1A41_4b43_873A_F9E88411186D" association="EAID_E507D198_1A41_4b43_873A_F9E88411186D">
+							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_E6E5075B_3605_44e1_9693_42DB89B5FE8A">
+						<memberEnd xmi:idref="EAID_dstE5075B_3605_44e1_9693_42DB89B5FE8A"/>
+						<memberEnd xmi:idref="EAID_srcE5075B_3605_44e1_9693_42DB89B5FE8A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE5075B_3605_44e1_9693_42DB89B5FE8A" association="EAID_E6E5075B_3605_44e1_9693_42DB89B5FE8A">
+							<type xmi:idref="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB">
+						<memberEnd xmi:idref="EAID_dstABB55C_F52F_4373_8164_044CE03A05CB"/>
+						<memberEnd xmi:idref="EAID_srcABB55C_F52F_4373_8164_044CE03A05CB"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcABB55C_F52F_4373_8164_044CE03A05CB" association="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB">
+							<type xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_EBE8AC56_41A8_45f2_AE75_CB65D4939C94">
+						<memberEnd xmi:idref="EAID_dstE8AC56_41A8_45f2_AE75_CB65D4939C94"/>
+						<memberEnd xmi:idref="EAID_srcE8AC56_41A8_45f2_AE75_CB65D4939C94"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE8AC56_41A8_45f2_AE75_CB65D4939C94" association="EAID_EBE8AC56_41A8_45f2_AE75_CB65D4939C94">
+							<type xmi:idref="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_EC04B8A5_6281_4f14_8017_204CCE05A2CC">
+						<memberEnd xmi:idref="EAID_dst04B8A5_6281_4f14_8017_204CCE05A2CC"/>
+						<memberEnd xmi:idref="EAID_src04B8A5_6281_4f14_8017_204CCE05A2CC"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src04B8A5_6281_4f14_8017_204CCE05A2CC" association="EAID_EC04B8A5_6281_4f14_8017_204CCE05A2CC">
+							<type xmi:idref="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_ECEFDC69_19B4_47d7_A201_D8391B5C67DF">
+						<memberEnd xmi:idref="EAID_dstEFDC69_19B4_47d7_A201_D8391B5C67DF"/>
+						<memberEnd xmi:idref="EAID_srcEFDC69_19B4_47d7_A201_D8391B5C67DF"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcEFDC69_19B4_47d7_A201_D8391B5C67DF" association="EAID_ECEFDC69_19B4_47d7_A201_D8391B5C67DF">
+							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_ED25B2CF_BC4D_44e9_957C_60FF1C08941F">
+						<memberEnd xmi:idref="EAID_dst25B2CF_BC4D_44e9_957C_60FF1C08941F"/>
+						<memberEnd xmi:idref="EAID_src25B2CF_BC4D_44e9_957C_60FF1C08941F"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src25B2CF_BC4D_44e9_957C_60FF1C08941F" association="EAID_ED25B2CF_BC4D_44e9_957C_60FF1C08941F">
+							<type xmi:idref="EAID_495BBB92_468A_4f08_9330_A0C75730B97A"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F0951C5B_94E2_4a5f_BF21_25D103CB3656">
+						<memberEnd xmi:idref="EAID_dst951C5B_94E2_4a5f_BF21_25D103CB3656"/>
+						<memberEnd xmi:idref="EAID_src951C5B_94E2_4a5f_BF21_25D103CB3656"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src951C5B_94E2_4a5f_BF21_25D103CB3656" association="EAID_F0951C5B_94E2_4a5f_BF21_25D103CB3656">
+							<type xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F3CD32F8_8180_4939_A987_53BA66264912">
+						<memberEnd xmi:idref="EAID_dstCD32F8_8180_4939_A987_53BA66264912"/>
+						<memberEnd xmi:idref="EAID_srcCD32F8_8180_4939_A987_53BA66264912"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCD32F8_8180_4939_A987_53BA66264912" association="EAID_F3CD32F8_8180_4939_A987_53BA66264912">
+							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F9E4B0C6_6B39_4211_B8F3_83FC71C1725E">
+						<memberEnd xmi:idref="EAID_dstE4B0C6_6B39_4211_B8F3_83FC71C1725E"/>
+						<memberEnd xmi:idref="EAID_srcE4B0C6_6B39_4211_B8F3_83FC71C1725E"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE4B0C6_6B39_4211_B8F3_83FC71C1725E" association="EAID_F9E4B0C6_6B39_4211_B8F3_83FC71C1725E">
+							<type xmi:idref="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" name="cccev:Constraint">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_ED90E511_1F3D_4e84_9D31_63CAC92FD094" name="epo:hasThresholdValue">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000001_1F3D_4e84_9D31_63CAC92FD094" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000002_1F3D_4e84_9D31_63CAC92FD094" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000009_1F3D_4e84_9D31_63CAC92FD094" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000010_1F3D_4e84_9D31_63CAC92FD094" value="1"/>
 							<type xmi:idref="EAJava_xsd_decimal"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstCFCF08_3F48_4102_8A68_8655E9F9B47E" name="cccev:constrains" association="EAID_85CFCF08_3F48_4102_8A68_8655E9F9B47E">
 							<type xmi:idref="EAID_86057FC2_7717_4160_8952_6A9F572F43B2"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000003__3F48_4102_8A68_8655E9F9B47E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000004__3F48_4102_8A68_8655E9F9B47E" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000011__3F48_4102_8A68_8655E9F9B47E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000012__3F48_4102_8A68_8655E9F9B47E" value="*"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_FAC59FEE_3DE7_4de1_BCBE_35DFB0CE066A" general="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
 					</packagedElement>
@@ -128,18 +568,18 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D" name="cccev:Criterion">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_2E954AAA_4A41_46a9_80E7_74981020527C" name="cccev:bias">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000005_4A41_46a9_80E7_74981020527C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000006_4A41_46a9_80E7_74981020527C" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000013_4A41_46a9_80E7_74981020527C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000014_4A41_46a9_80E7_74981020527C" value="1"/>
 							<type xmi:idref="EAJava_xsd_decimal"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_676D6F18_AE33_4f71_A555_AC99CF3627D6" name="cccev:weight">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000007_AE33_4f71_A555_AC99CF3627D6" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000008_AE33_4f71_A555_AC99CF3627D6" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000015_AE33_4f71_A555_AC99CF3627D6" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000016_AE33_4f71_A555_AC99CF3627D6" value="1"/>
 							<type xmi:idref="EAJava_xsd_decimal"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_4111FA66_AACB_4b42_A23A_1AF9C06417B9" name="cccev:weightingConsiderationDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000009_AACB_4b42_A23A_1AF9C06417B9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000010_AACB_4b42_A23A_1AF9C06417B9" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000017_AACB_4b42_A23A_1AF9C06417B9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000018_AACB_4b42_A23A_1AF9C06417B9" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_C289FCF6_9241_4f06_BF53_F99082792332" general="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
@@ -147,44 +587,44 @@
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_D84D8FB5_6889_47af_B88A_A418F4281BF1" supplier="EAID_31165801_5B33_4e47_B39A_04F149020988" client="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D"/>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" name="cccev:Evidence">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_54479CB6_87F3_4910_BFF6_0EAAC1E6F403" name="epo:hasURL">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000011_87F3_4910_BFF6_0EAAC1E6F403" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000012_87F3_4910_BFF6_0EAAC1E6F403" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000019_87F3_4910_BFF6_0EAAC1E6F403" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000020_87F3_4910_BFF6_0EAAC1E6F403" value="1"/>
 							<type xmi:idref="EAJava_xsd_anyURI"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_FB42FD7E_60A8_41d1_8AD3_5E6A6C9DBB95" name="dct:description">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000013_60A8_41d1_8AD3_5E6A6C9DBB95" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000014_60A8_41d1_8AD3_5E6A6C9DBB95" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000021_60A8_41d1_8AD3_5E6A6C9DBB95" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000022_60A8_41d1_8AD3_5E6A6C9DBB95" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst64913C_FE85_48db_829F_004DFE769A97" name="epo:hasValidityPeriod" association="EAID_1864913C_FE85_48db_829F_004DFE769A97">
 							<type xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000015__FE85_48db_829F_004DFE769A97" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000016__FE85_48db_829F_004DFE769A97" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000023__FE85_48db_829F_004DFE769A97" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000024__FE85_48db_829F_004DFE769A97" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst204966_4BC2_452d_9B78_BA9B3F1E9FF6" name="cccev:supportsRequirement" association="EAID_6D204966_4BC2_452d_9B78_BA9B3F1E9FF6">
 							<type xmi:idref="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000017__4BC2_452d_9B78_BA9B3F1E9FF6" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000018__4BC2_452d_9B78_BA9B3F1E9FF6" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000025__4BC2_452d_9B78_BA9B3F1E9FF6" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000026__4BC2_452d_9B78_BA9B3F1E9FF6" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst6CE445_9D11_4ee4_8B59_F34373C31E3B" name="dct:conformsTo" association="EAID_706CE445_9D11_4ee4_8B59_F34373C31E3B">
 							<type xmi:idref="EAID_A8D775E4_EEB9_4502_B8A1_C1DD5D555864"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000019__9D11_4ee4_8B59_F34373C31E3B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000020__9D11_4ee4_8B59_F34373C31E3B" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000027__9D11_4ee4_8B59_F34373C31E3B" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000028__9D11_4ee4_8B59_F34373C31E3B" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst56C70D_D0B9_4ad4_9CB4_9A6821D5E3E1" name="adms:identifier" association="EAID_7F56C70D_D0B9_4ad4_9CB4_9A6821D5E3E1">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000021__D0B9_4ad4_9CB4_9A6821D5E3E1" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000022__D0B9_4ad4_9CB4_9A6821D5E3E1" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000029__D0B9_4ad4_9CB4_9A6821D5E3E1" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000030__D0B9_4ad4_9CB4_9A6821D5E3E1" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst90AB87_7AAE_4276_AA04_83E4BB664FCB" name="cccev:supportsConcept" association="EAID_8990AB87_7AAE_4276_AA04_83E4BB664FCB">
 							<type xmi:idref="EAID_86057FC2_7717_4160_8952_6A9F572F43B2"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000023__7AAE_4276_AA04_83E4BB664FCB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000024__7AAE_4276_AA04_83E4BB664FCB" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000031__7AAE_4276_AA04_83E4BB664FCB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000032__7AAE_4276_AA04_83E4BB664FCB" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst6EADDE_0D7D_40a5_B341_A616866CD789" name="cccev:supportsValue" association="EAID_CE6EADDE_0D7D_40a5_B341_A616866CD789">
 							<type xmi:idref="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000025__0D7D_40a5_B341_A616866CD789" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000026__0D7D_40a5_B341_A616866CD789" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000033__0D7D_40a5_B341_A616866CD789" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000034__0D7D_40a5_B341_A616866CD789" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1864913C_FE85_48db_829F_004DFE769A97">
@@ -208,13 +648,6 @@
 							<type xmi:idref="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7F56C70D_D0B9_4ad4_9CB4_9A6821D5E3E1">
-						<memberEnd xmi:idref="EAID_dst56C70D_D0B9_4ad4_9CB4_9A6821D5E3E1"/>
-						<memberEnd xmi:idref="EAID_src56C70D_D0B9_4ad4_9CB4_9A6821D5E3E1"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src56C70D_D0B9_4ad4_9CB4_9A6821D5E3E1" association="EAID_7F56C70D_D0B9_4ad4_9CB4_9A6821D5E3E1">
-							<type xmi:idref="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_8990AB87_7AAE_4276_AA04_83E4BB664FCB">
 						<memberEnd xmi:idref="EAID_dst90AB87_7AAE_4276_AA04_83E4BB664FCB"/>
 						<memberEnd xmi:idref="EAID_src90AB87_7AAE_4276_AA04_83E4BB664FCB"/>
@@ -253,28 +686,21 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" name="cccev:InformationConcept">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_4BC2BB5B_8A97_4bdd_A15E_C716B815CC13" name="dct:description">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000027_8A97_4bdd_A15E_C716B815CC13" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000028_8A97_4bdd_A15E_C716B815CC13" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000035_8A97_4bdd_A15E_C716B815CC13" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000036_8A97_4bdd_A15E_C716B815CC13" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_EDACC705_499F_489c_AA49_2F4562A747ED" name="skos:prefLabel">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000029_499F_489c_AA49_2F4562A747ED" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000030_499F_489c_AA49_2F4562A747ED" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000037_499F_489c_AA49_2F4562A747ED" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000038_499F_489c_AA49_2F4562A747ED" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstC75333_AC70_477b_AA0D_15C3CB11CC0C" name="adms:identifier" association="EAID_D9C75333_AC70_477b_AA0D_15C3CB11CC0C">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000031__AC70_477b_AA0D_15C3CB11CC0C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000032__AC70_477b_AA0D_15C3CB11CC0C" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000039__AC70_477b_AA0D_15C3CB11CC0C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000040__AC70_477b_AA0D_15C3CB11CC0C" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D9C75333_AC70_477b_AA0D_15C3CB11CC0C">
-						<memberEnd xmi:idref="EAID_dstC75333_AC70_477b_AA0D_15C3CB11CC0C"/>
-						<memberEnd xmi:idref="EAID_srcC75333_AC70_477b_AA0D_15C3CB11CC0C"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC75333_AC70_477b_AA0D_15C3CB11CC0C" association="EAID_D9C75333_AC70_477b_AA0D_15C3CB11CC0C">
-							<type xmi:idref="EAID_86057FC2_7717_4160_8952_6A9F572F43B2"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_4CC3B6CA_493A_4ff6_BB1B_A5C475115AB1">
 						<memberEnd xmi:idref="EAID_dstC3B6CA_493A_4ff6_BB1B_A5C475115AB1"/>
 						<memberEnd xmi:idref="EAID_srcC3B6CA_493A_4ff6_BB1B_A5C475115AB1"/>
@@ -290,12 +716,48 @@
 						</ownedEnd>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_30DD6891_71FE_4f87_832B_477790550BBC" name="cccev:InformationRequirement">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst0A81E5_E1CC_45be_BCFD_56F87C51B05A" name="epo:concernsProcedure" association="EAID_110A81E5_E1CC_45be_BCFD_56F87C51B05A">
+							<type xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000041__E1CC_45be_BCFD_56F87C51B05A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000042__E1CC_45be_BCFD_56F87C51B05A" value="1"/>
+						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst79D937_81BB_4b88_BC30_54B777A7B4B8" name="epo:hasConstraint" association="EAID_5879D937_81BB_4b88_BC30_54B777A7B4B8">
 							<type xmi:idref="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000033__81BB_4b88_BC30_54B777A7B4B8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000034__81BB_4b88_BC30_54B777A7B4B8" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000043__81BB_4b88_BC30_54B777A7B4B8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000044__81BB_4b88_BC30_54B777A7B4B8" value="*"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_6492D4E3_9631_45d4_9596_5EC3247529A2" general="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE31D37_FF1B_42a0_838A_8319D03108B2" name="epo:concernsLot" association="EAID_6AE31D37_FF1B_42a0_838A_8319D03108B2">
+							<type xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000045__FF1B_42a0_838A_8319D03108B2" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000046__FF1B_42a0_838A_8319D03108B2" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstA89CC9_D9FD_4f2e_9237_C215D347E620" name="epo:concernsLotGroup" association="EAID_9FA89CC9_D9FD_4f2e_9237_C215D347E620">
+							<type xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000047__D9FD_4f2e_9237_C215D347E620" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000048__D9FD_4f2e_9237_C215D347E620" value="*"/>
+						</ownedAttribute>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_110A81E5_E1CC_45be_BCFD_56F87C51B05A">
+						<memberEnd xmi:idref="EAID_dst0A81E5_E1CC_45be_BCFD_56F87C51B05A"/>
+						<memberEnd xmi:idref="EAID_src0A81E5_E1CC_45be_BCFD_56F87C51B05A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0A81E5_E1CC_45be_BCFD_56F87C51B05A" association="EAID_110A81E5_E1CC_45be_BCFD_56F87C51B05A">
+							<type xmi:idref="EAID_30DD6891_71FE_4f87_832B_477790550BBC"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6AE31D37_FF1B_42a0_838A_8319D03108B2">
+						<memberEnd xmi:idref="EAID_dstE31D37_FF1B_42a0_838A_8319D03108B2"/>
+						<memberEnd xmi:idref="EAID_srcE31D37_FF1B_42a0_838A_8319D03108B2"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE31D37_FF1B_42a0_838A_8319D03108B2" association="EAID_6AE31D37_FF1B_42a0_838A_8319D03108B2">
+							<type xmi:idref="EAID_30DD6891_71FE_4f87_832B_477790550BBC"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9FA89CC9_D9FD_4f2e_9237_C215D347E620">
+						<memberEnd xmi:idref="EAID_dstA89CC9_D9FD_4f2e_9237_C215D347E620"/>
+						<memberEnd xmi:idref="EAID_srcA89CC9_D9FD_4f2e_9237_C215D347E620"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA89CC9_D9FD_4f2e_9237_C215D347E620" association="EAID_9FA89CC9_D9FD_4f2e_9237_C215D347E620">
+							<type xmi:idref="EAID_30DD6891_71FE_4f87_832B_477790550BBC"/>
+						</ownedEnd>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_5715AB6B_F88D_4b3e_857E_2AD843DEF3DE">
 						<memberEnd xmi:idref="EAID_dst15AB6B_F88D_4b3e_857E_2AD843DEF3DE"/>
@@ -306,39 +768,39 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" name="cccev:Requirement">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_8C66D14F_4A31_454e_9AA2_45BD4C3E92E9" name="dct:description">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000035_4A31_454e_9AA2_45BD4C3E92E9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000036_4A31_454e_9AA2_45BD4C3E92E9" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000049_4A31_454e_9AA2_45BD4C3E92E9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000050_4A31_454e_9AA2_45BD4C3E92E9" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_76501C03_8E25_4f73_ACD2_B452220092B4" name="skos:prefLabel">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000037_8E25_4f73_ACD2_B452220092B4" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000038_8E25_4f73_ACD2_B452220092B4" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000051_8E25_4f73_ACD2_B452220092B4" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000052_8E25_4f73_ACD2_B452220092B4" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst14095E_1557_4ab2_9602_8ABBB64F4BF6" name="cccev:hasEvidenceTypeList" association="EAID_1F14095E_1557_4ab2_9602_8ABBB64F4BF6">
 							<type xmi:idref="EAID_3124967E_D23F_4c3b_9B72_E02C23A08D68"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000039__1557_4ab2_9602_8ABBB64F4BF6" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000040__1557_4ab2_9602_8ABBB64F4BF6" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000053__1557_4ab2_9602_8ABBB64F4BF6" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000054__1557_4ab2_9602_8ABBB64F4BF6" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstC3B6CA_493A_4ff6_BB1B_A5C475115AB1" name="cccev:hasConcept" association="EAID_4CC3B6CA_493A_4ff6_BB1B_A5C475115AB1">
 							<type xmi:idref="EAID_86057FC2_7717_4160_8952_6A9F572F43B2"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000041__493A_4ff6_BB1B_A5C475115AB1" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000042__493A_4ff6_BB1B_A5C475115AB1" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000055__493A_4ff6_BB1B_A5C475115AB1" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000056__493A_4ff6_BB1B_A5C475115AB1" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst7F57B4_08F1_4183_A0A9_C1CCAB84A53A" name="adms:identifier" association="EAID_527F57B4_08F1_4183_A0A9_C1CCAB84A53A">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000043__08F1_4183_A0A9_C1CCAB84A53A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000044__08F1_4183_A0A9_C1CCAB84A53A" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000057__08F1_4183_A0A9_C1CCAB84A53A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000058__08F1_4183_A0A9_C1CCAB84A53A" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst59B897_AEE0_4ae9_BFBB_56453EA7473F" name="cccev:hasRequirement" association="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F">
 							<type xmi:idref="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000045__AEE0_4ae9_BFBB_56453EA7473F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000046__AEE0_4ae9_BFBB_56453EA7473F" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000059__AEE0_4ae9_BFBB_56453EA7473F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000060__AEE0_4ae9_BFBB_56453EA7473F" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst805113_2B03_4b91_AB02_2B5A185EB504" name="cccev:isDerivedFrom" association="EAID_AD805113_2B03_4b91_AB02_2B5A185EB504">
 							<type xmi:idref="EAID_D7D6EB20_18A6_4b80_8B0F_73E4C1852FB7"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000047__2B03_4b91_AB02_2B5A185EB504" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000048__2B03_4b91_AB02_2B5A185EB504" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000061__2B03_4b91_AB02_2B5A185EB504" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000062__2B03_4b91_AB02_2B5A185EB504" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1F14095E_1557_4ab2_9602_8ABBB64F4BF6">
@@ -348,13 +810,6 @@
 							<type xmi:idref="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_527F57B4_08F1_4183_A0A9_C1CCAB84A53A">
-						<memberEnd xmi:idref="EAID_dst7F57B4_08F1_4183_A0A9_C1CCAB84A53A"/>
-						<memberEnd xmi:idref="EAID_src7F57B4_08F1_4183_A0A9_C1CCAB84A53A"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src7F57B4_08F1_4183_A0A9_C1CCAB84A53A" association="EAID_527F57B4_08F1_4183_A0A9_C1CCAB84A53A">
-							<type xmi:idref="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F">
 						<memberEnd xmi:idref="EAID_dst59B897_AEE0_4ae9_BFBB_56453EA7473F"/>
 						<memberEnd xmi:idref="EAID_src59B897_AEE0_4ae9_BFBB_56453EA7473F"/>
@@ -371,39 +826,39 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_33E9269C_0B96_4b38_A129_C30771A9833F" name="cpov:ContactPoint">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_CA982154_BE8B_47ed_A7E8_401033A4F00F" name="epo:hasFax">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000049_BE8B_47ed_A7E8_401033A4F00F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000050_BE8B_47ed_A7E8_401033A4F00F" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000063_BE8B_47ed_A7E8_401033A4F00F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000064_BE8B_47ed_A7E8_401033A4F00F" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_18678A91_8A39_4ef1_9823_B5AEDF9F9A8D" name="cpov:telephone">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000051_8A39_4ef1_9823_B5AEDF9F9A8D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000052_8A39_4ef1_9823_B5AEDF9F9A8D" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000065_8A39_4ef1_9823_B5AEDF9F9A8D" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000066_8A39_4ef1_9823_B5AEDF9F9A8D" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_0FFF8E2C_503B_420d_A265_995666BBE4C8" name="cpov:email">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000053_503B_420d_A265_995666BBE4C8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000054_503B_420d_A265_995666BBE4C8" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000067_503B_420d_A265_995666BBE4C8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000068_503B_420d_A265_995666BBE4C8" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_23111491_7AC7_4d4d_9FEB_F13DE10B9AC2" name="dct:description">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000055_7AC7_4d4d_9FEB_F13DE10B9AC2" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000056_7AC7_4d4d_9FEB_F13DE10B9AC2" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000069_7AC7_4d4d_9FEB_F13DE10B9AC2" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000070_7AC7_4d4d_9FEB_F13DE10B9AC2" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_FDF3AB5E_9A7F_450b_9015_99A5CECE86AA" name="epo:hasContactName">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000057_9A7F_450b_9015_99A5CECE86AA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000058_9A7F_450b_9015_99A5CECE86AA" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000071_9A7F_450b_9015_99A5CECE86AA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000072_9A7F_450b_9015_99A5CECE86AA" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_92C70B39_1030_43e1_BA3D_464008D8F6FA" name="epo:hasInternetAddress">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000059_1030_43e1_BA3D_464008D8F6FA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000060_1030_43e1_BA3D_464008D8F6FA" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000073_1030_43e1_BA3D_464008D8F6FA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000074_1030_43e1_BA3D_464008D8F6FA" value="1"/>
 							<type xmi:idref="EAJava_xsd_anyURI"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst228FCF_2B3C_44e6_BD17_379180274988" name="locn:address" association="EAID_A4228FCF_2B3C_44e6_BD17_379180274988">
 							<type xmi:idref="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000061__2B3C_44e6_BD17_379180274988" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000062__2B3C_44e6_BD17_379180274988" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000075__2B3C_44e6_BD17_379180274988" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000076__2B3C_44e6_BD17_379180274988" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A4228FCF_2B3C_44e6_BD17_379180274988">
@@ -439,28 +894,21 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A" name="cv:Channel">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_7DB1AA63_8792_484d_909C_83FEC34C0F01" name="epo:hasAddressURL">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000063_8792_484d_909C_83FEC34C0F01" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000064_8792_484d_909C_83FEC34C0F01" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000077_8792_484d_909C_83FEC34C0F01" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000078_8792_484d_909C_83FEC34C0F01" value="1"/>
 							<type xmi:idref="EAJava_xsd_anyURI"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_DE0FC2D7_1CCC_4ee6_BCB7_85BA67069C74" name="dct:description">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000065_1CCC_4ee6_BCB7_85BA67069C74" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000066_1CCC_4ee6_BCB7_85BA67069C74" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000079_1CCC_4ee6_BCB7_85BA67069C74" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000080_1CCC_4ee6_BCB7_85BA67069C74" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst6DDC19_B837_4e3f_B996_A8D529DA32A2" name="epo:hasEndpointIdentifier" association="EAID_D56DDC19_B837_4e3f_B996_A8D529DA32A2">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000067__B837_4e3f_B996_A8D529DA32A2" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000068__B837_4e3f_B996_A8D529DA32A2" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000081__B837_4e3f_B996_A8D529DA32A2" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000082__B837_4e3f_B996_A8D529DA32A2" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D56DDC19_B837_4e3f_B996_A8D529DA32A2">
-						<memberEnd xmi:idref="EAID_dst6DDC19_B837_4e3f_B996_A8D529DA32A2"/>
-						<memberEnd xmi:idref="EAID_src6DDC19_B837_4e3f_B996_A8D529DA32A2"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6DDC19_B837_4e3f_B996_A8D529DA32A2" association="EAID_D56DDC19_B837_4e3f_B996_A8D529DA32A2">
-							<type xmi:idref="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_2C904936_FC7D_45f3_AFEF_E5B428B672AA">
 						<memberEnd xmi:idref="EAID_dst904936_FC7D_45f3_AFEF_E5B428B672AA"/>
 						<memberEnd xmi:idref="EAID_src904936_FC7D_45f3_AFEF_E5B428B672AA"/>
@@ -484,39 +932,32 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" name="dct:Location">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_04A92256_22A1_4faf_B623_4983949241CC" name="locn:geographicName">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000069_22A1_4faf_B623_4983949241CC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000070_22A1_4faf_B623_4983949241CC" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000083_22A1_4faf_B623_4983949241CC" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000084_22A1_4faf_B623_4983949241CC" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst4FE890_B03B_430a_A719_E1852BEECBEE" name="adms:identifier" association="EAID_4A4FE890_B03B_430a_A719_E1852BEECBEE">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000071__B03B_430a_A719_E1852BEECBEE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000072__B03B_430a_A719_E1852BEECBEE" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000085__B03B_430a_A719_E1852BEECBEE" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000086__B03B_430a_A719_E1852BEECBEE" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst0B3C1A_A0BD_494b_BEE6_89F708783872" name="locn:address" association="EAID_C70B3C1A_A0BD_494b_BEE6_89F708783872">
 							<type xmi:idref="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000073__A0BD_494b_BEE6_89F708783872" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000074__A0BD_494b_BEE6_89F708783872" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000087__A0BD_494b_BEE6_89F708783872" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000088__A0BD_494b_BEE6_89F708783872" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstDC5261_E7FF_4ca6_8255_6B2812DC1B0C" name="locn:geographicIdentifier" association="EAID_CEDC5261_E7FF_4ca6_8255_6B2812DC1B0C">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000075__E7FF_4ca6_8255_6B2812DC1B0C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000076__E7FF_4ca6_8255_6B2812DC1B0C" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000089__E7FF_4ca6_8255_6B2812DC1B0C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000090__E7FF_4ca6_8255_6B2812DC1B0C" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst8E8C16_CD7F_4664_8346_839CB32AF64E" name="locn:geometry" association="EAID_F48E8C16_CD7F_4664_8346_839CB32AF64E">
 							<type xmi:idref="EAID_2424C22E_B54F_4b6f_BA47_E78DE21C76DE"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000077__CD7F_4664_8346_839CB32AF64E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000078__CD7F_4664_8346_839CB32AF64E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000091__CD7F_4664_8346_839CB32AF64E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000092__CD7F_4664_8346_839CB32AF64E" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_06D187DF_9192_4549_BE01_736C22D89AEA" supplier="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" client="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_4A4FE890_B03B_430a_A719_E1852BEECBEE">
-						<memberEnd xmi:idref="EAID_dst4FE890_B03B_430a_A719_E1852BEECBEE"/>
-						<memberEnd xmi:idref="EAID_src4FE890_B03B_430a_A719_E1852BEECBEE"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src4FE890_B03B_430a_A719_E1852BEECBEE" association="EAID_4A4FE890_B03B_430a_A719_E1852BEECBEE">
-							<type xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_8A0DF9CA_F904_4d6e_850E_F68332FB1B0B" supplier="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40" client="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C70B3C1A_A0BD_494b_BEE6_89F708783872">
 						<memberEnd xmi:idref="EAID_dst0B3C1A_A0BD_494b_BEE6_89F708783872"/>
@@ -525,13 +966,6 @@
 							<type xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_CEDC5261_E7FF_4ca6_8255_6B2812DC1B0C">
-						<memberEnd xmi:idref="EAID_dstDC5261_E7FF_4ca6_8255_6B2812DC1B0C"/>
-						<memberEnd xmi:idref="EAID_srcDC5261_E7FF_4ca6_8255_6B2812DC1B0C"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDC5261_E7FF_4ca6_8255_6B2812DC1B0C" association="EAID_CEDC5261_E7FF_4ca6_8255_6B2812DC1B0C">
-							<type xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F48E8C16_CD7F_4664_8346_839CB32AF64E">
 						<memberEnd xmi:idref="EAID_dst8E8C16_CD7F_4664_8346_839CB32AF64E"/>
 						<memberEnd xmi:idref="EAID_src8E8C16_CD7F_4664_8346_839CB32AF64E"/>
@@ -576,56 +1010,56 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" name="epo:AccessTerm">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_08E88573_F7A6_42d3_8527_025EA7C4ECE9" name="epo:isProcurementDocumentRestricted">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000079_F7A6_42d3_8527_025EA7C4ECE9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000080_F7A6_42d3_8527_025EA7C4ECE9" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000093_F7A6_42d3_8527_025EA7C4ECE9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000094_F7A6_42d3_8527_025EA7C4ECE9" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_5A7E065B_B472_44ff_97A0_C963A7A5D2CA" name="epo:hasRestrictedAccessURL">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000081_B472_44ff_97A0_C963A7A5D2CA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000082_B472_44ff_97A0_C963A7A5D2CA" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000095_B472_44ff_97A0_C963A7A5D2CA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000096_B472_44ff_97A0_C963A7A5D2CA" value="1"/>
 							<type xmi:idref="EAJava_xsd_anyURI"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_DA554825_D282_4a12_98D4_FC46FC4463B9" name="epo:hasAdditionalInformationDeadline">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000083_D282_4a12_98D4_FC46FC4463B9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000084_D282_4a12_98D4_FC46FC4463B9" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000097_D282_4a12_98D4_FC46FC4463B9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000098_D282_4a12_98D4_FC46FC4463B9" value="1"/>
 							<type xmi:idref="EAJava_xsd_dateTime"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_19C1FCB4_FC45_4f69_A2A2_AC3A9337FFCF" name="epo:hasPublicAccessURL">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000085_FC45_4f69_A2A2_AC3A9337FFCF" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000086_FC45_4f69_A2A2_AC3A9337FFCF" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000099_FC45_4f69_A2A2_AC3A9337FFCF" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000100_FC45_4f69_A2A2_AC3A9337FFCF" value="1"/>
 							<type xmi:idref="EAJava_xsd_anyURI"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst1B9223_B1D3_4ffe_B219_FFD9D57F9B43" name="epo:involvesProcurementDocument" association="EAID_3A1B9223_B1D3_4ffe_B219_FFD9D57F9B43">
 							<type xmi:idref="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000087__B1D3_4ffe_B219_FFD9D57F9B43" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000088__B1D3_4ffe_B219_FFD9D57F9B43" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000101__B1D3_4ffe_B219_FFD9D57F9B43" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000102__B1D3_4ffe_B219_FFD9D57F9B43" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_405A688E_2CD5_4d16_B4F1_E98AB4374F1C" general="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstFA8589_17C4_41df_B066_E37D4DDD0C0A" name="epo:definesCatalogueProvider" association="EAID_7CFA8589_17C4_41df_B066_E37D4DDD0C0A">
 							<type xmi:idref="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000089__17C4_41df_B066_E37D4DDD0C0A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000090__17C4_41df_B066_E37D4DDD0C0A" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000103__17C4_41df_B066_E37D4DDD0C0A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000104__17C4_41df_B066_E37D4DDD0C0A" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstDE70B2_FCDD_46b7_8DA7_19386DB49579" name="epo:definesProcurementProcedureInformationProvider" association="EAID_ADDE70B2_FCDD_46b7_8DA7_19386DB49579">
 							<type xmi:idref="EAID_EA883AD5_9C26_467b_90B7_4F724B6E5E5E"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000091__FCDD_46b7_8DA7_19386DB49579" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000092__FCDD_46b7_8DA7_19386DB49579" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000105__FCDD_46b7_8DA7_19386DB49579" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000106__FCDD_46b7_8DA7_19386DB49579" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstB3B9B6_7AFD_4b8c_8502_C5AC8F9FFC84" name="epo:definesOfflineAccessProvider" association="EAID_C2B3B9B6_7AFD_4b8c_8502_C5AC8F9FFC84">
 							<type xmi:idref="EAID_A958E5F1_29FE_4263_AEBA_5D8644A7677A"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000093__7AFD_4b8c_8502_C5AC8F9FFC84" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000094__7AFD_4b8c_8502_C5AC8F9FFC84" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000107__7AFD_4b8c_8502_C5AC8F9FFC84" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000108__7AFD_4b8c_8502_C5AC8F9FFC84" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_D31D53E1_9D45_461d_A55B_588C65D0E49D" general="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstD6284A_096F_4112_989F_32AD38804C63" name="epo:definesCatalogueReceiver" association="EAID_D7D6284A_096F_4112_989F_32AD38804C63">
 							<type xmi:idref="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000095__096F_4112_989F_32AD38804C63" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000096__096F_4112_989F_32AD38804C63" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000109__096F_4112_989F_32AD38804C63" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000110__096F_4112_989F_32AD38804C63" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst25948E_6ABD_4c9b_83A7_6E582F53DA90" name="epo:refersToPlannedPart" association="EAID_E425948E_6ABD_4c9b_83A7_6E582F53DA90">
 							<type xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000097__6ABD_4c9b_83A7_6E582F53DA90" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000098__6ABD_4c9b_83A7_6E582F53DA90" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000111__6ABD_4c9b_83A7_6E582F53DA90" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000112__6ABD_4c9b_83A7_6E582F53DA90" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3A1B9223_B1D3_4ffe_B219_FFD9D57F9B43">
@@ -682,34 +1116,34 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" name="epo:AgentInRole">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_73F1D2A1_60CC_4828_8DAB_CC5101B58287" name="dct:description">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000099_60CC_4828_8DAB_CC5101B58287" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000100_60CC_4828_8DAB_CC5101B58287" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000113_60CC_4828_8DAB_CC5101B58287" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000114_60CC_4828_8DAB_CC5101B58287" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_89ACE32E_7513_48cd_8763_8038F66E55AF" name="dct:title">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000101_7513_48cd_8763_8038F66E55AF" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000102_7513_48cd_8763_8038F66E55AF" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000115_7513_48cd_8763_8038F66E55AF" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000116_7513_48cd_8763_8038F66E55AF" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst9200E2_D732_4a5e_BCE2_05E832F758D6" name="epo:playedBy" association="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6">
 							<type xmi:idref="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000103__D732_4a5e_BCE2_05E832F758D6" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000104__D732_4a5e_BCE2_05E832F758D6" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000117__D732_4a5e_BCE2_05E832F758D6" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000118__D732_4a5e_BCE2_05E832F758D6" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst904936_FC7D_45f3_AFEF_E5B428B672AA" name="epo:exposesChannel" association="EAID_2C904936_FC7D_45f3_AFEF_E5B428B672AA">
 							<type xmi:idref="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000105__FC7D_45f3_AFEF_E5B428B672AA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000106__FC7D_45f3_AFEF_E5B428B672AA" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000119__FC7D_45f3_AFEF_E5B428B672AA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000120__FC7D_45f3_AFEF_E5B428B672AA" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst6E629B_BECA_4e04_B7C9_925B517BC914" name="epo:hasContactPointInRole" association="EAID_4B6E629B_BECA_4e04_B7C9_925B517BC914">
 							<type xmi:idref="EAID_33E9269C_0B96_4b38_A129_C30771A9833F"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000107__BECA_4e04_B7C9_925B517BC914" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000108__BECA_4e04_B7C9_925B517BC914" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000121__BECA_4e04_B7C9_925B517BC914" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000122__BECA_4e04_B7C9_925B517BC914" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst24A6A5_CBDA_4f14_91FB_B8F7B19FEB4B" name="epo:contextualisedBy" association="EAID_A324A6A5_CBDA_4f14_91FB_B8F7B19FEB4B">
 							<type xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000109__CBDA_4f14_91FB_B8F7B19FEB4B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000110__CBDA_4f14_91FB_B8F7B19FEB4B" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000123__CBDA_4f14_91FB_B8F7B19FEB4B" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000124__CBDA_4f14_91FB_B8F7B19FEB4B" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6">
@@ -797,13 +1231,13 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2" name="epo:AwardCriterion">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_AA86F070_25D3_46df_95DD_5B5DE9E1726B" name="epo:hasAwardCriteriaStatedInProcurementDocuments">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000111_25D3_46df_95DD_5B5DE9E1726B" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000112_25D3_46df_95DD_5B5DE9E1726B" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000125_25D3_46df_95DD_5B5DE9E1726B" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000126_25D3_46df_95DD_5B5DE9E1726B" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_4FD10EB5_5FE5_4f22_A0BA_CF6DF5927076" name="epo:hasFixedValue">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000113_5FE5_4f22_A0BA_CF6DF5927076" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000114_5FE5_4f22_A0BA_CF6DF5927076" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000127_5FE5_4f22_A0BA_CF6DF5927076" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000128_5FE5_4f22_A0BA_CF6DF5927076" value="1"/>
 							<type xmi:idref="EAJava_xsd_decimal"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_E006DB35_535D_4444_B447_89D7A813874C" general="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
@@ -815,28 +1249,28 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_C932A7D1_D54B_40f1_92A7_459C07235810" name="epo:AwardEvaluationTerm">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_1EC4FBB1_8AE0_4caf_815F_BF4568DEDD87" name="epo:hasAwardCriteriaEvaluationFormula">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000115_8AE0_4caf_815F_BF4568DEDD87" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000116_8AE0_4caf_815F_BF4568DEDD87" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000129_8AE0_4caf_815F_BF4568DEDD87" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000130_8AE0_4caf_815F_BF4568DEDD87" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_FED96EAF_5C57_44f2_B2C0_AB86BE0977FB" name="epo:hasOverallQualityAwardCriteriaPonderation">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000117_5C57_44f2_B2C0_AB86BE0977FB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000118_5C57_44f2_B2C0_AB86BE0977FB" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000131_5C57_44f2_B2C0_AB86BE0977FB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000132_5C57_44f2_B2C0_AB86BE0977FB" value="1"/>
 							<type xmi:idref="EAJava_xsd_decimal"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_97A47F40_7ED7_4105_B7B4_75A752F71E30" name="epo:hasOverallPriceAwardCriteriaPonderation">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000119_7ED7_4105_B7B4_75A752F71E30" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000120_7ED7_4105_B7B4_75A752F71E30" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000133_7ED7_4105_B7B4_75A752F71E30" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000134_7ED7_4105_B7B4_75A752F71E30" value="1"/>
 							<type xmi:idref="EAJava_xsd_decimal"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_8DB5ABA1_A182_4668_9F98_14724C693F16" name="epo:hasAwardCriteriaOrderJustification">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000121_A182_4668_9F98_14724C693F16" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000122_A182_4668_9F98_14724C693F16" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000135_A182_4668_9F98_14724C693F16" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000136_A182_4668_9F98_14724C693F16" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_86E77DD5_8E15_49c4_87DC_7C39B5F7A598" name="epo:hasOverallCostAwardCriteriaPonderation">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000123_8E15_49c4_87DC_7C39B5F7A598" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000124_8E15_49c4_87DC_7C39B5F7A598" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000137_8E15_49c4_87DC_7C39B5F7A598" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000138_8E15_49c4_87DC_7C39B5F7A598" value="1"/>
 							<type xmi:idref="EAJava_xsd_decimal"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_8AEE25AF_1FE7_48a6_84D6_B7AEDF8DCACA" general="EAID_0C735489_15DC_40a7_A94E_A9202738B188"/>
@@ -847,19 +1281,19 @@
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_E7437025_771F_4143_BE33_620A29646687" name="epo:AwardOutcome">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst7A511C_F377_4405_82EA_14ABA20458B6" name="epo:hasAwardedValue" association="EAID_547A511C_F377_4405_82EA_14ABA20458B6">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000125__F377_4405_82EA_14ABA20458B6" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000126__F377_4405_82EA_14ABA20458B6" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000139__F377_4405_82EA_14ABA20458B6" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000140__F377_4405_82EA_14ABA20458B6" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst4C01E9_6CF5_410f_83E6_3CAF530D5403" name="epo:comprisesTenderAwardOutcome" association="EAID_AF4C01E9_6CF5_410f_83E6_3CAF530D5403">
 							<type xmi:idref="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000127__6CF5_410f_83E6_3CAF530D5403" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000128__6CF5_410f_83E6_3CAF530D5403" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000141__6CF5_410f_83E6_3CAF530D5403" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000142__6CF5_410f_83E6_3CAF530D5403" value="*"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_C3A36A4B_DBA9_4b46_B3E4_2E8899DEDCE9" general="EAID_B2165393_B24C_4dd7_A2E2_DE976E538481"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst57E7B8_BA32_4888_BB1A_167306D6B16C" name="epo:hasBargainPrice" association="EAID_D257E7B8_BA32_4888_BB1A_167306D6B16C">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000129__BA32_4888_BB1A_167306D6B16C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000130__BA32_4888_BB1A_167306D6B16C" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000143__BA32_4888_BB1A_167306D6B16C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000144__BA32_4888_BB1A_167306D6B16C" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_50DC56C3_14A4_46c6_BCAE_F8C1CC7880E0" supplier="EAID_B63C4BE8_86E2_494f_AB88_882E3568B3F0" client="EAID_E7437025_771F_4143_BE33_620A29646687"/>
@@ -911,14 +1345,14 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C" name="epo:Business">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_F71CAE83_7EA2_4c52_90A8_0F254E9E77D7" name="epo:isListedCompany">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000131_7EA2_4c52_90A8_0F254E9E77D7" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000132_7EA2_4c52_90A8_0F254E9E77D7" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000145_7EA2_4c52_90A8_0F254E9E77D7" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000146_7EA2_4c52_90A8_0F254E9E77D7" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst0783CB_543D_493b_8D89_2DD66914E4DD" name="epo:hasBeneficialOwner" association="EAID_610783CB_543D_493b_8D89_2DD66914E4DD">
 							<type xmi:idref="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000133__543D_493b_8D89_2DD66914E4DD" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000134__543D_493b_8D89_2DD66914E4DD" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000147__543D_493b_8D89_2DD66914E4DD" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000148__543D_493b_8D89_2DD66914E4DD" value="*"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_A2F10537_FAE7_4ff3_A3EE_819F014FE1AC" general="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
 					</packagedElement>
@@ -929,40 +1363,40 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_96B284C4_E759_4bad_9655_04521F703750" name="epo:Buyer">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_B03ACF2B_B2B5_4d67_85D3_9488B22767E2" name="epo:isContractingEntity">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000135_B2B5_4d67_85D3_9488B22767E2" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000136_B2B5_4d67_85D3_9488B22767E2" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000149_B2B5_4d67_85D3_9488B22767E2" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000150_B2B5_4d67_85D3_9488B22767E2" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_1BE46C8C_217C_4fa5_994D_9A31184F91B4" name="epo:hasActivityDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000137_217C_4fa5_994D_9A31184F91B4" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000138_217C_4fa5_994D_9A31184F91B4" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000151_217C_4fa5_994D_9A31184F91B4" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000152_217C_4fa5_994D_9A31184F91B4" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_9E03A190_EF20_4de9_BF47_95E969E738EA" name="epo:hasBuyerProfile">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000139_EF20_4de9_BF47_95E969E738EA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000140_EF20_4de9_BF47_95E969E738EA" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000153_EF20_4de9_BF47_95E969E738EA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000154_EF20_4de9_BF47_95E969E738EA" value="1"/>
 							<type xmi:idref="EAJava_xsd_anyURI"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst57D84E_2B82_485f_A14D_2E0BE4C98649" name="epo:signsAwardDecision" association="EAID_4557D84E_2B82_485f_A14D_2E0BE4C98649">
 							<type xmi:idref="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000141__2B82_485f_A14D_2E0BE4C98649" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000142__2B82_485f_A14D_2E0BE4C98649" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000155__2B82_485f_A14D_2E0BE4C98649" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000156__2B82_485f_A14D_2E0BE4C98649" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst812517_A9DA_432d_A7B8_F5FEC69BBDA5" name="epo:indicatesInvoiceeContactPoint" association="EAID_46812517_A9DA_432d_A7B8_F5FEC69BBDA5">
 							<type xmi:idref="EAID_33E9269C_0B96_4b38_A129_C30771A9833F"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000143__A9DA_432d_A7B8_F5FEC69BBDA5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000144__A9DA_432d_A7B8_F5FEC69BBDA5" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000157__A9DA_432d_A7B8_F5FEC69BBDA5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000158__A9DA_432d_A7B8_F5FEC69BBDA5" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstC16E7A_8AD7_4cd0_B3EE_963EFE7F14CA" name="epo:exposesInvoiceeChannel" association="EAID_5EC16E7A_8AD7_4cd0_B3EE_963EFE7F14CA">
 							<type xmi:idref="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000145__8AD7_4cd0_B3EE_963EFE7F14CA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000146__8AD7_4cd0_B3EE_963EFE7F14CA" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000159__8AD7_4cd0_B3EE_963EFE7F14CA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000160__8AD7_4cd0_B3EE_963EFE7F14CA" value="*"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_BD5C98D5_43D4_41be_9C21_84470056CF01" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst76346D_AFB2_421a_BBA1_4FFA393BE7FA" name="epo:delegatesAncillaryActivitiesTo" association="EAID_E076346D_AFB2_421a_BBA1_4FFA393BE7FA">
 							<type xmi:idref="EAID_49EC0F16_408C_4b28_B611_0048946DC070"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000147__AFB2_421a_BBA1_4FFA393BE7FA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000148__AFB2_421a_BBA1_4FFA393BE7FA" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000161__AFB2_421a_BBA1_4FFA393BE7FA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000162__AFB2_421a_BBA1_4FFA393BE7FA" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_4557D84E_2B82_485f_A14D_2E0BE4C98649">
@@ -1014,6 +1448,13 @@
 							<type xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_ADB3D05D_CE75_486d_B38A_27314A2F62B2">
+						<memberEnd xmi:idref="EAID_dstB3D05D_CE75_486d_B38A_27314A2F62B2"/>
+						<memberEnd xmi:idref="EAID_srcB3D05D_CE75_486d_B38A_27314A2F62B2"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB3D05D_CE75_486d_B38A_27314A2F62B2" association="EAID_ADB3D05D_CE75_486d_B38A_27314A2F62B2">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C00C71CA_F2D3_48ca_8D27_E3F34E3AF36B">
 						<memberEnd xmi:idref="EAID_dst0C71CA_F2D3_48ca_8D27_E3F34E3AF36B"/>
 						<memberEnd xmi:idref="EAID_src0C71CA_F2D3_48ca_8D27_E3F34E3AF36B"/>
@@ -1098,45 +1539,45 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" name="epo:ChangeInformation">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_BF36FFA5_CE97_49d3_8482_D1EAA764E7D8" name="epo:hasChangeDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000149_CE97_49d3_8482_D1EAA764E7D8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000150_CE97_49d3_8482_D1EAA764E7D8" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000163_CE97_49d3_8482_D1EAA764E7D8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000164_CE97_49d3_8482_D1EAA764E7D8" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_02F1FD10_4A7F_44a3_90AE_DC4CE167531B" name="epo:hasChangeReasonDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000151_4A7F_44a3_90AE_DC4CE167531B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000152_4A7F_44a3_90AE_DC4CE167531B" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000165_4A7F_44a3_90AE_DC4CE167531B" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000166_4A7F_44a3_90AE_DC4CE167531B" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_47233B60_638C_465b_985C_46C4F92E2998" name="epo:isProcurementDocumentChanged">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000153_638C_465b_985C_46C4F92E2998" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000154_638C_465b_985C_46C4F92E2998" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000167_638C_465b_985C_46C4F92E2998" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000168_638C_465b_985C_46C4F92E2998" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_DD81DA72_316E_4eed_9253_86D09F747DE7" name="epo:hasProcurementDocumentChangeDate">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000155_316E_4eed_9253_86D09F747DE7" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000156_316E_4eed_9253_86D09F747DE7" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000169_316E_4eed_9253_86D09F747DE7" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000170_316E_4eed_9253_86D09F747DE7" value="1"/>
 							<type xmi:idref="EAJava_xsd_dateTime"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_AE22FB25_6A09_4dd9_A1E2_34E02F94BF9A" name="epo:hasAdditionalInformation">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000157_6A09_4dd9_A1E2_34E02F94BF9A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000158_6A09_4dd9_A1E2_34E02F94BF9A" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000171_6A09_4dd9_A1E2_34E02F94BF9A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000172_6A09_4dd9_A1E2_34E02F94BF9A" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_1DAFA4D2_EE54_4246_A132_FC5F510A59ED" general="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst3AE348_60D1_44cb_BC5F_08B65291C2AC" name="epo:refersToPreviousNotice" association="EAID_7E3AE348_60D1_44cb_BC5F_08B65291C2AC">
 							<type xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000159__60D1_44cb_BC5F_08B65291C2AC" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000160__60D1_44cb_BC5F_08B65291C2AC" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000173__60D1_44cb_BC5F_08B65291C2AC" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000174__60D1_44cb_BC5F_08B65291C2AC" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst490705_94B3_445f_ACA6_A903591C3651" name="epo:relatesToEFormSectionIdentifier" association="EAID_84490705_94B3_445f_ACA6_A903591C3651">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000161__94B3_445f_ACA6_A903591C3651" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000162__94B3_445f_ACA6_A903591C3651" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000175__94B3_445f_ACA6_A903591C3651" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000176__94B3_445f_ACA6_A903591C3651" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst14464A_EF1A_4230_BB7E_A40906D6ED97" name="epo:concernsNotice" association="EAID_CF14464A_EF1A_4230_BB7E_A40906D6ED97">
 							<type xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000163__EF1A_4230_BB7E_A40906D6ED97" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000164__EF1A_4230_BB7E_A40906D6ED97" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000177__EF1A_4230_BB7E_A40906D6ED97" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000178__EF1A_4230_BB7E_A40906D6ED97" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7E3AE348_60D1_44cb_BC5F_08B65291C2AC">
@@ -1146,13 +1587,6 @@
 							<type xmi:idref="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_84490705_94B3_445f_ACA6_A903591C3651">
-						<memberEnd xmi:idref="EAID_dst490705_94B3_445f_ACA6_A903591C3651"/>
-						<memberEnd xmi:idref="EAID_src490705_94B3_445f_ACA6_A903591C3651"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src490705_94B3_445f_ACA6_A903591C3651" association="EAID_84490705_94B3_445f_ACA6_A903591C3651">
-							<type xmi:idref="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_B2FED202_9ACA_415c_B2AB_A1E3E26E726C" supplier="EAID_486D9684_7132_41d3_A94D_8DC872AE93F7" client="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC"/>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_CF14464A_EF1A_4230_BB7E_A40906D6ED97">
 						<memberEnd xmi:idref="EAID_dst14464A_EF1A_4230_BB7E_A40906D6ED97"/>
@@ -1166,24 +1600,24 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" name="epo:ConcessionEstimate">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_31CB3359_8B8C_4be7_9E3D_A338B0A518EE" name="epo:hasCalculationMethod">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000165_8B8C_4be7_9E3D_A338B0A518EE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000166_8B8C_4be7_9E3D_A338B0A518EE" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000179_8B8C_4be7_9E3D_A338B0A518EE" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000180_8B8C_4be7_9E3D_A338B0A518EE" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstA6C38F_77C6_4480_A13E_A5E9A66D9379" name="epo:hasConcessionEstimatedValue" association="EAID_72A6C38F_77C6_4480_A13E_A5E9A66D9379">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000167__77C6_4480_A13E_A5E9A66D9379" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000168__77C6_4480_A13E_A5E9A66D9379" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000181__77C6_4480_A13E_A5E9A66D9379" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000182__77C6_4480_A13E_A5E9A66D9379" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstD18452_424C_4f36_8E1E_BF993F4D765A" name="epo:hasEstimatedUserConcessionRevenue" association="EAID_91D18452_424C_4f36_8E1E_BF993F4D765A">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000169__424C_4f36_8E1E_BF993F4D765A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000170__424C_4f36_8E1E_BF993F4D765A" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000183__424C_4f36_8E1E_BF993F4D765A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000184__424C_4f36_8E1E_BF993F4D765A" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst5EEDCE_0633_482d_BA4A_4553057B7C23" name="epo:hasEstimatedBuyerConcessionRevenue" association="EAID_C35EEDCE_0633_482d_BA4A_4553057B7C23">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000171__0633_482d_BA4A_4553057B7C23" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000172__0633_482d_BA4A_4553057B7C23" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000185__0633_482d_BA4A_4553057B7C23" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000186__0633_482d_BA4A_4553057B7C23" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_F08185C3_E8E6_4c0c_A2A4_E3D451902197" general="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897"/>
 					</packagedElement>
@@ -1226,80 +1660,80 @@
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_B2165393_B24C_4dd7_A2E2_DE976E538481" name="epo:ContextualProjection"/>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" name="epo:Contract">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_BC34978E_EE66_4466_B876_2648A2FCB695" name="epo:hasContractConclusionDate">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000173_EE66_4466_B876_2648A2FCB695" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000174_EE66_4466_B876_2648A2FCB695" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000187_EE66_4466_B876_2648A2FCB695" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000188_EE66_4466_B876_2648A2FCB695" value="1"/>
 							<type xmi:idref="EAJava_xsd_date"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_E871E926_FF03_40dc_B883_35A17CF5DA90" name="epo:hasEntryIntoForceDate">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000175_FF03_40dc_B883_35A17CF5DA90" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000176_FF03_40dc_B883_35A17CF5DA90" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000189_FF03_40dc_B883_35A17CF5DA90" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000190_FF03_40dc_B883_35A17CF5DA90" value="1"/>
 							<type xmi:idref="EAJava_xsd_date"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstCFA3D8_50E1_40f7_8F66_FA023FA190E7" name="epo:hasLotReference" association="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7">
 							<type xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000177__50E1_40f7_8F66_FA023FA190E7" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000178__50E1_40f7_8F66_FA023FA190E7" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000191__50E1_40f7_8F66_FA023FA190E7" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000192__50E1_40f7_8F66_FA023FA190E7" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstBE1638_5876_4d85_8FFB_CD1622DAF44A" name="epo:specifiesDeliverable" association="EAID_1CBE1638_5876_4d85_8FFB_CD1622DAF44A">
 							<type xmi:idref="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000179__5876_4d85_8FFB_CD1622DAF44A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000180__5876_4d85_8FFB_CD1622DAF44A" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000193__5876_4d85_8FFB_CD1622DAF44A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000194__5876_4d85_8FFB_CD1622DAF44A" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst20FB6D_76C7_486a_9953_EA1E6D255A89" name="epo:hasContractValue" association="EAID_3220FB6D_76C7_486a_9953_EA1E6D255A89">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000181__76C7_486a_9953_EA1E6D255A89" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000182__76C7_486a_9953_EA1E6D255A89" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000195__76C7_486a_9953_EA1E6D255A89" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000196__76C7_486a_9953_EA1E6D255A89" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstB9AB7E_2B60_4f59_8AE5_E5806C9B2562" name="epo:isSubjectToContractSpecificTerm" association="EAID_39B9AB7E_2B60_4f59_8AE5_E5806C9B2562">
 							<type xmi:idref="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000183__2B60_4f59_8AE5_E5806C9B2562" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000184__2B60_4f59_8AE5_E5806C9B2562" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000197__2B60_4f59_8AE5_E5806C9B2562" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000198__2B60_4f59_8AE5_E5806C9B2562" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstC00346_DC8E_4fd4_8A9A_9A4173CBD283" name="epo:bindsBuyer" association="EAID_3EC00346_DC8E_4fd4_8A9A_9A4173CBD283">
 							<type xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000185__DC8E_4fd4_8A9A_9A4173CBD283" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000186__DC8E_4fd4_8A9A_9A4173CBD283" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000199__DC8E_4fd4_8A9A_9A4173CBD283" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000200__DC8E_4fd4_8A9A_9A4173CBD283" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst14DE2C_F8BB_4c6f_9356_F67CF0DAA096" name="epo:isFundedBy" association="EAID_5514DE2C_F8BB_4c6f_9356_F67CF0DAA096">
 							<type xmi:idref="EAID_495BBB92_468A_4f08_9330_A0C75730B97A"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000187__F8BB_4c6f_9356_F67CF0DAA096" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000188__F8BB_4c6f_9356_F67CF0DAA096" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000201__F8BB_4c6f_9356_F67CF0DAA096" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000202__F8BB_4c6f_9356_F67CF0DAA096" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF02E69_A9AF_47c5_B217_F52FFB1CAD53" name="epo:signedByContractor" association="EAID_75F02E69_A9AF_47c5_B217_F52FFB1CAD53">
 							<type xmi:idref="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000189__A9AF_47c5_B217_F52FFB1CAD53" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000190__A9AF_47c5_B217_F52FFB1CAD53" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000203__A9AF_47c5_B217_F52FFB1CAD53" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000204__A9AF_47c5_B217_F52FFB1CAD53" value="*"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_97C17D51_4DF6_4979_B308_C0F08C743DCF" general="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst41BADB_0CAC_40d5_A730_696A39D2224E" name="epo:hasEstimatedDuration" association="EAID_C741BADB_0CAC_40d5_A730_696A39D2224E">
 							<type xmi:idref="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000191__0CAC_40d5_A730_696A39D2224E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000192__0CAC_40d5_A730_696A39D2224E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000205__0CAC_40d5_A730_696A39D2224E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000206__0CAC_40d5_A730_696A39D2224E" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstBC2835_CD1A_40df_9C2D_9222DAB14E19" name="epo:hasPurpose" association="EAID_DDBC2835_CD1A_40df_9C2D_9222DAB14E19">
 							<type xmi:idref="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000193__CD1A_40df_9C2D_9222DAB14E19" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000194__CD1A_40df_9C2D_9222DAB14E19" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000207__CD1A_40df_9C2D_9222DAB14E19" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000208__CD1A_40df_9C2D_9222DAB14E19" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst8CA809_26BC_46b1_A885_D5B3B1D5960A" name="epo:bindsContractor" association="EAID_EC8CA809_26BC_46b1_A885_D5B3B1D5960A">
 							<type xmi:idref="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000195__26BC_46b1_A885_D5B3B1D5960A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000196__26BC_46b1_A885_D5B3B1D5960A" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000209__26BC_46b1_A885_D5B3B1D5960A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000210__26BC_46b1_A885_D5B3B1D5960A" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE75552_13BB_48c2_A5D7_18A876BF10CF" name="epo:includesTender" association="EAID_EEE75552_13BB_48c2_A5D7_18A876BF10CF">
 							<type xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000197__13BB_48c2_A5D7_18A876BF10CF" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000198__13BB_48c2_A5D7_18A876BF10CF" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000211__13BB_48c2_A5D7_18A876BF10CF" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000212__13BB_48c2_A5D7_18A876BF10CF" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstD708FC_CE05_4098_ADF6_2FEC3A1BB755" name="epo-ord:hasTaxInformation" association="EAID_FBD708FC_CE05_4098_ADF6_2FEC3A1BB755">
 							<type xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000199__CE05_4098_ADF6_2FEC3A1BB755" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000200__CE05_4098_ADF6_2FEC3A1BB755" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000213__CE05_4098_ADF6_2FEC3A1BB755" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000214__CE05_4098_ADF6_2FEC3A1BB755" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst687C05_7D35_48ab_B0AA_8C6787D5DF46" name="epo:signedByBuyer" association="EAID_FD687C05_7D35_48ab_B0AA_8C6787D5DF46">
 							<type xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000201__7D35_48ab_B0AA_8C6787D5DF46" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000202__7D35_48ab_B0AA_8C6787D5DF46" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000215__7D35_48ab_B0AA_8C6787D5DF46" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000216__7D35_48ab_B0AA_8C6787D5DF46" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7">
@@ -1414,6 +1848,13 @@
 							<type xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_63923E1F_6373_4e4c_BC58_974BA33F469A">
+						<memberEnd xmi:idref="EAID_dst923E1F_6373_4e4c_BC58_974BA33F469A"/>
+						<memberEnd xmi:idref="EAID_src923E1F_6373_4e4c_BC58_974BA33F469A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src923E1F_6373_4e4c_BC58_974BA33F469A" association="EAID_63923E1F_6373_4e4c_BC58_974BA33F469A">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7E9B4B6E_15E8_4ec4_876B_BEE9D986B4DA">
 						<memberEnd xmi:idref="EAID_dst9B4B6E_15E8_4ec4_876B_BEE9D986B4DA"/>
 						<memberEnd xmi:idref="EAID_src9B4B6E_15E8_4ec4_876B_BEE9D986B4DA"/>
@@ -1444,29 +1885,29 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" name="epo:ContractLotCompletionInformation">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_B32A9E0D_605C_457b_A377_9332E2AA545D" name="epo:hasPaymentValueDiscrepancyJustification">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000203_605C_457b_A377_9332E2AA545D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000204_605C_457b_A377_9332E2AA545D" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000217_605C_457b_A377_9332E2AA545D" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000218_605C_457b_A377_9332E2AA545D" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstDE37BE_E478_4159_8F53_7F49CAD18053" name="epo:refersToContract" association="EAID_25DE37BE_E478_4159_8F53_7F49CAD18053">
 							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000205__E478_4159_8F53_7F49CAD18053" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000206__E478_4159_8F53_7F49CAD18053" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000219__E478_4159_8F53_7F49CAD18053" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000220__E478_4159_8F53_7F49CAD18053" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst84019D_3E6C_424a_AACD_8319D1389BB9" name="epo:providesContractTotalPenaltyValue" association="EAID_3284019D_3E6C_424a_AACD_8319D1389BB9">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000207__3E6C_424a_AACD_8319D1389BB9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000208__3E6C_424a_AACD_8319D1389BB9" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000221__3E6C_424a_AACD_8319D1389BB9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000222__3E6C_424a_AACD_8319D1389BB9" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstDB7A9B_1395_4587_9F41_FE45FA8A0605" name="epo:describesLotCompletion" association="EAID_6CDB7A9B_1395_4587_9F41_FE45FA8A0605">
 							<type xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000209__1395_4587_9F41_FE45FA8A0605" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000210__1395_4587_9F41_FE45FA8A0605" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000223__1395_4587_9F41_FE45FA8A0605" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000224__1395_4587_9F41_FE45FA8A0605" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst377F2A_EF0B_4bd7_8D4A_95B9DD217458" name="epo:providesContractTotalPaymentValue" association="EAID_AE377F2A_EF0B_4bd7_8D4A_95B9DD217458">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000211__EF0B_4bd7_8D4A_95B9DD217458" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000212__EF0B_4bd7_8D4A_95B9DD217458" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000225__EF0B_4bd7_8D4A_95B9DD217458" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000226__EF0B_4bd7_8D4A_95B9DD217458" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_CAF4D83B_854B_440e_83CF_1BD4AAE5F1B9" general="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
 					</packagedElement>
@@ -1492,13 +1933,37 @@
 						</ownedEnd>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" name="epo:Contractor">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst47709B_D87B_4476_92B0_4EF65D96A0BA" name="epo:hasSubcontractor" association="EAID_4347709B_D87B_4476_92B0_4EF65D96A0BA">
+							<type xmi:idref="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000227__D87B_4476_92B0_4EF65D96A0BA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000228__D87B_4476_92B0_4EF65D96A0BA" value="1"/>
+						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_910BFAB5_C09F_48c2_A281_70A523440BFB" general="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst5B53CF_762F_4436_88E6_F386741960D6" name="epo:foreseesSubcontractor" association="EAID_9E5B53CF_762F_4436_88E6_F386741960D6">
+							<type xmi:idref="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000229__762F_4436_88E6_F386741960D6" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000230__762F_4436_88E6_F386741960D6" value="1"/>
+						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstA3014F_919D_4de3_BCF2_6CA4F71150CA" name="epo:needsToBeAWinner" association="EAID_BBA3014F_919D_4de3_BCF2_6CA4F71150CA">
 							<type xmi:idref="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000213__919D_4de3_BCF2_6CA4F71150CA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000214__919D_4de3_BCF2_6CA4F71150CA" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000231__919D_4de3_BCF2_6CA4F71150CA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000232__919D_4de3_BCF2_6CA4F71150CA" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_4347709B_D87B_4476_92B0_4EF65D96A0BA">
+						<memberEnd xmi:idref="EAID_dst47709B_D87B_4476_92B0_4EF65D96A0BA"/>
+						<memberEnd xmi:idref="EAID_src47709B_D87B_4476_92B0_4EF65D96A0BA"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src47709B_D87B_4476_92B0_4EF65D96A0BA" association="EAID_4347709B_D87B_4476_92B0_4EF65D96A0BA">
+							<type xmi:idref="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9E5B53CF_762F_4436_88E6_F386741960D6">
+						<memberEnd xmi:idref="EAID_dst5B53CF_762F_4436_88E6_F386741960D6"/>
+						<memberEnd xmi:idref="EAID_src5B53CF_762F_4436_88E6_F386741960D6"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src5B53CF_762F_4436_88E6_F386741960D6" association="EAID_9E5B53CF_762F_4436_88E6_F386741960D6">
+							<type xmi:idref="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_BBA3014F_919D_4de3_BCF2_6CA4F71150CA">
 						<memberEnd xmi:idref="EAID_dstA3014F_919D_4de3_BCF2_6CA4F71150CA"/>
 						<memberEnd xmi:idref="EAID_srcA3014F_919D_4de3_BCF2_6CA4F71150CA"/>
@@ -1518,90 +1983,90 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" name="epo:ContractTerm">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_2155C026_DA32_4dad_A471_35D47B85EEA0" name="epo:hasEOrdering">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000215_DA32_4dad_A471_35D47B85EEA0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000216_DA32_4dad_A471_35D47B85EEA0" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000233_DA32_4dad_A471_35D47B85EEA0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000234_DA32_4dad_A471_35D47B85EEA0" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_7CFD2A96_612A_41e4_9039_862FA1A389EE" name="epo:hasEPayment">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000217_612A_41e4_9039_862FA1A389EE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000218_612A_41e4_9039_862FA1A389EE" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000235_612A_41e4_9039_862FA1A389EE" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000236_612A_41e4_9039_862FA1A389EE" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_C68F69E0_B40A_4fed_BDA5_11FC9CBE7652" name="epo:hasOptions">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000219_B40A_4fed_BDA5_11FC9CBE7652" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000220_B40A_4fed_BDA5_11FC9CBE7652" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000237_B40A_4fed_BDA5_11FC9CBE7652" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000238_B40A_4fed_BDA5_11FC9CBE7652" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_B1732554_EAB8_45b5_865A_D1F442CCDE19" name="epo:hasEInvoicing">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000221_EAB8_45b5_865A_D1F442CCDE19" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000222_EAB8_45b5_865A_D1F442CCDE19" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000239_EAB8_45b5_865A_D1F442CCDE19" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000240_EAB8_45b5_865A_D1F442CCDE19" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_887FE424_9138_46d4_AA7B_A555B7F284A2" name="epo:isRenewalIndicator">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000223_9138_46d4_AA7B_A555B7F284A2" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000224_9138_46d4_AA7B_A555B7F284A2" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000241_9138_46d4_AA7B_A555B7F284A2" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000242_9138_46d4_AA7B_A555B7F284A2" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_CE39B253_B9A9_4b8c_8855_DCE8E0600AF6" name="epo:hasMaximumNumberOfRenewals">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000225_B9A9_4b8c_8855_DCE8E0600AF6" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000226_B9A9_4b8c_8855_DCE8E0600AF6" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000243_B9A9_4b8c_8855_DCE8E0600AF6" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000244_B9A9_4b8c_8855_DCE8E0600AF6" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_65BB134D_F373_4e7f_8BFE_5AB5D113FDD1" name="epo:hasOptionsDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000227_F373_4e7f_8BFE_5AB5D113FDD1" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000228_F373_4e7f_8BFE_5AB5D113FDD1" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000245_F373_4e7f_8BFE_5AB5D113FDD1" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000246_F373_4e7f_8BFE_5AB5D113FDD1" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_FC9100FA_377D_40f9_BFBF_D7305458427F" name="epo:hasRenewalDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000229_377D_40f9_BFBF_D7305458427F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000230_377D_40f9_BFBF_D7305458427F" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000247_377D_40f9_BFBF_D7305458427F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000248_377D_40f9_BFBF_D7305458427F" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_9ECADED3_74A7_4026_8C22_E64B96F7B965" name="epo:hasPaymentArrangement">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000231_74A7_4026_8C22_E64B96F7B965" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000232_74A7_4026_8C22_E64B96F7B965" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000249_74A7_4026_8C22_E64B96F7B965" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000250_74A7_4026_8C22_E64B96F7B965" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_5B0186A0_76CE_4f7f_81F9_D9B627E4DEA1" name="epo:hasLegalFormRequirement">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000233_76CE_4f7f_81F9_D9B627E4DEA1" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000234_76CE_4f7f_81F9_D9B627E4DEA1" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000251_76CE_4f7f_81F9_D9B627E4DEA1" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000252_76CE_4f7f_81F9_D9B627E4DEA1" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_9CCDFF8D_9E94_4367_9FC8_D27251DB20AF" name="epo:hasPlaceOfPerformanceAdditionalInformation">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000235_9E94_4367_9FC8_D27251DB20AF" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000236_9E94_4367_9FC8_D27251DB20AF" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000253_9E94_4367_9FC8_D27251DB20AF" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000254_9E94_4367_9FC8_D27251DB20AF" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_F21BEE32_174F_46a9_B3CB_00BE0B239330" name="epo:hasPerformanceConditions">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000237_174F_46a9_B3CB_00BE0B239330" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000238_174F_46a9_B3CB_00BE0B239330" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000255_174F_46a9_B3CB_00BE0B239330" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000256_174F_46a9_B3CB_00BE0B239330" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst1164A7_CB8C_462e_BBD0_75D03FADA8D8" name="epo:definesPaymentExecutor" association="EAID_001164A7_CB8C_462e_BBD0_75D03FADA8D8">
 							<type xmi:idref="EAID_C0F5DE45_CA08_46dd_AD44_E7EF577A809D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000239__CB8C_462e_BBD0_75D03FADA8D8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000240__CB8C_462e_BBD0_75D03FADA8D8" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000257__CB8C_462e_BBD0_75D03FADA8D8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000258__CB8C_462e_BBD0_75D03FADA8D8" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst1E8ADE_1698_4353_BEDB_63334B745ECB" name="epo:definesContractDuration" association="EAID_A01E8ADE_1698_4353_BEDB_63334B745ECB">
 							<type xmi:idref="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000241__1698_4353_BEDB_63334B745ECB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000242__1698_4353_BEDB_63334B745ECB" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000259__1698_4353_BEDB_63334B745ECB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000260__1698_4353_BEDB_63334B745ECB" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst2EFC84_74F8_415f_B4C7_BC3E17610EF7" name="epo:definesSpecificPlaceOfPerformance" association="EAID_A02EFC84_74F8_415f_B4C7_BC3E17610EF7">
 							<type xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000243__74F8_415f_B4C7_BC3E17610EF7" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000244__74F8_415f_B4C7_BC3E17610EF7" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000261__74F8_415f_B4C7_BC3E17610EF7" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000262__74F8_415f_B4C7_BC3E17610EF7" value="*"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_D62CD782_93C6_480f_BE3B_872E1A0882C0" general="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst93B546_502A_413a_8694_914903478877" name="epo:definesSubcontractingTerm" association="EAID_F593B546_502A_413a_8694_914903478877">
 							<type xmi:idref="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000245__502A_413a_8694_914903478877" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000246__502A_413a_8694_914903478877" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000263__502A_413a_8694_914903478877" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000264__502A_413a_8694_914903478877" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstA22183_A73E_42a1_854B_9995087470E4" name="epo:definesContractPeriod" association="EAID_FAA22183_A73E_42a1_854B_9995087470E4">
 							<type xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000247__A73E_42a1_854B_9995087470E4" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000248__A73E_42a1_854B_9995087470E4" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000265__A73E_42a1_854B_9995087470E4" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000266__A73E_42a1_854B_9995087470E4" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_001164A7_CB8C_462e_BBD0_75D03FADA8D8">
@@ -1639,36 +2104,36 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_44E7963D_28F5_4263_835A_24C87816F40C" name="epo:DesignContestRegimeTerm">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_8722EE11_CCB2_4a7b_A2C9_F47802435B26" name="epo:isJuryDecisionBinding">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000249_CCB2_4a7b_A2C9_F47802435B26" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000250_CCB2_4a7b_A2C9_F47802435B26" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000267_CCB2_4a7b_A2C9_F47802435B26" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000268_CCB2_4a7b_A2C9_F47802435B26" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_C435FFA8_C420_46bc_A3DA_63313A6F8C5E" name="epo:hasParticipationPayment">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000251_C420_46bc_A3DA_63313A6F8C5E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000252_C420_46bc_A3DA_63313A6F8C5E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000269_C420_46bc_A3DA_63313A6F8C5E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000270_C420_46bc_A3DA_63313A6F8C5E" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_8B9A7ADC_F0BE_4958_BE04_24CB02C3E3DC" name="epo:hasFollowupContract">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000253_F0BE_4958_BE04_24CB02C3E3DC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000254_F0BE_4958_BE04_24CB02C3E3DC" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000271_F0BE_4958_BE04_24CB02C3E3DC" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000272_F0BE_4958_BE04_24CB02C3E3DC" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_A0BA6EC6_89F9_4090_93D7_77B848BA8488" name="epo:hasFollowupContractInformation">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000255_89F9_4090_93D7_77B848BA8488" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000256_89F9_4090_93D7_77B848BA8488" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000273_89F9_4090_93D7_77B848BA8488" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000274_89F9_4090_93D7_77B848BA8488" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_17586F94_9491_4e26_87CA_DC841CBE6FB1" name="epo:hasDescriptionOfPrizes">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000257_9491_4e26_87CA_DC841CBE6FB1" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000258_9491_4e26_87CA_DC841CBE6FB1" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000275_9491_4e26_87CA_DC841CBE6FB1" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000276_9491_4e26_87CA_DC841CBE6FB1" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_4E161D86_3C31_466f_982A_26607071A85E" general="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_92B9F8CA_DE72_46e6_993E_46C9ED67ADFA" general="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst51F167_3C73_4e45_9F54_76A56333BE1E" name="epo:definesPrize" association="EAID_B851F167_3C73_4e45_9F54_76A56333BE1E">
 							<type xmi:idref="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000259__3C73_4e45_9F54_76A56333BE1E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000260__3C73_4e45_9F54_76A56333BE1E" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000277__3C73_4e45_9F54_76A56333BE1E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000278__3C73_4e45_9F54_76A56333BE1E" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B851F167_3C73_4e45_9F54_76A56333BE1E">
@@ -1680,19 +2145,19 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" name="epo:DirectAwardTerm">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_D287B0BA_0C10_47cd_8014_0CF056ADDCF4" name="epo:hasJustification">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000261_0C10_47cd_8014_0CF056ADDCF4" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000262_0C10_47cd_8014_0CF056ADDCF4" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000279_0C10_47cd_8014_0CF056ADDCF4" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000280_0C10_47cd_8014_0CF056ADDCF4" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst156914_725C_4a26_B380_6FDE59360DAF" name="epo:refersToPreviousProcedureLot" association="EAID_34156914_725C_4a26_B380_6FDE59360DAF">
 							<type xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000263__725C_4a26_B380_6FDE59360DAF" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000264__725C_4a26_B380_6FDE59360DAF" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000281__725C_4a26_B380_6FDE59360DAF" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000282__725C_4a26_B380_6FDE59360DAF" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst6933BC_AE5B_4536_B67E_B79F177247C7" name="epo:refersToPreviousProcedure" association="EAID_5A6933BC_AE5B_4536_B67E_B79F177247C7">
 							<type xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000265__AE5B_4536_B67E_B79F177247C7" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000266__AE5B_4536_B67E_B79F177247C7" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000283__AE5B_4536_B67E_B79F177247C7" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000284__AE5B_4536_B67E_B79F177247C7" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_A1817A7D_9F04_479b_8F89_5D58DD92BF3C" general="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
 					</packagedElement>
@@ -1714,8 +2179,8 @@
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_3B0D0A49_89AC_495b_B909_CD8CC73898DE" name="epo:DirectContract">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstBA1AAE_EBFD_419c_8F21_8256FE25DBAC" name="epo:resultsFromLotAwardOutcome" association="EAID_57BA1AAE_EBFD_419c_8F21_8256FE25DBAC">
 							<type xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000267__EBFD_419c_8F21_8256FE25DBAC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000268__EBFD_419c_8F21_8256FE25DBAC" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000285__EBFD_419c_8F21_8256FE25DBAC" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000286__EBFD_419c_8F21_8256FE25DBAC" value="*"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_7F8C9069_9D3F_4494_8C14_7C6DA83E8A46" general="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
 					</packagedElement>
@@ -1728,83 +2193,76 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" name="epo:Document">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_51F37B13_01DA_4da5_8782_30A2D193D4B4" name="dct:title">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000269_01DA_4da5_8782_30A2D193D4B4" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000270_01DA_4da5_8782_30A2D193D4B4" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000287_01DA_4da5_8782_30A2D193D4B4" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000288_01DA_4da5_8782_30A2D193D4B4" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_51725CA6_C5F4_4f21_9EF1_1A912A3B0BB5" name="epo:hasPublicationDate">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000271_C5F4_4f21_9EF1_1A912A3B0BB5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000272_C5F4_4f21_9EF1_1A912A3B0BB5" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000289_C5F4_4f21_9EF1_1A912A3B0BB5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000290_C5F4_4f21_9EF1_1A912A3B0BB5" value="1"/>
 							<type xmi:idref="EAJava_xsd_date"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_3937FE75_CD7A_4066_8A4A_E58D6D3A45F9" name="epo:hasReceptionDate">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000273_CD7A_4066_8A4A_E58D6D3A45F9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000274_CD7A_4066_8A4A_E58D6D3A45F9" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000291_CD7A_4066_8A4A_E58D6D3A45F9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000292_CD7A_4066_8A4A_E58D6D3A45F9" value="1"/>
 							<type xmi:idref="EAJava_xsd_date"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_61F89B7E_E919_4ed9_8E59_56E7A1D1DF02" name="epo:hasDispatchDate">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000275_E919_4ed9_8E59_56E7A1D1DF02" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000276_E919_4ed9_8E59_56E7A1D1DF02" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000293_E919_4ed9_8E59_56E7A1D1DF02" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000294_E919_4ed9_8E59_56E7A1D1DF02" value="1"/>
 							<type xmi:idref="EAJava_xsd_dateTime"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_BDAC9D0C_7361_4b50_A424_99670D546E07" name="dct:issued">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000277_7361_4b50_A424_99670D546E07" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000278_7361_4b50_A424_99670D546E07" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000295_7361_4b50_A424_99670D546E07" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000296_7361_4b50_A424_99670D546E07" value="1"/>
 							<type xmi:idref="EAJava_xsd_dateTime"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_BB755B85_3387_4afc_904E_98634DCB59F5" name="dct:description">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000279_3387_4afc_904E_98634DCB59F5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000280_3387_4afc_904E_98634DCB59F5" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000297_3387_4afc_904E_98634DCB59F5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000298_3387_4afc_904E_98634DCB59F5" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_F6220AE8_8F3D_4028_9A5B_A927863C6D72" name="epo:hasAccessURL">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000281_8F3D_4028_9A5B_A927863C6D72" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000282_8F3D_4028_9A5B_A927863C6D72" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000299_8F3D_4028_9A5B_A927863C6D72" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000300_8F3D_4028_9A5B_A927863C6D72" value="*"/>
 							<type xmi:idref="EAJava_xsd_anyURI"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_94717B46_992B_4a90_B977_87F24DE80620" name="epo:hasVersion">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000283_992B_4a90_B977_87F24DE80620" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000284_992B_4a90_B977_87F24DE80620" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000301_992B_4a90_B977_87F24DE80620" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000302_992B_4a90_B977_87F24DE80620" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstEBAC59_19C6_4908_B93C_EED975A6974F" name="epo:hasUUID" association="EAID_1BEBAC59_19C6_4908_B93C_EED975A6974F">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000285__19C6_4908_B93C_EED975A6974F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000286__19C6_4908_B93C_EED975A6974F" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000303__19C6_4908_B93C_EED975A6974F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000304__19C6_4908_B93C_EED975A6974F" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF3583F_0D40_4e9f_8018_10297955785C" name="epo:associatedWith" association="EAID_39F3583F_0D40_4e9f_8018_10297955785C">
 							<type xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000287__0D40_4e9f_8018_10297955785C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000288__0D40_4e9f_8018_10297955785C" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000305__0D40_4e9f_8018_10297955785C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000306__0D40_4e9f_8018_10297955785C" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstA2C83C_532C_460c_99CE_63F041A42F06" name="adms:identifier" association="EAID_3AA2C83C_532C_460c_99CE_63F041A42F06">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000289__532C_460c_99CE_63F041A42F06" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000290__532C_460c_99CE_63F041A42F06" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000307__532C_460c_99CE_63F041A42F06" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000308__532C_460c_99CE_63F041A42F06" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE6AD20_DD67_4f31_B72E_BC6C99FF3009" name="epo:hasElectronicDigest" association="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009">
 							<type xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000291__DD67_4f31_B72E_BC6C99FF3009" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000292__DD67_4f31_B72E_BC6C99FF3009" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000309__DD67_4f31_B72E_BC6C99FF3009" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000310__DD67_4f31_B72E_BC6C99FF3009" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst894735_8A0D_4eae_BCF0_75001B7FF4D0" name="epo:hasElectronicSignature" association="EAID_B1894735_8A0D_4eae_BCF0_75001B7FF4D0">
 							<type xmi:idref="EAID_4AE23ED9_1639_41e0_A758_C201E2EDE124"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000293__8A0D_4eae_BCF0_75001B7FF4D0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000294__8A0D_4eae_BCF0_75001B7FF4D0" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000311__8A0D_4eae_BCF0_75001B7FF4D0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000312__8A0D_4eae_BCF0_75001B7FF4D0" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9" name="epo:refersToPrevious" association="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9">
 							<type xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000295__45B0_449d_B8FF_34E21440DAD9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000296__45B0_449d_B8FF_34E21440DAD9" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000313__45B0_449d_B8FF_34E21440DAD9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000314__45B0_449d_B8FF_34E21440DAD9" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1BEBAC59_19C6_4908_B93C_EED975A6974F">
-						<memberEnd xmi:idref="EAID_dstEBAC59_19C6_4908_B93C_EED975A6974F"/>
-						<memberEnd xmi:idref="EAID_srcEBAC59_19C6_4908_B93C_EED975A6974F"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcEBAC59_19C6_4908_B93C_EED975A6974F" association="EAID_1BEBAC59_19C6_4908_B93C_EED975A6974F">
-							<type xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_39F3583F_0D40_4e9f_8018_10297955785C">
 						<memberEnd xmi:idref="EAID_dstF3583F_0D40_4e9f_8018_10297955785C"/>
 						<memberEnd xmi:idref="EAID_srcF3583F_0D40_4e9f_8018_10297955785C"/>
@@ -1812,13 +2270,6 @@
 							<type xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3AA2C83C_532C_460c_99CE_63F041A42F06">
-						<memberEnd xmi:idref="EAID_dstA2C83C_532C_460c_99CE_63F041A42F06"/>
-						<memberEnd xmi:idref="EAID_srcA2C83C_532C_460c_99CE_63F041A42F06"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA2C83C_532C_460c_99CE_63F041A42F06" association="EAID_3AA2C83C_532C_460c_99CE_63F041A42F06">
-							<type xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_6A9FC4EC_D843_4ffe_84A8_24E86C3ED8AF" supplier="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90" client="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009">
 						<memberEnd xmi:idref="EAID_dstE6AD20_DD67_4f31_B72E_BC6C99FF3009"/>
@@ -1870,6 +2321,37 @@
 							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" name="epo:Duration">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_9501DE7B_F539_4409_8D54_7B950268D75C" general="EAID_F8F2DEF8_6045_44d5_93B9_E57CE8023BE9"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1EA9C84A_C46F_456b_A355_DA9CD314CBA0">
+						<memberEnd xmi:idref="EAID_dstA9C84A_C46F_456b_A355_DA9CD314CBA0"/>
+						<memberEnd xmi:idref="EAID_srcA9C84A_C46F_456b_A355_DA9CD314CBA0"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA9C84A_C46F_456b_A355_DA9CD314CBA0" association="EAID_1EA9C84A_C46F_456b_A355_DA9CD314CBA0">
+							<type xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_45B983F5_7502_49f2_984C_17FF6E47F8F9">
+						<memberEnd xmi:idref="EAID_dstB983F5_7502_49f2_984C_17FF6E47F8F9"/>
+						<memberEnd xmi:idref="EAID_srcB983F5_7502_49f2_984C_17FF6E47F8F9"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB983F5_7502_49f2_984C_17FF6E47F8F9" association="EAID_45B983F5_7502_49f2_984C_17FF6E47F8F9">
+							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_EB2AC560_378D_4c18_9647_0E2E150D7463">
+						<memberEnd xmi:idref="EAID_dst2AC560_378D_4c18_9647_0E2E150D7463"/>
+						<memberEnd xmi:idref="EAID_src2AC560_378D_4c18_9647_0E2E150D7463"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2AC560_378D_4c18_9647_0E2E150D7463" association="EAID_EB2AC560_378D_4c18_9647_0E2E150D7463">
+							<type xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_EFDCE7F5_7EC7_4537_B26B_232F5FB37A9C">
+						<memberEnd xmi:idref="EAID_dstDCE7F5_7EC7_4537_B26B_232F5FB37A9C"/>
+						<memberEnd xmi:idref="EAID_srcDCE7F5_7EC7_4537_B26B_232F5FB37A9C"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDCE7F5_7EC7_4537_B26B_232F5FB37A9C" association="EAID_EFDCE7F5_7EC7_4537_B26B_232F5FB37A9C">
+							<type xmi:idref="EAID_3F572668_3AED_4090_BAB3_9047B4874154"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_C06EA401_3F55_4448_B4FF_BB7EA510A155" name="epo:DynamicPurchaseSystemTechnique">
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_4817E610_079C_4b0d_A7C8_604097CB9B2E" general="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
 					</packagedElement>
@@ -1882,8 +2364,8 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_4AE23ED9_1639_41e0_A758_C201E2EDE124" name="epo:ElectronicSignature">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_549AA19E_CB40_4af8_BF5C_1CBDD82A3E31" name="dct:description">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000297_CB40_4af8_BF5C_1CBDD82A3E31" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000298_CB40_4af8_BF5C_1CBDD82A3E31" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000315_CB40_4af8_BF5C_1CBDD82A3E31" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000316_CB40_4af8_BF5C_1CBDD82A3E31" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 					</packagedElement>
@@ -1913,13 +2395,38 @@
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_08EBA2FE_CCEA_4eec_B375_3B680C3FD97A" general="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89"/>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11" name="epo:ExpressionOfInterest">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstFE8191_9E68_4e72_AA85_FA3686506D94" name="epo:specifiesEconomicOperator" association="EAID_81FE8191_9E68_4e72_AA85_FA3686506D94">
+							<type xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000317__9E68_4e72_AA85_FA3686506D94" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000318__9E68_4e72_AA85_FA3686506D94" value="*"/>
+						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_DCD1791D_6597_41ef_AB35_766470760473" general="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF623FF_98AA_460a_A33E_F3B7832B7132" name="epo:concernsProcedure" association="EAID_DDF623FF_98AA_460a_A33E_F3B7832B7132">
+							<type xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000319__98AA_460a_A33E_F3B7832B7132" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000320__98AA_460a_A33E_F3B7832B7132" value="1"/>
+						</ownedAttribute>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_08E68AE5_54CB_40f5_8E56_373B9F10194E" supplier="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90" client="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_81FE8191_9E68_4e72_AA85_FA3686506D94">
+						<memberEnd xmi:idref="EAID_dstFE8191_9E68_4e72_AA85_FA3686506D94"/>
+						<memberEnd xmi:idref="EAID_srcFE8191_9E68_4e72_AA85_FA3686506D94"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFE8191_9E68_4e72_AA85_FA3686506D94" association="EAID_81FE8191_9E68_4e72_AA85_FA3686506D94">
+							<type xmi:idref="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_DDF623FF_98AA_460a_A33E_F3B7832B7132">
+						<memberEnd xmi:idref="EAID_dstF623FF_98AA_460a_A33E_F3B7832B7132"/>
+						<memberEnd xmi:idref="EAID_srcF623FF_98AA_460a_A33E_F3B7832B7132"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF623FF_98AA_460a_A33E_F3B7832B7132" association="EAID_DDF623FF_98AA_460a_A33E_F3B7832B7132">
+							<type xmi:idref="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11"/>
+						</ownedEnd>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029" name="epo:FrameworkAgreement">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst6B5FDE_85B9_4435_B7E7_D176E6996280" name="epo:resultsFromLotAwardOutcome" association="EAID_A96B5FDE_85B9_4435_B7E7_D176E6996280">
 							<type xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000299__85B9_4435_B7E7_D176E6996280" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000300__85B9_4435_B7E7_D176E6996280" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000321__85B9_4435_B7E7_D176E6996280" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000322__85B9_4435_B7E7_D176E6996280" value="*"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_AAE5061F_F0FE_4ca1_8447_5E708FAB9D5A" general="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
 					</packagedElement>
@@ -1942,18 +2449,18 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_FA070646_D88B_493f_96AB_8417E2069155" name="epo:FrameworkAgreementTerm">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_67939084_F3B6_4ec0_BF8C_0265A6C826AC" name="epo:hasMaximumParticipantsNumber">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000301_F3B6_4ec0_BF8C_0265A6C826AC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000302_F3B6_4ec0_BF8C_0265A6C826AC" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000323_F3B6_4ec0_BF8C_0265A6C826AC" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000324_F3B6_4ec0_BF8C_0265A6C826AC" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_E690D757_9882_4995_AD97_001D3FCBE1D3" name="epo:hasBuyerCategoryDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000303_9882_4995_AD97_001D3FCBE1D3" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000304_9882_4995_AD97_001D3FCBE1D3" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000325_9882_4995_AD97_001D3FCBE1D3" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000326_9882_4995_AD97_001D3FCBE1D3" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_30C4BAC8_B548_4f26_BC5E_4EB19B6A021A" name="epo:hasDurationExtensionJustification">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000305_B548_4f26_BC5E_4EB19B6A021A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000306_B548_4f26_BC5E_4EB19B6A021A" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000327_B548_4f26_BC5E_4EB19B6A021A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000328_B548_4f26_BC5E_4EB19B6A021A" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_6591B482_9D9E_4650_897A_253ACD64FC8A" general="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
@@ -1963,34 +2470,27 @@
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_B02CD525_7AD7_45d7_B20C_514E7B961066" supplier="EAID_2EEC390D_B44F_4505_8179_765B845FE27F" client="EAID_FA070646_D88B_493f_96AB_8417E2069155"/>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_495BBB92_468A_4f08_9330_A0C75730B97A" name="epo:Fund">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_98A72BB3_DF5F_4be0_AF69_D4FBC1D44760" name="dct:title">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000307_DF5F_4be0_AF69_D4FBC1D44760" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000308_DF5F_4be0_AF69_D4FBC1D44760" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000329_DF5F_4be0_AF69_D4FBC1D44760" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000330_DF5F_4be0_AF69_D4FBC1D44760" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_A8703CC7_1B7A_459a_86B8_A6AD56C43AA1" name="dct:description">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000309_1B7A_459a_86B8_A6AD56C43AA1" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000310_1B7A_459a_86B8_A6AD56C43AA1" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000331_1B7A_459a_86B8_A6AD56C43AA1" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000332_1B7A_459a_86B8_A6AD56C43AA1" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_1FBFD12B_B5EB_429a_B2C2_846F2F33BCEE" name="epo:hasURL">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000311_B5EB_429a_B2C2_846F2F33BCEE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000312_B5EB_429a_B2C2_846F2F33BCEE" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000333_B5EB_429a_B2C2_846F2F33BCEE" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000334_B5EB_429a_B2C2_846F2F33BCEE" value="1"/>
 							<type xmi:idref="EAJava_xsd_anyURI"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst25B2CF_BC4D_44e9_957C_60FF1C08941F" name="adms:identifier" association="EAID_ED25B2CF_BC4D_44e9_957C_60FF1C08941F">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000313__BC4D_44e9_957C_60FF1C08941F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000314__BC4D_44e9_957C_60FF1C08941F" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000335__BC4D_44e9_957C_60FF1C08941F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000336__BC4D_44e9_957C_60FF1C08941F" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_3C2D8165_83BF_498f_B03B_E256F94C76B5" supplier="EAID_62AEA02F_28F9_411d_9AF4_B6398F78199C" client="EAID_495BBB92_468A_4f08_9330_A0C75730B97A"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_ED25B2CF_BC4D_44e9_957C_60FF1C08941F">
-						<memberEnd xmi:idref="EAID_dst25B2CF_BC4D_44e9_957C_60FF1C08941F"/>
-						<memberEnd xmi:idref="EAID_src25B2CF_BC4D_44e9_957C_60FF1C08941F"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src25B2CF_BC4D_44e9_957C_60FF1C08941F" association="EAID_ED25B2CF_BC4D_44e9_957C_60FF1C08941F">
-							<type xmi:idref="EAID_495BBB92_468A_4f08_9330_A0C75730B97A"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0F625CFF_139F_4712_8BB6_681888ACB178">
 						<memberEnd xmi:idref="EAID_dst625CFF_139F_4712_8BB6_681888ACB178"/>
 						<memberEnd xmi:idref="EAID_src625CFF_139F_4712_8BB6_681888ACB178"/>
@@ -2000,8 +2500,8 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4" name="epo:GreenProcurement">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_DD6655FC_E79A_4249_A596_0EDB3DECCE55" name="epo:usesCleanVehicleDirective">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000315_E79A_4249_A596_0EDB3DECCE55" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000316_E79A_4249_A596_0EDB3DECCE55" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000337_E79A_4249_A596_0EDB3DECCE55" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000338_E79A_4249_A596_0EDB3DECCE55" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_C15E132C_206B_4dd4_976E_204541847F5F" general="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA"/>
@@ -2015,6 +2515,9 @@
 							<type xmi:idref="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_7D0E71D7_D624_4144_8134_2500CE9AB392" name="epo:IndefiniteDuration">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_F8285143_A232_43ae_AFC8_89D40A9529FD" general="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_EC3D2F66_1FC6_4b4c_AAD2_04A3726B2332" name="epo:InnovativeProcurement">
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_ADB72D59_DC72_465e_97A2_B2C5B93B0F80" general="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA"/>
 					</packagedElement>
@@ -2023,8 +2526,8 @@
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_40DE5B33_7251_4616_AC39_5B5D4DC0AF5F" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstD7352D_80E6_41e6_B85A_672AACE795E2" name="epo:playedBy" association="EAID_E3D7352D_80E6_41e6_B85A_672AACE795E2">
 							<type xmi:idref="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000317__80E6_41e6_B85A_672AACE795E2" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000318__80E6_41e6_B85A_672AACE795E2" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000339__80E6_41e6_B85A_672AACE795E2" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000340__80E6_41e6_B85A_672AACE795E2" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_E3D7352D_80E6_41e6_B85A_672AACE795E2">
@@ -2039,29 +2542,34 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" name="epo:LotAwardOutcome">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_AEA68A37_2465_4986_9670_843B221BB214" name="epo:hasNonAwardedContractTitle">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000319_2465_4986_9670_843B221BB214" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000320_2465_4986_9670_843B221BB214" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000341_2465_4986_9670_843B221BB214" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000342_2465_4986_9670_843B221BB214" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_836F6511_2E62_4d10_8AC1_07C24D6A907F" name="epo:hasNonAwardedContractNumber">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000321_2E62_4d10_8AC1_07C24D6A907F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000322_2E62_4d10_8AC1_07C24D6A907F" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000343_2E62_4d10_8AC1_07C24D6A907F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000344_2E62_4d10_8AC1_07C24D6A907F" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst87247C_598C_4f96_8D8A_71BD69D25161" name="epo:hasFrameworkAgreementMaximumValue" association="EAID_1E87247C_598C_4f96_8D8A_71BD69D25161">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000323__598C_4f96_8D8A_71BD69D25161" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000324__598C_4f96_8D8A_71BD69D25161" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000345__598C_4f96_8D8A_71BD69D25161" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000346__598C_4f96_8D8A_71BD69D25161" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF239DB_02BC_456a_934F_BBF695929296" name="epo:fulfillsStrategicProcurement" association="EAID_32F239DB_02BC_456a_934F_BBF695929296">
+							<type xmi:idref="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000347__02BC_456a_934F_BBF695929296" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000348__02BC_456a_934F_BBF695929296" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst7619CE_95A4_4f77_A6DC_62DFC84C122D" name="epo:hasApproximateFrameworkAgreementValue" association="EAID_8E7619CE_95A4_4f77_A6DC_62DFC84C122D">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000325__95A4_4f77_A6DC_62DFC84C122D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000326__95A4_4f77_A6DC_62DFC84C122D" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000349__95A4_4f77_A6DC_62DFC84C122D" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000350__95A4_4f77_A6DC_62DFC84C122D" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstBA801A_E8C8_4628_94BC_1C90816E0487" name="epo:concernsLot" association="EAID_96BA801A_E8C8_4628_94BC_1C90816E0487">
 							<type xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000327__E8C8_4628_94BC_1C90816E0487" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000328__E8C8_4628_94BC_1C90816E0487" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000351__E8C8_4628_94BC_1C90816E0487" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000352__E8C8_4628_94BC_1C90816E0487" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_F241B2E1_47C3_4512_8EBE_A60BD8ED070A" general="EAID_E7437025_771F_4143_BE33_620A29646687"/>
 					</packagedElement>
@@ -2072,6 +2580,13 @@
 							<type xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_32F239DB_02BC_456a_934F_BBF695929296">
+						<memberEnd xmi:idref="EAID_dstF239DB_02BC_456a_934F_BBF695929296"/>
+						<memberEnd xmi:idref="EAID_srcF239DB_02BC_456a_934F_BBF695929296"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF239DB_02BC_456a_934F_BBF695929296" association="EAID_32F239DB_02BC_456a_934F_BBF695929296">
+							<type xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_8E7619CE_95A4_4f77_A6DC_62DFC84C122D">
 						<memberEnd xmi:idref="EAID_dst7619CE_95A4_4f77_A6DC_62DFC84C122D"/>
 						<memberEnd xmi:idref="EAID_src7619CE_95A4_4f77_A6DC_62DFC84C122D"/>
@@ -2089,15 +2604,20 @@
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" name="epo:LotGroupAwardInformation">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstB7EE24_F987_4c92_B06C_0EA23C9FD1C7" name="epo:hasGroupFrameworkAgreementMaximumValue" association="EAID_01B7EE24_F987_4c92_B06C_0EA23C9FD1C7">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000329__F987_4c92_B06C_0EA23C9FD1C7" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000330__F987_4c92_B06C_0EA23C9FD1C7" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000353__F987_4c92_B06C_0EA23C9FD1C7" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000354__F987_4c92_B06C_0EA23C9FD1C7" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst36ABDE_C6FC_4a8d_93CA_CC7ACC63568D" name="epo:describesLotGroup" association="EAID_4B36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
 							<type xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000331__C6FC_4a8d_93CA_CC7ACC63568D" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000332__C6FC_4a8d_93CA_CC7ACC63568D" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000355__C6FC_4a8d_93CA_CC7ACC63568D" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000356__C6FC_4a8d_93CA_CC7ACC63568D" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_5ACD6A3D_7AA3_4504_8B13_015B01092BC2" general="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst90093A_076E_4f9b_9823_548DE5751CA7" name="epo:hasApproximateGroupFrameworkAgreementValue" association="EAID_F890093A_076E_4f9b_9823_548DE5751CA7">
+							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000357__076E_4f9b_9823_548DE5751CA7" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000358__076E_4f9b_9823_548DE5751CA7" value="1"/>
+						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_01B7EE24_F987_4c92_B06C_0EA23C9FD1C7">
 						<memberEnd xmi:idref="EAID_dstB7EE24_F987_4c92_B06C_0EA23C9FD1C7"/>
@@ -2113,6 +2633,13 @@
 							<type xmi:idref="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F890093A_076E_4f9b_9823_548DE5751CA7">
+						<memberEnd xmi:idref="EAID_dst90093A_076E_4f9b_9823_548DE5751CA7"/>
+						<memberEnd xmi:idref="EAID_src90093A_076E_4f9b_9823_548DE5751CA7"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src90093A_076E_4f9b_9823_548DE5751CA7" association="EAID_F890093A_076E_4f9b_9823_548DE5751CA7">
+							<type xmi:idref="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0A7EDA02_3460_4960_8D22_F25373156526">
 						<memberEnd xmi:idref="EAID_dst7EDA02_3460_4960_8D22_F25373156526"/>
 						<memberEnd xmi:idref="EAID_src7EDA02_3460_4960_8D22_F25373156526"/>
@@ -2144,6 +2671,13 @@
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" name="epo:LotSpecificTerm">
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_A96EE97A_4EB7_40ad_BB96_01E8B1F3E49F" general="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_505234FB_4CE0_475f_A94B_6552B0F5A59A">
+						<memberEnd xmi:idref="EAID_dst5234FB_4CE0_475f_A94B_6552B0F5A59A"/>
+						<memberEnd xmi:idref="EAID_src5234FB_4CE0_475f_A94B_6552B0F5A59A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src5234FB_4CE0_475f_A94B_6552B0F5A59A" association="EAID_505234FB_4CE0_475f_A94B_6552B0F5A59A">
+							<type xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7DEB98FB_35C4_4015_80BE_9C778A0BA2A5">
 						<memberEnd xmi:idref="EAID_dstEB98FB_35C4_4015_80BE_9C778A0BA2A5"/>
 						<memberEnd xmi:idref="EAID_srcEB98FB_35C4_4015_80BE_9C778A0BA2A5"/>
@@ -2164,8 +2698,8 @@
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" name="epo:MiniCompetitionAwardOutcome">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF2D4DC_7ED0_457c_8310_43761AC8295C" name="epo:resultsFromUsingCandidateList" association="EAID_0EF2D4DC_7ED0_457c_8310_43761AC8295C">
 							<type xmi:idref="EAID_6966846F_842F_4149_A95B_AE374D603608"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000333__7ED0_457c_8310_43761AC8295C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000334__7ED0_457c_8310_43761AC8295C" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000359__7ED0_457c_8310_43761AC8295C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000360__7ED0_457c_8310_43761AC8295C" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_36C907D3_6701_4489_9BBA_3C0E1D4E25A8" general="EAID_E7437025_771F_4143_BE33_620A29646687"/>
 					</packagedElement>
@@ -2183,89 +2717,455 @@
 							<type xmi:idref="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" name="epo:MonetaryValue">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_2C82F10F_E6DC_49ee_8B5D_E915D4361E9C" name="epo:hasAmountValue">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000361_E6DC_49ee_8B5D_E915D4361E9C" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000362_E6DC_49ee_8B5D_E915D4361E9C" value="1"/>
+							<type xmi:idref="EAJava_xsd_decimal"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_B53ED566_A1AF_4a19_A650_4A057D5FB465" name="epo:hasCurrencyCodeListAgencyID">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000363_A1AF_4a19_A650_4A057D5FB465" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000364_A1AF_4a19_A650_4A057D5FB465" value="*"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_9BDDFF77_87A2_428c_A675_CD62FC2FF951" name="epo:hasCurrencyCodeListAgencyName">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000365_87A2_428c_A675_CD62FC2FF951" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000366_87A2_428c_A675_CD62FC2FF951" value="*"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_81C9CD14_9DC4_4cbd_8A9D_15BCC4606424" name="epo:hasCurrencyCodeListID">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000367_9DC4_4cbd_8A9D_15BCC4606424" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000368_9DC4_4cbd_8A9D_15BCC4606424" value="*"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_E9E2A1B8_A705_4847_8FE6_3B40BD241A4B" supplier="EAID_FBD046CD_CD18_4d96_99E0_63CAC8A5D594" client="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_079E96B7_4324_4eba_B071_A8B833BDA1EF">
+						<memberEnd xmi:idref="EAID_dst9E96B7_4324_4eba_B071_A8B833BDA1EF"/>
+						<memberEnd xmi:idref="EAID_src9E96B7_4324_4eba_B071_A8B833BDA1EF"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9E96B7_4324_4eba_B071_A8B833BDA1EF" association="EAID_079E96B7_4324_4eba_B071_A8B833BDA1EF">
+							<type xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_11ACAC30_71BA_444b_B7E9_7062F4927536">
+						<memberEnd xmi:idref="EAID_dstACAC30_71BA_444b_B7E9_7062F4927536"/>
+						<memberEnd xmi:idref="EAID_srcACAC30_71BA_444b_B7E9_7062F4927536"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcACAC30_71BA_444b_B7E9_7062F4927536" association="EAID_11ACAC30_71BA_444b_B7E9_7062F4927536">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_14B7672E_A531_45a7_BB29_EB9C02AF1551">
+						<memberEnd xmi:idref="EAID_dstB7672E_A531_45a7_BB29_EB9C02AF1551"/>
+						<memberEnd xmi:idref="EAID_srcB7672E_A531_45a7_BB29_EB9C02AF1551"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB7672E_A531_45a7_BB29_EB9C02AF1551" association="EAID_14B7672E_A531_45a7_BB29_EB9C02AF1551">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_202AF5A1_B4FE_48a4_91D4_F6387465413F">
+						<memberEnd xmi:idref="EAID_dst2AF5A1_B4FE_48a4_91D4_F6387465413F"/>
+						<memberEnd xmi:idref="EAID_src2AF5A1_B4FE_48a4_91D4_F6387465413F"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2AF5A1_B4FE_48a4_91D4_F6387465413F" association="EAID_202AF5A1_B4FE_48a4_91D4_F6387465413F">
+							<type xmi:idref="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_2729D2D0_C843_497f_B19D_1727246FC1BD">
+						<memberEnd xmi:idref="EAID_dst29D2D0_C843_497f_B19D_1727246FC1BD"/>
+						<memberEnd xmi:idref="EAID_src29D2D0_C843_497f_B19D_1727246FC1BD"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src29D2D0_C843_497f_B19D_1727246FC1BD" association="EAID_2729D2D0_C843_497f_B19D_1727246FC1BD">
+							<type xmi:idref="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_29D3C49F_AF44_49ad_8519_B199CADD080B">
+						<memberEnd xmi:idref="EAID_dstD3C49F_AF44_49ad_8519_B199CADD080B"/>
+						<memberEnd xmi:idref="EAID_srcD3C49F_AF44_49ad_8519_B199CADD080B"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD3C49F_AF44_49ad_8519_B199CADD080B" association="EAID_29D3C49F_AF44_49ad_8519_B199CADD080B">
+							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_2C64F9E7_B02B_4433_AB2C_0A6E23A8559E">
+						<memberEnd xmi:idref="EAID_dst64F9E7_B02B_4433_AB2C_0A6E23A8559E"/>
+						<memberEnd xmi:idref="EAID_src64F9E7_B02B_4433_AB2C_0A6E23A8559E"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src64F9E7_B02B_4433_AB2C_0A6E23A8559E" association="EAID_2C64F9E7_B02B_4433_AB2C_0A6E23A8559E">
+							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_2E9FE66A_E025_4563_9A59_461990838D96">
+						<memberEnd xmi:idref="EAID_dst9FE66A_E025_4563_9A59_461990838D96"/>
+						<memberEnd xmi:idref="EAID_src9FE66A_E025_4563_9A59_461990838D96"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9FE66A_E025_4563_9A59_461990838D96" association="EAID_2E9FE66A_E025_4563_9A59_461990838D96">
+							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3127E296_9886_44bc_86E7_B4E433F87208">
+						<memberEnd xmi:idref="EAID_dst27E296_9886_44bc_86E7_B4E433F87208"/>
+						<memberEnd xmi:idref="EAID_src27E296_9886_44bc_86E7_B4E433F87208"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src27E296_9886_44bc_86E7_B4E433F87208" association="EAID_3127E296_9886_44bc_86E7_B4E433F87208">
+							<type xmi:idref="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_357DB7CB_140F_4167_B4ED_129923676841">
+						<memberEnd xmi:idref="EAID_dst7DB7CB_140F_4167_B4ED_129923676841"/>
+						<memberEnd xmi:idref="EAID_src7DB7CB_140F_4167_B4ED_129923676841"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src7DB7CB_140F_4167_B4ED_129923676841" association="EAID_357DB7CB_140F_4167_B4ED_129923676841">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_470D1B16_C07B_4868_91B2_799578663395">
+						<memberEnd xmi:idref="EAID_dst0D1B16_C07B_4868_91B2_799578663395"/>
+						<memberEnd xmi:idref="EAID_src0D1B16_C07B_4868_91B2_799578663395"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0D1B16_C07B_4868_91B2_799578663395" association="EAID_470D1B16_C07B_4868_91B2_799578663395">
+							<type xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_47E28283_E9BB_4790_9AB4_37A6F31DF36A">
+						<memberEnd xmi:idref="EAID_dstE28283_E9BB_4790_9AB4_37A6F31DF36A"/>
+						<memberEnd xmi:idref="EAID_srcE28283_E9BB_4790_9AB4_37A6F31DF36A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE28283_E9BB_4790_9AB4_37A6F31DF36A" association="EAID_47E28283_E9BB_4790_9AB4_37A6F31DF36A">
+							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_5009F883_10B2_4e9c_96A3_A1F92BE8EA63">
+						<memberEnd xmi:idref="EAID_dst09F883_10B2_4e9c_96A3_A1F92BE8EA63"/>
+						<memberEnd xmi:idref="EAID_src09F883_10B2_4e9c_96A3_A1F92BE8EA63"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src09F883_10B2_4e9c_96A3_A1F92BE8EA63" association="EAID_5009F883_10B2_4e9c_96A3_A1F92BE8EA63">
+							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_510F8DDB_DB12_48df_92AE_A27F7DFCCAC3">
+						<memberEnd xmi:idref="EAID_dst0F8DDB_DB12_48df_92AE_A27F7DFCCAC3"/>
+						<memberEnd xmi:idref="EAID_src0F8DDB_DB12_48df_92AE_A27F7DFCCAC3"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0F8DDB_DB12_48df_92AE_A27F7DFCCAC3" association="EAID_510F8DDB_DB12_48df_92AE_A27F7DFCCAC3">
+							<type xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_516CC611_B255_4c67_AAF8_2E19960E553F">
+						<memberEnd xmi:idref="EAID_dst6CC611_B255_4c67_AAF8_2E19960E553F"/>
+						<memberEnd xmi:idref="EAID_src6CC611_B255_4c67_AAF8_2E19960E553F"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6CC611_B255_4c67_AAF8_2E19960E553F" association="EAID_516CC611_B255_4c67_AAF8_2E19960E553F">
+							<type xmi:idref="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_55AE269D_7874_4515_A52E_6EBA9F23871A">
+						<memberEnd xmi:idref="EAID_dstAE269D_7874_4515_A52E_6EBA9F23871A"/>
+						<memberEnd xmi:idref="EAID_srcAE269D_7874_4515_A52E_6EBA9F23871A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcAE269D_7874_4515_A52E_6EBA9F23871A" association="EAID_55AE269D_7874_4515_A52E_6EBA9F23871A">
+							<type xmi:idref="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_569C582B_2F50_4a11_B7B6_50CA2F0A9B94">
+						<memberEnd xmi:idref="EAID_dst9C582B_2F50_4a11_B7B6_50CA2F0A9B94"/>
+						<memberEnd xmi:idref="EAID_src9C582B_2F50_4a11_B7B6_50CA2F0A9B94"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9C582B_2F50_4a11_B7B6_50CA2F0A9B94" association="EAID_569C582B_2F50_4a11_B7B6_50CA2F0A9B94">
+							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_5A597CB9_3064_430b_A49F_DC0D80093AA3">
+						<memberEnd xmi:idref="EAID_dst597CB9_3064_430b_A49F_DC0D80093AA3"/>
+						<memberEnd xmi:idref="EAID_src597CB9_3064_430b_A49F_DC0D80093AA3"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src597CB9_3064_430b_A49F_DC0D80093AA3" association="EAID_5A597CB9_3064_430b_A49F_DC0D80093AA3">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8">
+						<memberEnd xmi:idref="EAID_dst416646_B3CA_4c57_AD37_79213AD539C8"/>
+						<memberEnd xmi:idref="EAID_src416646_B3CA_4c57_AD37_79213AD539C8"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src416646_B3CA_4c57_AD37_79213AD539C8" association="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8">
+							<type xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_5EDC73B7_1ABC_4e6f_9003_79369EBD749D">
+						<memberEnd xmi:idref="EAID_dstDC73B7_1ABC_4e6f_9003_79369EBD749D"/>
+						<memberEnd xmi:idref="EAID_srcDC73B7_1ABC_4e6f_9003_79369EBD749D"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDC73B7_1ABC_4e6f_9003_79369EBD749D" association="EAID_5EDC73B7_1ABC_4e6f_9003_79369EBD749D">
+							<type xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_653ADA02_9DFC_48b4_A935_786F35AF2AFB">
+						<memberEnd xmi:idref="EAID_dst3ADA02_9DFC_48b4_A935_786F35AF2AFB"/>
+						<memberEnd xmi:idref="EAID_src3ADA02_9DFC_48b4_A935_786F35AF2AFB"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3ADA02_9DFC_48b4_A935_786F35AF2AFB" association="EAID_653ADA02_9DFC_48b4_A935_786F35AF2AFB">
+							<type xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6B579730_463A_4857_B85E_6B8274FE3291">
+						<memberEnd xmi:idref="EAID_dst579730_463A_4857_B85E_6B8274FE3291"/>
+						<memberEnd xmi:idref="EAID_src579730_463A_4857_B85E_6B8274FE3291"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src579730_463A_4857_B85E_6B8274FE3291" association="EAID_6B579730_463A_4857_B85E_6B8274FE3291">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6D0F07D8_06B8_43e0_AB80_8F686D5C488E">
+						<memberEnd xmi:idref="EAID_dst0F07D8_06B8_43e0_AB80_8F686D5C488E"/>
+						<memberEnd xmi:idref="EAID_src0F07D8_06B8_43e0_AB80_8F686D5C488E"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0F07D8_06B8_43e0_AB80_8F686D5C488E" association="EAID_6D0F07D8_06B8_43e0_AB80_8F686D5C488E">
+							<type xmi:idref="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7">
+						<memberEnd xmi:idref="EAID_dst92648E_ABC4_4408_B3EA_A725F5A385F7"/>
+						<memberEnd xmi:idref="EAID_src92648E_ABC4_4408_B3EA_A725F5A385F7"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src92648E_ABC4_4408_B3EA_A725F5A385F7" association="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7">
+							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_72A7614C_D179_4558_8F62_2FA41A99DF74">
+						<memberEnd xmi:idref="EAID_dstA7614C_D179_4558_8F62_2FA41A99DF74"/>
+						<memberEnd xmi:idref="EAID_srcA7614C_D179_4558_8F62_2FA41A99DF74"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA7614C_D179_4558_8F62_2FA41A99DF74" association="EAID_72A7614C_D179_4558_8F62_2FA41A99DF74">
+							<type xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_77A962A1_6ADC_4a69_9C87_1543CFCC17D9">
+						<memberEnd xmi:idref="EAID_dstA962A1_6ADC_4a69_9C87_1543CFCC17D9"/>
+						<memberEnd xmi:idref="EAID_srcA962A1_6ADC_4a69_9C87_1543CFCC17D9"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA962A1_6ADC_4a69_9C87_1543CFCC17D9" association="EAID_77A962A1_6ADC_4a69_9C87_1543CFCC17D9">
+							<type xmi:idref="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7A92C123_93F7_4d51_A677_A1E36D3B53C0">
+						<memberEnd xmi:idref="EAID_dst92C123_93F7_4d51_A677_A1E36D3B53C0"/>
+						<memberEnd xmi:idref="EAID_src92C123_93F7_4d51_A677_A1E36D3B53C0"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src92C123_93F7_4d51_A677_A1E36D3B53C0" association="EAID_7A92C123_93F7_4d51_A677_A1E36D3B53C0">
+							<type xmi:idref="EAID_93ACA540_2668_42d3_BE40_C921C05C776E"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7AAF3614_44A0_4944_8E1A_EF574D760E6F">
+						<memberEnd xmi:idref="EAID_dstAF3614_44A0_4944_8E1A_EF574D760E6F"/>
+						<memberEnd xmi:idref="EAID_srcAF3614_44A0_4944_8E1A_EF574D760E6F"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcAF3614_44A0_4944_8E1A_EF574D760E6F" association="EAID_7AAF3614_44A0_4944_8E1A_EF574D760E6F">
+							<type xmi:idref="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_87123434_C2AD_43de_925D_13E9A7667A18">
+						<memberEnd xmi:idref="EAID_dst123434_C2AD_43de_925D_13E9A7667A18"/>
+						<memberEnd xmi:idref="EAID_src123434_C2AD_43de_925D_13E9A7667A18"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src123434_C2AD_43de_925D_13E9A7667A18" association="EAID_87123434_C2AD_43de_925D_13E9A7667A18">
+							<type xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_8A3AB883_9FE4_42fd_AFC8_322B44CBDADD">
+						<memberEnd xmi:idref="EAID_dst3AB883_9FE4_42fd_AFC8_322B44CBDADD"/>
+						<memberEnd xmi:idref="EAID_src3AB883_9FE4_42fd_AFC8_322B44CBDADD"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3AB883_9FE4_42fd_AFC8_322B44CBDADD" association="EAID_8A3AB883_9FE4_42fd_AFC8_322B44CBDADD">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_8DBBB829_4470_4b0d_A142_494C41C8807D">
+						<memberEnd xmi:idref="EAID_dstBBB829_4470_4b0d_A142_494C41C8807D"/>
+						<memberEnd xmi:idref="EAID_srcBBB829_4470_4b0d_A142_494C41C8807D"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBBB829_4470_4b0d_A142_494C41C8807D" association="EAID_8DBBB829_4470_4b0d_A142_494C41C8807D">
+							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_949017B7_0159_4fe1_8469_562A93DEF12E">
+						<memberEnd xmi:idref="EAID_dst9017B7_0159_4fe1_8469_562A93DEF12E"/>
+						<memberEnd xmi:idref="EAID_src9017B7_0159_4fe1_8469_562A93DEF12E"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9017B7_0159_4fe1_8469_562A93DEF12E" association="EAID_949017B7_0159_4fe1_8469_562A93DEF12E">
+							<type xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_98D513D4_9622_4217_94D7_26E6E451AF0C">
+						<memberEnd xmi:idref="EAID_dstD513D4_9622_4217_94D7_26E6E451AF0C"/>
+						<memberEnd xmi:idref="EAID_srcD513D4_9622_4217_94D7_26E6E451AF0C"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD513D4_9622_4217_94D7_26E6E451AF0C" association="EAID_98D513D4_9622_4217_94D7_26E6E451AF0C">
+							<type xmi:idref="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9BEABBA1_FA04_4d98_97DE_5E69567FADBC">
+						<memberEnd xmi:idref="EAID_dstEABBA1_FA04_4d98_97DE_5E69567FADBC"/>
+						<memberEnd xmi:idref="EAID_srcEABBA1_FA04_4d98_97DE_5E69567FADBC"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcEABBA1_FA04_4d98_97DE_5E69567FADBC" association="EAID_9BEABBA1_FA04_4d98_97DE_5E69567FADBC">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9BF032E2_6893_45df_95FE_A08E92EA8618">
+						<memberEnd xmi:idref="EAID_dstF032E2_6893_45df_95FE_A08E92EA8618"/>
+						<memberEnd xmi:idref="EAID_srcF032E2_6893_45df_95FE_A08E92EA8618"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF032E2_6893_45df_95FE_A08E92EA8618" association="EAID_9BF032E2_6893_45df_95FE_A08E92EA8618">
+							<type xmi:idref="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A110770D_19E8_400c_A438_44EEAB172389">
+						<memberEnd xmi:idref="EAID_dst10770D_19E8_400c_A438_44EEAB172389"/>
+						<memberEnd xmi:idref="EAID_src10770D_19E8_400c_A438_44EEAB172389"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src10770D_19E8_400c_A438_44EEAB172389" association="EAID_A110770D_19E8_400c_A438_44EEAB172389">
+							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A13D1892_1403_4dcc_B7C6_33C21269E183">
+						<memberEnd xmi:idref="EAID_dst3D1892_1403_4dcc_B7C6_33C21269E183"/>
+						<memberEnd xmi:idref="EAID_src3D1892_1403_4dcc_B7C6_33C21269E183"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3D1892_1403_4dcc_B7C6_33C21269E183" association="EAID_A13D1892_1403_4dcc_B7C6_33C21269E183">
+							<type xmi:idref="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A287E36F_7CEB_4668_B1A5_01DDEE025D3A">
+						<memberEnd xmi:idref="EAID_dst87E36F_7CEB_4668_B1A5_01DDEE025D3A"/>
+						<memberEnd xmi:idref="EAID_src87E36F_7CEB_4668_B1A5_01DDEE025D3A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src87E36F_7CEB_4668_B1A5_01DDEE025D3A" association="EAID_A287E36F_7CEB_4668_B1A5_01DDEE025D3A">
+							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_AB852C7E_4390_46da_9255_1C4C8BE7B02F">
+						<memberEnd xmi:idref="EAID_dst852C7E_4390_46da_9255_1C4C8BE7B02F"/>
+						<memberEnd xmi:idref="EAID_src852C7E_4390_46da_9255_1C4C8BE7B02F"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src852C7E_4390_46da_9255_1C4C8BE7B02F" association="EAID_AB852C7E_4390_46da_9255_1C4C8BE7B02F">
+							<type xmi:idref="EAID_C215EC75_82FD_45d3_832A_B3989A897692"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC">
+						<memberEnd xmi:idref="EAID_dstC50180_5437_4a3f_9E66_5EBEFD7759BC"/>
+						<memberEnd xmi:idref="EAID_srcC50180_5437_4a3f_9E66_5EBEFD7759BC"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC50180_5437_4a3f_9E66_5EBEFD7759BC" association="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC">
+							<type xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B20953AE_CF64_46a1_9C57_33B27067739D">
+						<memberEnd xmi:idref="EAID_dst0953AE_CF64_46a1_9C57_33B27067739D"/>
+						<memberEnd xmi:idref="EAID_src0953AE_CF64_46a1_9C57_33B27067739D"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0953AE_CF64_46a1_9C57_33B27067739D" association="EAID_B20953AE_CF64_46a1_9C57_33B27067739D">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_BB64ED52_1D30_4395_ABC1_3473F1CBCDE7">
+						<memberEnd xmi:idref="EAID_dst64ED52_1D30_4395_ABC1_3473F1CBCDE7"/>
+						<memberEnd xmi:idref="EAID_src64ED52_1D30_4395_ABC1_3473F1CBCDE7"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src64ED52_1D30_4395_ABC1_3473F1CBCDE7" association="EAID_BB64ED52_1D30_4395_ABC1_3473F1CBCDE7">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C3F576CC_0DFC_40d6_86C4_6F47177DB0C6">
+						<memberEnd xmi:idref="EAID_dstF576CC_0DFC_40d6_86C4_6F47177DB0C6"/>
+						<memberEnd xmi:idref="EAID_srcF576CC_0DFC_40d6_86C4_6F47177DB0C6"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF576CC_0DFC_40d6_86C4_6F47177DB0C6" association="EAID_C3F576CC_0DFC_40d6_86C4_6F47177DB0C6">
+							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C753CDC6_88B6_449b_B44C_0F56A31472A7">
+						<memberEnd xmi:idref="EAID_dst53CDC6_88B6_449b_B44C_0F56A31472A7"/>
+						<memberEnd xmi:idref="EAID_src53CDC6_88B6_449b_B44C_0F56A31472A7"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src53CDC6_88B6_449b_B44C_0F56A31472A7" association="EAID_C753CDC6_88B6_449b_B44C_0F56A31472A7">
+							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C8D53635_0827_4589_A374_A1CFC018D076">
+						<memberEnd xmi:idref="EAID_dstD53635_0827_4589_A374_A1CFC018D076"/>
+						<memberEnd xmi:idref="EAID_srcD53635_0827_4589_A374_A1CFC018D076"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD53635_0827_4589_A374_A1CFC018D076" association="EAID_C8D53635_0827_4589_A374_A1CFC018D076">
+							<type xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_CBE972DE_D8B8_42a5_A6A1_F386873985BC">
+						<memberEnd xmi:idref="EAID_dstE972DE_D8B8_42a5_A6A1_F386873985BC"/>
+						<memberEnd xmi:idref="EAID_srcE972DE_D8B8_42a5_A6A1_F386873985BC"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE972DE_D8B8_42a5_A6A1_F386873985BC" association="EAID_CBE972DE_D8B8_42a5_A6A1_F386873985BC">
+							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D7964CE9_B09A_4855_B489_34E46CFF8E24">
+						<memberEnd xmi:idref="EAID_dst964CE9_B09A_4855_B489_34E46CFF8E24"/>
+						<memberEnd xmi:idref="EAID_src964CE9_B09A_4855_B489_34E46CFF8E24"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src964CE9_B09A_4855_B489_34E46CFF8E24" association="EAID_D7964CE9_B09A_4855_B489_34E46CFF8E24">
+							<type xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_EBC0DED2_0415_4ef8_A495_71F8920238AD">
+						<memberEnd xmi:idref="EAID_dstC0DED2_0415_4ef8_A495_71F8920238AD"/>
+						<memberEnd xmi:idref="EAID_srcC0DED2_0415_4ef8_A495_71F8920238AD"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC0DED2_0415_4ef8_A495_71F8920238AD" association="EAID_EBC0DED2_0415_4ef8_A495_71F8920238AD">
+							<type xmi:idref="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F78CF3B1_3FB3_43b9_B9AB_1FE660C3663F">
+						<memberEnd xmi:idref="EAID_dst8CF3B1_3FB3_43b9_B9AB_1FE660C3663F"/>
+						<memberEnd xmi:idref="EAID_src8CF3B1_3FB3_43b9_B9AB_1FE660C3663F"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8CF3B1_3FB3_43b9_B9AB_1FE660C3663F" association="EAID_F78CF3B1_3FB3_43b9_B9AB_1FE660C3663F">
+							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F8221739_F0D9_41f5_A179_C864AC960D8F">
+						<memberEnd xmi:idref="EAID_dst221739_F0D9_41f5_A179_C864AC960D8F"/>
+						<memberEnd xmi:idref="EAID_src221739_F0D9_41f5_A179_C864AC960D8F"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src221739_F0D9_41f5_A179_C864AC960D8F" association="EAID_F8221739_F0D9_41f5_A179_C864AC960D8F">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_3F572668_3AED_4090_BAB3_9047B4874154" name="epo:MultipleStageProcedureTerm">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_8ACB5906_2965_4815_8CDE_FB67C01F11E8" name="epo:hasMaximumNumberOfCandidates">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000335_2965_4815_8CDE_FB67C01F11E8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000336_2965_4815_8CDE_FB67C01F11E8" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000369_2965_4815_8CDE_FB67C01F11E8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000370_2965_4815_8CDE_FB67C01F11E8" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_499DE0A3_4E02_4b32_B06D_1C4F4867E9C9" name="epo:hasSuccessiveReduction">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000337_4E02_4b32_B06D_1C4F4867E9C9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000338_4E02_4b32_B06D_1C4F4867E9C9" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000371_4E02_4b32_B06D_1C4F4867E9C9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000372_4E02_4b32_B06D_1C4F4867E9C9" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_6EE62EEA_C0BD_4ca6_B28B_7D3AF3196028" name="epo:hasMinimumNumberOfCandidates">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000339_C0BD_4ca6_B28B_7D3AF3196028" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000340_C0BD_4ca6_B28B_7D3AF3196028" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000373_C0BD_4ca6_B28B_7D3AF3196028" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000374_C0BD_4ca6_B28B_7D3AF3196028" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_CE3911D1_AED3_4851_B6FA_FC23EED7B627" name="epo:hasEstimatedInvitationToTenderDate">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000341_AED3_4851_B6FA_FC23EED7B627" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000342_AED3_4851_B6FA_FC23EED7B627" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000375_AED3_4851_B6FA_FC23EED7B627" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000376_AED3_4851_B6FA_FC23EED7B627" value="1"/>
 							<type xmi:idref="EAJava_xsd_date"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_72D00562_2765_4156_8A2B_76137A9E6CBF" name="epo:hasNoNegotiationNecessary">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000343_2765_4156_8A2B_76137A9E6CBF" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000344_2765_4156_8A2B_76137A9E6CBF" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000377_2765_4156_8A2B_76137A9E6CBF" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000378_2765_4156_8A2B_76137A9E6CBF" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_28A077C1_654A_46a5_B750_B796AB4BF269" name="epo:hasEstimatedInvitationToExpressInterestDate">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000345_654A_46a5_B750_B796AB4BF269" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000346_654A_46a5_B750_B796AB4BF269" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000379_654A_46a5_B750_B796AB4BF269" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000380_654A_46a5_B750_B796AB4BF269" value="1"/>
 							<type xmi:idref="EAJava_xsd_date"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_78F1520E_CC7B_498f_B8C4_29436D9CC375" name="epo:hasQualificationSystemRenewalDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000347_CC7B_498f_B8C4_29436D9CC375" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000348_CC7B_498f_B8C4_29436D9CC375" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000381_CC7B_498f_B8C4_29436D9CC375" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000382_CC7B_498f_B8C4_29436D9CC375" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_EA8BA09A_3CC1_4c02_A5CD_27AE1D84CDDE" general="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstDCE7F5_7EC7_4537_B26B_232F5FB37A9C" name="epo:hasQualificationSystemDuration" association="EAID_EFDCE7F5_7EC7_4537_B26B_232F5FB37A9C">
 							<type xmi:idref="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000349__7EC7_4537_B26B_232F5FB37A9C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000350__7EC7_4537_B26B_232F5FB37A9C" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000383__7EC7_4537_B26B_232F5FB37A9C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000384__7EC7_4537_B26B_232F5FB37A9C" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_EFDCE7F5_7EC7_4537_B26B_232F5FB37A9C">
-						<memberEnd xmi:idref="EAID_dstDCE7F5_7EC7_4537_B26B_232F5FB37A9C"/>
-						<memberEnd xmi:idref="EAID_srcDCE7F5_7EC7_4537_B26B_232F5FB37A9C"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDCE7F5_7EC7_4537_B26B_232F5FB37A9C" association="EAID_EFDCE7F5_7EC7_4537_B26B_232F5FB37A9C">
-							<type xmi:idref="EAID_3F572668_3AED_4090_BAB3_9047B4874154"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_BA1BBA64_88B1_420e_8141_092908A95E2B" name="epo:NonDisclosureAgreementTerm">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_8F25123B_1103_4f30_A179_7C66AC754CA5" name="dct:description">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000351_1103_4f30_A179_7C66AC754CA5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000352_1103_4f30_A179_7C66AC754CA5" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000385_1103_4f30_A179_7C66AC754CA5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000386_1103_4f30_A179_7C66AC754CA5" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_3EA015F6_48CD_438f_B329_FEB32481EDA8" name="epo:isNonDisclosureAgreementRequired">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000353_48CD_438f_B329_FEB32481EDA8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000354_48CD_438f_B329_FEB32481EDA8" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000387_48CD_438f_B329_FEB32481EDA8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000388_48CD_438f_B329_FEB32481EDA8" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_AE27FB70_7F60_4b0a_84EA_F015F6FE1271" general="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_3E3C6304_E823_43a1_8914_2046342E8F96" name="epo:NonPublishedInformation">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_1AFEEB35_CA65_4203_912D_52E9A6F5BE28" name="epo:hasAccessibilityDate">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000355_CA65_4203_912D_52E9A6F5BE28" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000356_CA65_4203_912D_52E9A6F5BE28" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000389_CA65_4203_912D_52E9A6F5BE28" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000390_CA65_4203_912D_52E9A6F5BE28" value="1"/>
 							<type xmi:idref="EAJava_xsd_date"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_3CBF449C_4234_4f51_9B91_AEF3E04AF3F0" name="epo:hasConfidentialityJustification">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000357_4234_4f51_9B91_AEF3E04AF3F0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000358_4234_4f51_9B91_AEF3E04AF3F0" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000391_4234_4f51_9B91_AEF3E04AF3F0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000392_4234_4f51_9B91_AEF3E04AF3F0" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstEA813D_50A9_4b54_8B7C_0A19B505F52F" name="epo:concernsNotice" association="EAID_3FEA813D_50A9_4b54_8B7C_0A19B505F52F">
 							<type xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000359__50A9_4b54_8B7C_0A19B505F52F" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000360__50A9_4b54_8B7C_0A19B505F52F" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000393__50A9_4b54_8B7C_0A19B505F52F" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000394__50A9_4b54_8B7C_0A19B505F52F" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst5B2EA3_201D_47cb_BCF7_9C5A5DD40C4B" name="epo:relatesToEFormSectionIdentifier" association="EAID_605B2EA3_201D_47cb_BCF7_9C5A5DD40C4B">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000361__201D_47cb_BCF7_9C5A5DD40C4B" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000362__201D_47cb_BCF7_9C5A5DD40C4B" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000395__201D_47cb_BCF7_9C5A5DD40C4B" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000396__201D_47cb_BCF7_9C5A5DD40C4B" value="*"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_7D7F08FC_F309_4a60_B76D_8B1B3FFE038A" general="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
 					</packagedElement>
@@ -2276,65 +3176,58 @@
 							<type xmi:idref="EAID_3E3C6304_E823_43a1_8914_2046342E8F96"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_605B2EA3_201D_47cb_BCF7_9C5A5DD40C4B">
-						<memberEnd xmi:idref="EAID_dst5B2EA3_201D_47cb_BCF7_9C5A5DD40C4B"/>
-						<memberEnd xmi:idref="EAID_src5B2EA3_201D_47cb_BCF7_9C5A5DD40C4B"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src5B2EA3_201D_47cb_BCF7_9C5A5DD40C4B" association="EAID_605B2EA3_201D_47cb_BCF7_9C5A5DD40C4B">
-							<type xmi:idref="EAID_3E3C6304_E823_43a1_8914_2046342E8F96"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_632541C4_7CDB_4357_B46D_C59F2C5DFB96" supplier="EAID_0164D322_9C4D_4db0_BDC4_2A3D0BC53931" client="EAID_3E3C6304_E823_43a1_8914_2046342E8F96"/>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" name="epo:Notice">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_1264386A_C67E_4009_888E_552A62DE7225" name="epo:hasOJSIssueNumber">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000363_C67E_4009_888E_552A62DE7225" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000364_C67E_4009_888E_552A62DE7225" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000397_C67E_4009_888E_552A62DE7225" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000398_C67E_4009_888E_552A62DE7225" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_2BBC248F_0AEE_4e3f_B002_536AFCD78D28" name="epo:hasOJSType">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000365_0AEE_4e3f_B002_536AFCD78D28" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000366_0AEE_4e3f_B002_536AFCD78D28" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000399_0AEE_4e3f_B002_536AFCD78D28" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000400_0AEE_4e3f_B002_536AFCD78D28" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_AC36AFF2_4288_4e0c_8944_0179AA352784" name="epo:hasNoticePublicationNumber">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000367_4288_4e0c_8944_0179AA352784" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000368_4288_4e0c_8944_0179AA352784" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000401_4288_4e0c_8944_0179AA352784" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000402_4288_4e0c_8944_0179AA352784" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_41B830AF_AE4D_4902_8134_A119102AB4ED" name="epo:hasFormNumber">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000369_AE4D_4902_8134_A119102AB4ED" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000370_AE4D_4902_8134_A119102AB4ED" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000403_AE4D_4902_8134_A119102AB4ED" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000404_AE4D_4902_8134_A119102AB4ED" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_D6C37FAA_411E_4ea1_9106_C6437D14FC89" name="epo:hasEFormsSubtype">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000371_411E_4ea1_9106_C6437D14FC89" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000372_411E_4ea1_9106_C6437D14FC89" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000405_411E_4ea1_9106_C6437D14FC89" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000406_411E_4ea1_9106_C6437D14FC89" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_3F661AC2_73BE_4fb2_9DEF_E733091C3271" name="epo:hasAdditionalInformation">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000373_73BE_4fb2_9DEF_E733091C3271" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000374_73BE_4fb2_9DEF_E733091C3271" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000407_73BE_4fb2_9DEF_E733091C3271" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000408_73BE_4fb2_9DEF_E733091C3271" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_9517771D_AF11_41cd_BB0D_294796B07624" name="epo:hasESenderDispatchDate">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000375_AF11_41cd_BB0D_294796B07624" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000376_AF11_41cd_BB0D_294796B07624" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000409_AF11_41cd_BB0D_294796B07624" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000410_AF11_41cd_BB0D_294796B07624" value="1"/>
 							<type xmi:idref="EAJava_xsd_dateTime"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstB9978D_8D66_48ab_B3C3_6654ABB348DF" name="epo:refersToLot" association="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF">
 							<type xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000377__8D66_48ab_B3C3_6654ABB348DF" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000378__8D66_48ab_B3C3_6654ABB348DF" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000411__8D66_48ab_B3C3_6654ABB348DF" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000412__8D66_48ab_B3C3_6654ABB348DF" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE70932_F57C_4861_BE52_91F3F7270840" name="epo:refersToNotice" association="EAID_7EE70932_F57C_4861_BE52_91F3F7270840">
 							<type xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000379__F57C_4861_BE52_91F3F7270840" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000380__F57C_4861_BE52_91F3F7270840" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000413__F57C_4861_BE52_91F3F7270840" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000414__F57C_4861_BE52_91F3F7270840" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_A6577BAD_B1CB_4608_94A0_32241C0F50CE" general="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst55E894_651A_4a8b_A411_E8DA312BC449" name="epo:refersToProcedure" association="EAID_F955E894_651A_4a8b_A411_E8DA312BC449">
 							<type xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000381__651A_4a8b_A411_E8DA312BC449" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000382__651A_4a8b_A411_E8DA312BC449" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000415__651A_4a8b_A411_E8DA312BC449" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000416__651A_4a8b_A411_E8DA312BC449" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF">
@@ -2372,48 +3265,41 @@
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" name="epo:NoticeAwardInformation">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst9E96B7_4324_4eba_B071_A8B833BDA1EF" name="epo:hasMaximumFrameworkAgreementAwardedValue" association="EAID_079E96B7_4324_4eba_B071_A8B833BDA1EF">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000383__4324_4eba_B071_A8B833BDA1EF" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000384__4324_4eba_B071_A8B833BDA1EF" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000417__4324_4eba_B071_A8B833BDA1EF" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000418__4324_4eba_B071_A8B833BDA1EF" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF70CB6_EA38_4786_82CF_5486AAD496C1" name="epo:describesDirectAwardPrenotificationNotice" association="EAID_38F70CB6_EA38_4786_82CF_5486AAD496C1">
 							<type xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000385__EA38_4786_82CF_5486AAD496C1" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000386__EA38_4786_82CF_5486AAD496C1" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000419__EA38_4786_82CF_5486AAD496C1" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000420__EA38_4786_82CF_5486AAD496C1" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst0F8DDB_DB12_48df_92AE_A27F7DFCCAC3" name="epo:hasProcurementHighestReceivedTenderValue" association="EAID_510F8DDB_DB12_48df_92AE_A27F7DFCCAC3">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000387__DB12_48df_92AE_A27F7DFCCAC3" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000388__DB12_48df_92AE_A27F7DFCCAC3" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000421__DB12_48df_92AE_A27F7DFCCAC3" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000422__DB12_48df_92AE_A27F7DFCCAC3" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst564C5C_30DE_429b_AE68_D4CA3CC6E260" name="epo:describesResultNotice" association="EAID_59564C5C_30DE_429b_AE68_D4CA3CC6E260">
 							<type xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000389__30DE_429b_AE68_D4CA3CC6E260" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000390__30DE_429b_AE68_D4CA3CC6E260" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000423__30DE_429b_AE68_D4CA3CC6E260" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000424__30DE_429b_AE68_D4CA3CC6E260" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_5C3A7045_BE74_49aa_ADDD_37AEDF27D9E0" general="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst3ADA02_9DFC_48b4_A935_786F35AF2AFB" name="epo:hasApproximateFrameworkAgreementValue" association="EAID_653ADA02_9DFC_48b4_A935_786F35AF2AFB">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000391__9DFC_48b4_A935_786F35AF2AFB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000392__9DFC_48b4_A935_786F35AF2AFB" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000425__9DFC_48b4_A935_786F35AF2AFB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000426__9DFC_48b4_A935_786F35AF2AFB" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst9017B7_0159_4fe1_8469_562A93DEF12E" name="epo:hasProcurementLowestReceivedTenderValue" association="EAID_949017B7_0159_4fe1_8469_562A93DEF12E">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000393__0159_4fe1_8469_562A93DEF12E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000394__0159_4fe1_8469_562A93DEF12E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000427__0159_4fe1_8469_562A93DEF12E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000428__0159_4fe1_8469_562A93DEF12E" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstD53635_0827_4589_A374_A1CFC018D076" name="epo:hasTotalAwardedValue" association="EAID_C8D53635_0827_4589_A374_A1CFC018D076">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000395__0827_4589_A374_A1CFC018D076" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000396__0827_4589_A374_A1CFC018D076" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000429__0827_4589_A374_A1CFC018D076" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000430__0827_4589_A374_A1CFC018D076" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_079E96B7_4324_4eba_B071_A8B833BDA1EF">
-						<memberEnd xmi:idref="EAID_dst9E96B7_4324_4eba_B071_A8B833BDA1EF"/>
-						<memberEnd xmi:idref="EAID_src9E96B7_4324_4eba_B071_A8B833BDA1EF"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9E96B7_4324_4eba_B071_A8B833BDA1EF" association="EAID_079E96B7_4324_4eba_B071_A8B833BDA1EF">
-							<type xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_38F70CB6_EA38_4786_82CF_5486AAD496C1">
 						<memberEnd xmi:idref="EAID_dstF70CB6_EA38_4786_82CF_5486AAD496C1"/>
 						<memberEnd xmi:idref="EAID_srcF70CB6_EA38_4786_82CF_5486AAD496C1"/>
@@ -2421,13 +3307,6 @@
 							<type xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_510F8DDB_DB12_48df_92AE_A27F7DFCCAC3">
-						<memberEnd xmi:idref="EAID_dst0F8DDB_DB12_48df_92AE_A27F7DFCCAC3"/>
-						<memberEnd xmi:idref="EAID_src0F8DDB_DB12_48df_92AE_A27F7DFCCAC3"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0F8DDB_DB12_48df_92AE_A27F7DFCCAC3" association="EAID_510F8DDB_DB12_48df_92AE_A27F7DFCCAC3">
-							<type xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_59564C5C_30DE_429b_AE68_D4CA3CC6E260">
 						<memberEnd xmi:idref="EAID_dst564C5C_30DE_429b_AE68_D4CA3CC6E260"/>
 						<memberEnd xmi:idref="EAID_src564C5C_30DE_429b_AE68_D4CA3CC6E260"/>
@@ -2435,27 +3314,6 @@
 							<type xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_653ADA02_9DFC_48b4_A935_786F35AF2AFB">
-						<memberEnd xmi:idref="EAID_dst3ADA02_9DFC_48b4_A935_786F35AF2AFB"/>
-						<memberEnd xmi:idref="EAID_src3ADA02_9DFC_48b4_A935_786F35AF2AFB"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3ADA02_9DFC_48b4_A935_786F35AF2AFB" association="EAID_653ADA02_9DFC_48b4_A935_786F35AF2AFB">
-							<type xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_949017B7_0159_4fe1_8469_562A93DEF12E">
-						<memberEnd xmi:idref="EAID_dst9017B7_0159_4fe1_8469_562A93DEF12E"/>
-						<memberEnd xmi:idref="EAID_src9017B7_0159_4fe1_8469_562A93DEF12E"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9017B7_0159_4fe1_8469_562A93DEF12E" association="EAID_949017B7_0159_4fe1_8469_562A93DEF12E">
-							<type xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C8D53635_0827_4589_A374_A1CFC018D076">
-						<memberEnd xmi:idref="EAID_dstD53635_0827_4589_A374_A1CFC018D076"/>
-						<memberEnd xmi:idref="EAID_srcD53635_0827_4589_A374_A1CFC018D076"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD53635_0827_4589_A374_A1CFC018D076" association="EAID_C8D53635_0827_4589_A374_A1CFC018D076">
-							<type xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_76074F10_F8BD_4e56_929F_478C3A0B8424">
 						<memberEnd xmi:idref="EAID_dst074F10_F8BD_4e56_929F_478C3A0B8424"/>
 						<memberEnd xmi:idref="EAID_src074F10_F8BD_4e56_929F_478C3A0B8424"/>
@@ -2508,8 +3366,8 @@
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_A641D156_C668_4cc3_9877_03C8FEE30681" general="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst4261EC_B8C1_4e5a_9174_C3DEEEA32848" name="epo:distributesOffer" association="EAID_B44261EC_B8C1_4e5a_9174_C3DEEEA32848">
 							<type xmi:idref="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000397__B8C1_4e5a_9174_C3DEEEA32848" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000398__B8C1_4e5a_9174_C3DEEEA32848" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000431__B8C1_4e5a_9174_C3DEEEA32848" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000432__B8C1_4e5a_9174_C3DEEEA32848" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_A958E5F1_29FE_4263_AEBA_5D8644A7677A" name="epo:OfflineAccessProvider">
@@ -2517,26 +3375,26 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_82AA47D1_6939_4328_8108_0018817C75BD" name="epo:OpeningTerm">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_811E2A70_F2F3_45c2_BC48_C23FF1B7FF54" name="epo:hasOpeningDateTime">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000399_F2F3_45c2_BC48_C23FF1B7FF54" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000400_F2F3_45c2_BC48_C23FF1B7FF54" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000433_F2F3_45c2_BC48_C23FF1B7FF54" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000434_F2F3_45c2_BC48_C23FF1B7FF54" value="1"/>
 							<type xmi:idref="EAJava_xsd_dateTime"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_49CA1EEA_22FE_48c0_BDCC_9A83EE89165B" name="epo:hasOpeningDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000401_22FE_48c0_BDCC_9A83EE89165B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000402_22FE_48c0_BDCC_9A83EE89165B" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000435_22FE_48c0_BDCC_9A83EE89165B" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000436_22FE_48c0_BDCC_9A83EE89165B" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_AC019718_1DBC_43b2_8E36_EC4B49BEF335" name="epo:hasOpeningURL">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000403_1DBC_43b2_8E36_EC4B49BEF335" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000404_1DBC_43b2_8E36_EC4B49BEF335" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000437_1DBC_43b2_8E36_EC4B49BEF335" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000438_1DBC_43b2_8E36_EC4B49BEF335" value="1"/>
 							<type xmi:idref="EAJava_xsd_anyURI"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_15042E3E_B61C_4d75_BF56_83000481AB12" general="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_85E14E41_3BA7_4783_A633_615CD23835C1" general="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstCBD7C1_E82A_4979_98A5_58BD6A43131C" name="epo:definesOpeningPlace" association="EAID_A8CBD7C1_E82A_4979_98A5_58BD6A43131C">
 							<type xmi:idref="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000405__E82A_4979_98A5_58BD6A43131C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000406__E82A_4979_98A5_58BD6A43131C" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000439__E82A_4979_98A5_58BD6A43131C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000440__E82A_4979_98A5_58BD6A43131C" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A8CBD7C1_E82A_4979_98A5_58BD6A43131C">
@@ -2548,20 +3406,20 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" name="epo:OrganisationGroup">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_BCE985B9_9499_473a_B5FA_2C4594C6B9A0" name="epo:hasGroupType">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000407_9499_473a_B5FA_2C4594C6B9A0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000408_9499_473a_B5FA_2C4594C6B9A0" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000441_9499_473a_B5FA_2C4594C6B9A0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000442_9499_473a_B5FA_2C4594C6B9A0" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstA8BD10_946A_403c_B906_6DB183F74D9F" name="epo:hasMember" association="EAID_0AA8BD10_946A_403c_B906_6DB183F74D9F">
 							<type xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000409__946A_403c_B906_6DB183F74D9F" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000410__946A_403c_B906_6DB183F74D9F" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000443__946A_403c_B906_6DB183F74D9F" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000444__946A_403c_B906_6DB183F74D9F" value="*"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_881F7772_9A6C_4e5a_BB86_A2E25524B058" general="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF440DD_AB87_4730_A6DF_915A5FB0B3DB" name="epo:leadBy" association="EAID_F3F440DD_AB87_4730_A6DF_915A5FB0B3DB">
 							<type xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000411__AB87_4730_A6DF_915A5FB0B3DB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000412__AB87_4730_A6DF_915A5FB0B3DB" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000445__AB87_4730_A6DF_915A5FB0B3DB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000446__AB87_4730_A6DF_915A5FB0B3DB" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0AA8BD10_946A_403c_B906_6DB183F74D9F">
@@ -2597,13 +3455,13 @@
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_76DEFDDE_AF78_4e23_8B84_0C6E8B387AD5" supplier="EAID_B81F2C0E_31F9_4ec0_AC1E_A0960D618FE6" client="EAID_432BFDAD_99CD_40ab_A159_824F0F6571E2"/>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_44E6EE1C_AF22_4586_B990_EF3674BAE826" name="epo:ParticipationConditionsSummary">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_5699166A_F9A9_4ed3_8B7D_8A8A4C4E0014" name="epo:describesObjectiveParticipationRules">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000413_F9A9_4ed3_8B7D_8A8A4C4E0014" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000414_F9A9_4ed3_8B7D_8A8A4C4E0014" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000447_F9A9_4ed3_8B7D_8A8A4C4E0014" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000448_F9A9_4ed3_8B7D_8A8A4C4E0014" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_F79D34B1_CCFA_4297_8DDC_3871A35AD86D" name="epo:describesVerificationMethod">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000415_CCFA_4297_8DDC_3871A35AD86D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000416_CCFA_4297_8DDC_3871A35AD86D" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000449_CCFA_4297_8DDC_3871A35AD86D" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000450_CCFA_4297_8DDC_3871A35AD86D" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_EE3FD9AF_3712_4b11_9970_82968E7EB99F" general="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D"/>
@@ -2632,38 +3490,156 @@
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" name="epo:ParticipationRequestTerm">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst5D53F4_253B_4698_B2EF_82E934FAC2F4" name="epo:definesParticipationRequestReceiver" association="EAID_255D53F4_253B_4698_B2EF_82E934FAC2F4">
 							<type xmi:idref="EAID_9403AC67_80A3_4c77_9299_6171EF9D6788"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000417__253B_4698_B2EF_82E934FAC2F4" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000418__253B_4698_B2EF_82E934FAC2F4" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000451__253B_4698_B2EF_82E934FAC2F4" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000452__253B_4698_B2EF_82E934FAC2F4" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_41D43466_5575_4752_B3BF_0CA7ADD341E4" general="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstFE789F_365A_4f79_AABC_E6BE700C4FCC" name="epo:definesParticipationRequestProcessor" association="EAID_5CFE789F_365A_4f79_AABC_E6BE700C4FCC">
 							<type xmi:idref="EAID_572B82B3_FF4C_43b8_9C2C_09AD5D3F4615"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000419__365A_4f79_AABC_E6BE700C4FCC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000420__365A_4f79_AABC_E6BE700C4FCC" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000453__365A_4f79_AABC_E6BE700C4FCC" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000454__365A_4f79_AABC_E6BE700C4FCC" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_C0F5DE45_CA08_46dd_AD44_E7EF577A809D" name="epo:PaymentExecutor">
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_800B935D_1C60_427e_9BF3_BDFF0776A54C" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" name="epo:Period">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_C6A0334F_7F34_4839_ADEB_482CEC470A98" name="epo:hasBeginning">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000455_7F34_4839_ADEB_482CEC470A98" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000456_7F34_4839_ADEB_482CEC470A98" value="1"/>
+							<type xmi:idref="EAJava_xsd_dateTime"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_D3F00005_AF7C_45ab_927B_B38B2CEBC0D5" name="epo:hasEnd">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000457_AF7C_45ab_927B_B38B2CEBC0D5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000458_AF7C_45ab_927B_B38B2CEBC0D5" value="1"/>
+							<type xmi:idref="EAJava_xsd_dateTime"/>
+						</ownedAttribute>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_007A256B_E0B5_4a62_B8D7_2BC14F331BE5" supplier="EAID_5A01D361_6509_447f_B318_F20F23FBF81F" client="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_11C78626_167C_4c06_AF8A_1D37420731A9">
+						<memberEnd xmi:idref="EAID_dstC78626_167C_4c06_AF8A_1D37420731A9"/>
+						<memberEnd xmi:idref="EAID_srcC78626_167C_4c06_AF8A_1D37420731A9"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC78626_167C_4c06_AF8A_1D37420731A9" association="EAID_11C78626_167C_4c06_AF8A_1D37420731A9">
+							<type xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_24C53A6F_084E_4dbf_817A_1DF5BE5981D8">
+						<memberEnd xmi:idref="EAID_dstC53A6F_084E_4dbf_817A_1DF5BE5981D8"/>
+						<memberEnd xmi:idref="EAID_srcC53A6F_084E_4dbf_817A_1DF5BE5981D8"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC53A6F_084E_4dbf_817A_1DF5BE5981D8" association="EAID_24C53A6F_084E_4dbf_817A_1DF5BE5981D8">
+							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_33FC7129_7479_45ab_AECD_F356DB6C1872">
+						<memberEnd xmi:idref="EAID_dstFC7129_7479_45ab_AECD_F356DB6C1872"/>
+						<memberEnd xmi:idref="EAID_srcFC7129_7479_45ab_AECD_F356DB6C1872"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFC7129_7479_45ab_AECD_F356DB6C1872" association="EAID_33FC7129_7479_45ab_AECD_F356DB6C1872">
+							<type xmi:idref="EAID_A8D775E4_EEB9_4502_B8A1_C1DD5D555864"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3A930003_5665_43a6_9887_A78953BBB2E2">
+						<memberEnd xmi:idref="EAID_dst930003_5665_43a6_9887_A78953BBB2E2"/>
+						<memberEnd xmi:idref="EAID_src930003_5665_43a6_9887_A78953BBB2E2"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src930003_5665_43a6_9887_A78953BBB2E2" association="EAID_3A930003_5665_43a6_9887_A78953BBB2E2">
+							<type xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_45DE6A43_058C_45b5_9BD1_786F801B344D">
+						<memberEnd xmi:idref="EAID_dstDE6A43_058C_45b5_9BD1_786F801B344D"/>
+						<memberEnd xmi:idref="EAID_srcDE6A43_058C_45b5_9BD1_786F801B344D"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDE6A43_058C_45b5_9BD1_786F801B344D" association="EAID_45DE6A43_058C_45b5_9BD1_786F801B344D">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6D166D58_F0F4_4650_92D7_DAC20DD7E2F8">
+						<memberEnd xmi:idref="EAID_dst166D58_F0F4_4650_92D7_DAC20DD7E2F8"/>
+						<memberEnd xmi:idref="EAID_src166D58_F0F4_4650_92D7_DAC20DD7E2F8"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src166D58_F0F4_4650_92D7_DAC20DD7E2F8" association="EAID_6D166D58_F0F4_4650_92D7_DAC20DD7E2F8">
+							<type xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6D569FED_815F_45f4_87EA_C0E83DC5C9AF">
+						<memberEnd xmi:idref="EAID_dst569FED_815F_45f4_87EA_C0E83DC5C9AF"/>
+						<memberEnd xmi:idref="EAID_src569FED_815F_45f4_87EA_C0E83DC5C9AF"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src569FED_815F_45f4_87EA_C0E83DC5C9AF" association="EAID_6D569FED_815F_45f4_87EA_C0E83DC5C9AF">
+							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_89C3F218_90EF_42ed_B918_7EEB88718C50">
+						<memberEnd xmi:idref="EAID_dstC3F218_90EF_42ed_B918_7EEB88718C50"/>
+						<memberEnd xmi:idref="EAID_srcC3F218_90EF_42ed_B918_7EEB88718C50"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC3F218_90EF_42ed_B918_7EEB88718C50" association="EAID_89C3F218_90EF_42ed_B918_7EEB88718C50">
+							<type xmi:idref="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_8FF88923_D9FB_4937_B866_FABECBC1DB55">
+						<memberEnd xmi:idref="EAID_dstF88923_D9FB_4937_B866_FABECBC1DB55"/>
+						<memberEnd xmi:idref="EAID_srcF88923_D9FB_4937_B866_FABECBC1DB55"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF88923_D9FB_4937_B866_FABECBC1DB55" association="EAID_8FF88923_D9FB_4937_B866_FABECBC1DB55">
+							<type xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9EDDC1AB_FC05_462d_A479_433862DD01D8">
+						<memberEnd xmi:idref="EAID_dstDDC1AB_FC05_462d_A479_433862DD01D8"/>
+						<memberEnd xmi:idref="EAID_srcDDC1AB_FC05_462d_A479_433862DD01D8"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDDC1AB_FC05_462d_A479_433862DD01D8" association="EAID_9EDDC1AB_FC05_462d_A479_433862DD01D8">
+							<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B2FBB3C3_8542_4cd9_8B7E_A25D4A6C9048">
+						<memberEnd xmi:idref="EAID_dstFBB3C3_8542_4cd9_8B7E_A25D4A6C9048"/>
+						<memberEnd xmi:idref="EAID_srcFBB3C3_8542_4cd9_8B7E_A25D4A6C9048"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFBB3C3_8542_4cd9_8B7E_A25D4A6C9048" association="EAID_B2FBB3C3_8542_4cd9_8B7E_A25D4A6C9048">
+							<type xmi:idref="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D07B06AA_2E5B_4fa1_B0EA_CB49790C2AAD">
+						<memberEnd xmi:idref="EAID_dst7B06AA_2E5B_4fa1_B0EA_CB49790C2AAD"/>
+						<memberEnd xmi:idref="EAID_src7B06AA_2E5B_4fa1_B0EA_CB49790C2AAD"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src7B06AA_2E5B_4fa1_B0EA_CB49790C2AAD" association="EAID_D07B06AA_2E5B_4fa1_B0EA_CB49790C2AAD">
+							<type xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D77EAC2F_A434_424a_8ECC_D32EF06886BB">
+						<memberEnd xmi:idref="EAID_dst7EAC2F_A434_424a_8ECC_D32EF06886BB"/>
+						<memberEnd xmi:idref="EAID_src7EAC2F_A434_424a_8ECC_D32EF06886BB"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src7EAC2F_A434_424a_8ECC_D32EF06886BB" association="EAID_D77EAC2F_A434_424a_8ECC_D32EF06886BB">
+							<type xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_DCA21CBC_3D4F_480a_B24B_49A69CC51624">
+						<memberEnd xmi:idref="EAID_dstA21CBC_3D4F_480a_B24B_49A69CC51624"/>
+						<memberEnd xmi:idref="EAID_srcA21CBC_3D4F_480a_B24B_49A69CC51624"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA21CBC_3D4F_480a_B24B_49A69CC51624" association="EAID_DCA21CBC_3D4F_480a_B24B_49A69CC51624">
+							<type xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_DE5098A6_B134_4261_8994_841365A27FAB">
+						<memberEnd xmi:idref="EAID_dst5098A6_B134_4261_8994_841365A27FAB"/>
+						<memberEnd xmi:idref="EAID_src5098A6_B134_4261_8994_841365A27FAB"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src5098A6_B134_4261_8994_841365A27FAB" association="EAID_DE5098A6_B134_4261_8994_841365A27FAB">
+							<type xmi:idref="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_ED4865EB_995F_486e_A7A9_407855E7F1B8">
+						<memberEnd xmi:idref="EAID_dst4865EB_995F_486e_A7A9_407855E7F1B8"/>
+						<memberEnd xmi:idref="EAID_src4865EB_995F_486e_A7A9_407855E7F1B8"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src4865EB_995F_486e_A7A9_407855E7F1B8" association="EAID_ED4865EB_995F_486e_A7A9_407855E7F1B8">
+							<type xmi:idref="EAID_6966846F_842F_4149_A95B_AE374D603608"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496" name="epo:Prize">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_85ABB9FE_A9D2_43ed_A3E9_06F70F22D65B" name="epo:hasPrizeRank">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000421_A9D2_43ed_A3E9_06F70F22D65B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000422_A9D2_43ed_A3E9_06F70F22D65B" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000459_A9D2_43ed_A3E9_06F70F22D65B" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000460_A9D2_43ed_A3E9_06F70F22D65B" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstC0DED2_0415_4ef8_A495_71F8920238AD" name="epo:hasPrizeValue" association="EAID_EBC0DED2_0415_4ef8_A495_71F8920238AD">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000423__0415_4ef8_A495_71F8920238AD" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000424__0415_4ef8_A495_71F8920238AD" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000461__0415_4ef8_A495_71F8920238AD" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000462__0415_4ef8_A495_71F8920238AD" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_EBC0DED2_0415_4ef8_A495_71F8920238AD">
-						<memberEnd xmi:idref="EAID_dstC0DED2_0415_4ef8_A495_71F8920238AD"/>
-						<memberEnd xmi:idref="EAID_srcC0DED2_0415_4ef8_A495_71F8920238AD"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC0DED2_0415_4ef8_A495_71F8920238AD" association="EAID_EBC0DED2_0415_4ef8_A495_71F8920238AD">
-							<type xmi:idref="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" name="epo:ProcedureSpecificTerm">
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_A5B20E6A_8922_4f1d_9A94_0EFFDFC4B060" general="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
 					</packagedElement>
@@ -2676,70 +3652,70 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" name="epo:ProcedureTerm">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_17A91E5D_050A_463f_A57A_8F0E6FEE3D87" name="epo:isSubmissionForAllLotsRequired">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000425_050A_463f_A57A_8F0E6FEE3D87" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000426_050A_463f_A57A_8F0E6FEE3D87" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000463_050A_463f_A57A_8F0E6FEE3D87" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000464_050A_463f_A57A_8F0E6FEE3D87" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_DF9E5221_DEF8_48d5_8FC1_F33EBDC25F8B" name="epo:hasCrossBorderLaw">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000427_DEF8_48d5_8FC1_F33EBDC25F8B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000428_DEF8_48d5_8FC1_F33EBDC25F8B" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000465_DEF8_48d5_8FC1_F33EBDC25F8B" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000466_DEF8_48d5_8FC1_F33EBDC25F8B" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_C4727B61_BCD5_40c3_81A4_ACA3A07B5134" name="epo:isOneLotOnlyAllowed">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000429_BCD5_40c3_81A4_ACA3A07B5134" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000430_BCD5_40c3_81A4_ACA3A07B5134" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000467_BCD5_40c3_81A4_ACA3A07B5134" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000468_BCD5_40c3_81A4_ACA3A07B5134" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_87748467_D264_48e3_95D6_90F7ABDA229D" name="epo:hasGroupLotEvaluationMethod">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000431_D264_48e3_95D6_90F7ABDA229D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000432_D264_48e3_95D6_90F7ABDA229D" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000469_D264_48e3_95D6_90F7ABDA229D" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000470_D264_48e3_95D6_90F7ABDA229D" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_30775CBD_01AB_4439_BB83_85D0BD6B04BD" name="epo:isAwardedByCPB">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000433_01AB_4439_BB83_85D0BD6B04BD" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000434_01AB_4439_BB83_85D0BD6B04BD" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000471_01AB_4439_BB83_85D0BD6B04BD" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000472_01AB_4439_BB83_85D0BD6B04BD" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_8F0C600A_6541_4744_BB18_D60A02A82939" name="epo:hasMaximumLotSubmissionAllowed">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000435_6541_4744_BB18_D60A02A82939" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000436_6541_4744_BB18_D60A02A82939" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000473_6541_4744_BB18_D60A02A82939" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000474_6541_4744_BB18_D60A02A82939" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_D7695A58_E27F_49fd_9845_3793BE63D7B5" name="epo:hasLotAwardCombination">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000437_E27F_49fd_9845_3793BE63D7B5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000438_E27F_49fd_9845_3793BE63D7B5" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000475_E27F_49fd_9845_3793BE63D7B5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000476_E27F_49fd_9845_3793BE63D7B5" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_FCA9C00E_214F_4358_9D9A_285895441740" name="epo:hasMaximumNumberOfLotsToBeAwarded">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000439_214F_4358_9D9A_285895441740" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000440_214F_4358_9D9A_285895441740" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000477_214F_4358_9D9A_285895441740" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000478_214F_4358_9D9A_285895441740" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_124D7CD7_247B_42a3_AFEB_0FB9003A6A40" name="epo:hasNationalProcedureRules">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000441_247B_42a3_AFEB_0FB9003A6A40" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000442_247B_42a3_AFEB_0FB9003A6A40" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000479_247B_42a3_AFEB_0FB9003A6A40" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000480_247B_42a3_AFEB_0FB9003A6A40" value="*"/>
 							<type xmi:idref="EAJava_xsd_anyURI"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst05A6CC_6F4E_42f1_80CD_0C45E80E9AEE" name="epo:definesMediator" association="EAID_1605A6CC_6F4E_42f1_80CD_0C45E80E9AEE">
 							<type xmi:idref="EAID_A312F200_1050_451d_97BB_07EBCE11D45C"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000443__6F4E_42f1_80CD_0C45E80E9AEE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000444__6F4E_42f1_80CD_0C45E80E9AEE" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000481__6F4E_42f1_80CD_0C45E80E9AEE" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000482__6F4E_42f1_80CD_0C45E80E9AEE" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstCFA3B0_EE66_4ace_9069_38D7A3B7A01C" name="epo:definesLotGroup" association="EAID_44CFA3B0_EE66_4ace_9069_38D7A3B7A01C">
 							<type xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000445__EE66_4ace_9069_38D7A3B7A01C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000446__EE66_4ace_9069_38D7A3B7A01C" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000483__EE66_4ace_9069_38D7A3B7A01C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000484__EE66_4ace_9069_38D7A3B7A01C" value="*"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_4C36EE86_0569_4453_9E13_5EC63FC08031" general="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst9B2877_CC4F_472f_9ED2_7DCA708FAEF8" name="epo:definesBudgetProvider" association="EAID_869B2877_CC4F_472f_9ED2_7DCA708FAEF8">
 							<type xmi:idref="EAID_5696AD02_F9CD_40d0_94EC_172DCDA4EF78"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000447__CC4F_472f_9ED2_7DCA708FAEF8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000448__CC4F_472f_9ED2_7DCA708FAEF8" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000485__CC4F_472f_9ED2_7DCA708FAEF8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000486__CC4F_472f_9ED2_7DCA708FAEF8" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst8F0271_F439_4d4a_8CF1_D9F81DFCBA1A" name="epo:definesInformationProvider" association="EAID_EB8F0271_F439_4d4a_8CF1_D9F81DFCBA1A">
 							<type xmi:idref="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000449__F439_4d4a_8CF1_D9F81DFCBA1A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000450__F439_4d4a_8CF1_D9F81DFCBA1A" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000487__F439_4d4a_8CF1_D9F81DFCBA1A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000488__F439_4d4a_8CF1_D9F81DFCBA1A" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_44CFA3B0_EE66_4ace_9069_38D7A3B7A01C">
@@ -2751,26 +3727,26 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_7D5A2915_BFCE_41da_BDCF_E7310A70B190" name="epo:ProcessPlanningTerm">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_F56F0E24_8A13_4665_952E_6B5391B8B3FE" name="epo:hasEstimatedContractNoticePublicationDate">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000451_8A13_4665_952E_6B5391B8B3FE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000452_8A13_4665_952E_6B5391B8B3FE" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000489_8A13_4665_952E_6B5391B8B3FE" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000490_8A13_4665_952E_6B5391B8B3FE" value="1"/>
 							<type xmi:idref="EAJava_xsd_date"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_738C23D2_C747_4144_9A64_EB3E1F8047A9" name="epo:hasEstimatedTenderInvitationDate">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000453_C747_4144_9A64_EB3E1F8047A9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000454_C747_4144_9A64_EB3E1F8047A9" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000491_C747_4144_9A64_EB3E1F8047A9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000492_C747_4144_9A64_EB3E1F8047A9" value="1"/>
 							<type xmi:idref="EAJava_xsd_date"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_4F1C5F34_17A9_4dcc_ACCD_71AFE4011CBE" name="epo:hasAwardDateScheduled">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000455_17A9_4dcc_ACCD_71AFE4011CBE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000456_17A9_4dcc_ACCD_71AFE4011CBE" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000493_17A9_4dcc_ACCD_71AFE4011CBE" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000494_17A9_4dcc_ACCD_71AFE4011CBE" value="1"/>
 							<type xmi:idref="EAJava_xsd_date"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_01F4D5D0_A9BC_466c_B263_41FB53AE1719" general="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D" name="epo:ProcurementCriteriaSummary">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_41E8D101_053A_4b0b_93CE_CA1C3787B4A3" name="epo:indicatesPerformingStaffInformationRequirement">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000457_053A_4b0b_93CE_CA1C3787B4A3" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000458_053A_4b0b_93CE_CA1C3787B4A3" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000495_053A_4b0b_93CE_CA1C3787B4A3" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000496_053A_4b0b_93CE_CA1C3787B4A3" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_80871174_3D03_47c3_B90A_189BA5F246D6" general="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
@@ -2784,20 +3760,20 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" name="epo:ProcurementCriterion">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_29498129_14C1_458d_9A2E_B82B227E4808" name="epo:hasAdditionalInformation">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000459_14C1_458d_9A2E_B82B227E4808" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000460_14C1_458d_9A2E_B82B227E4808" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000497_14C1_458d_9A2E_B82B227E4808" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000498_14C1_458d_9A2E_B82B227E4808" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_53D15EA1_B17A_48ea_983D_0A065FE34A6C" name="epo:hasFormula">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000461_B17A_48ea_983D_0A065FE34A6C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000462_B17A_48ea_983D_0A065FE34A6C" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000499_B17A_48ea_983D_0A065FE34A6C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000500_B17A_48ea_983D_0A065FE34A6C" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_ACA750D2_84FF_4e07_B735_322F9131A442" general="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst5C20FC_D382_4766_9563_4C96020D607C" name="epo:hasConstraint" association="EAID_D65C20FC_D382_4766_9563_4C96020D607C">
 							<type xmi:idref="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000463__D382_4766_9563_4C96020D607C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000464__D382_4766_9563_4C96020D607C" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000501__D382_4766_9563_4C96020D607C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000502__D382_4766_9563_4C96020D607C" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_277C636A_D943_484f_A80D_69ACBFA6147C" supplier="EAID_D278CCD5_4E82_42f5_9A9B_C25371C94006" client="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
@@ -2831,30 +3807,30 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_1062E1ED_D094_425e_B51B_9E700090C968" name="epo:ProcurementProcessInformation">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_C93F8733_06F6_455d_A6BC_F15A85D13C7F" name="epo:isToBeRelaunched">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000465_06F6_455d_A6BC_F15A85D13C7F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000466_06F6_455d_A6BC_F15A85D13C7F" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000503_06F6_455d_A6BC_F15A85D13C7F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000504_06F6_455d_A6BC_F15A85D13C7F" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_2CF0641F_A4F5_48a8_A318_AD34638C5BB3" name="epo:isCompetitionTerminated">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000467_A4F5_48a8_A318_AD34638C5BB3" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000468_A4F5_48a8_A318_AD34638C5BB3" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000505_A4F5_48a8_A318_AD34638C5BB3" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000506_A4F5_48a8_A318_AD34638C5BB3" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_7BE6C389_5F20_46db_B56A_257BE240D92C" name="epo:isDPSTerminated">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000469_5F20_46db_B56A_257BE240D92C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000470_5F20_46db_B56A_257BE240D92C" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000507_5F20_46db_B56A_257BE240D92C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000508_5F20_46db_B56A_257BE240D92C" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_450148E7_98E2_4642_9EE2_203242F5A4D8" general="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst7715A6_6B94_492e_9116_A734400E6358" name="epo:concernsLot" association="EAID_7B7715A6_6B94_492e_9116_A734400E6358">
 							<type xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000471__6B94_492e_9116_A734400E6358" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000472__6B94_492e_9116_A734400E6358" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000509__6B94_492e_9116_A734400E6358" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000510__6B94_492e_9116_A734400E6358" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstA2D6DE_6BD5_49b4_9900_A82C2C734195" name="epo:concernsProcedure" association="EAID_ABA2D6DE_6BD5_49b4_9900_A82C2C734195">
 							<type xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000473__6BD5_49b4_9900_A82C2C734195" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000474__6BD5_49b4_9900_A82C2C734195" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000511__6BD5_49b4_9900_A82C2C734195" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000512__6BD5_49b4_9900_A82C2C734195" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7B7715A6_6B94_492e_9116_A734400E6358">
@@ -2874,8 +3850,8 @@
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_49EC0F16_408C_4b28_B611_0048946DC070" name="epo:ProcurementServiceProvider">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst14A192_0DFA_49f4_AB11_165E12CB38A6" name="epo:actsOnBehalfOf" association="EAID_4714A192_0DFA_49f4_AB11_165E12CB38A6">
 							<type xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000475__0DFA_49f4_AB11_165E12CB38A6" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000476__0DFA_49f4_AB11_165E12CB38A6" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000513__0DFA_49f4_AB11_165E12CB38A6" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000514__0DFA_49f4_AB11_165E12CB38A6" value="*"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_657CE8BE_2717_41d1_B80A_3B15D5AAC373" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
 					</packagedElement>
@@ -2888,18 +3864,18 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_CACB5357_5E4E_455f_8BFF_A7D6264C2555" name="epo:ProfessionalSuitabilitySummary">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_0DA26AD7_BE49_4db1_AA79_96A38D4F56DB" name="epo:describesProfessionRelevantLaw">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000477_BE49_4db1_AA79_96A38D4F56DB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000478_BE49_4db1_AA79_96A38D4F56DB" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000515_BE49_4db1_AA79_96A38D4F56DB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000516_BE49_4db1_AA79_96A38D4F56DB" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_85DA2813_C14D_4de1_BF7F_2C1F3E0C5D6F" name="epo:hasServiceReservedToParticularProfession">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000479_C14D_4de1_BF7F_2C1F3E0C5D6F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000480_C14D_4de1_BF7F_2C1F3E0C5D6F" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000517_C14D_4de1_BF7F_2C1F3E0C5D6F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000518_C14D_4de1_BF7F_2C1F3E0C5D6F" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_F84EB591_D812_40e9_A95F_3E051ECF3AE8" name="epo:describesProfession">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000481_D812_40e9_A95F_3E051ECF3AE8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000482_D812_40e9_A95F_3E051ECF3AE8" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000519_D812_40e9_A95F_3E051ECF3AE8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000520_D812_40e9_A95F_3E051ECF3AE8" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_4A4C0A9C_E865_4a6a_B108_12037190211E" general="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB"/>
@@ -2907,17 +3883,10 @@
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4" name="epo:Project">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst04B8A5_6281_4f14_8017_204CCE05A2CC" name="adms:identifier" association="EAID_EC04B8A5_6281_4f14_8017_204CCE05A2CC">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000483__6281_4f14_8017_204CCE05A2CC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000484__6281_4f14_8017_204CCE05A2CC" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000521__6281_4f14_8017_204CCE05A2CC" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000522__6281_4f14_8017_204CCE05A2CC" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_EC04B8A5_6281_4f14_8017_204CCE05A2CC">
-						<memberEnd xmi:idref="EAID_dst04B8A5_6281_4f14_8017_204CCE05A2CC"/>
-						<memberEnd xmi:idref="EAID_src04B8A5_6281_4f14_8017_204CCE05A2CC"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src04B8A5_6281_4f14_8017_204CCE05A2CC" association="EAID_EC04B8A5_6281_4f14_8017_204CCE05A2CC">
-							<type xmi:idref="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9866393B_8067_4f18_9B28_69541B862505">
 						<memberEnd xmi:idref="EAID_dst66393B_8067_4f18_9B28_69541B862505"/>
 						<memberEnd xmi:idref="EAID_src66393B_8067_4f18_9B28_69541B862505"/>
@@ -2925,28 +3894,35 @@
 							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D8A21C51_ABAE_473e_819D_1729AC275BCF">
+						<memberEnd xmi:idref="EAID_dstA21C51_ABAE_473e_819D_1729AC275BCF"/>
+						<memberEnd xmi:idref="EAID_srcA21C51_ABAE_473e_819D_1729AC275BCF"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA21C51_ABAE_473e_819D_1729AC275BCF" association="EAID_D8A21C51_ABAE_473e_819D_1729AC275BCF">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8" name="epo:PurchaseContract">
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_3675E499_10A4_457e_9458_83E0C40CEC9A" general="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst8065CA_2D18_479d_95EB_23D106ED6921" name="epo:followsRulesSetBy" association="EAID_D68065CA_2D18_479d_95EB_23D106ED6921">
 							<type xmi:idref="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000485__2D18_479d_95EB_23D106ED6921" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000486__2D18_479d_95EB_23D106ED6921" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000523__2D18_479d_95EB_23D106ED6921" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000524__2D18_479d_95EB_23D106ED6921" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst75C037_BE4C_49d2_A743_BAD5FFBD3003" name="epo:resultsFromMiniCompetitionAwardOutcome" association="EAID_FF75C037_BE4C_49d2_A743_BAD5FFBD3003">
 							<type xmi:idref="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000487__BE4C_49d2_A743_BAD5FFBD3003" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000488__BE4C_49d2_A743_BAD5FFBD3003" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000525__BE4C_49d2_A743_BAD5FFBD3003" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000526__BE4C_49d2_A743_BAD5FFBD3003" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89" name="epo:QualificationCriteriaSummary">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_91A9B7A4_DF99_409a_B7EC_1F11AB228F3E" name="epo:hasQualificationCondition">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000489_DF99_409a_B7EC_1F11AB228F3E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000490_DF99_409a_B7EC_1F11AB228F3E" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000527_DF99_409a_B7EC_1F11AB228F3E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000528_DF99_409a_B7EC_1F11AB228F3E" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_EB158250_E9F3_442e_8CF7_7CC26E757EE5" name="epo:hasConditionVerificationMethod">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000491_E9F3_442e_8CF7_7CC26E757EE5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000492_E9F3_442e_8CF7_7CC26E757EE5" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000529_E9F3_442e_8CF7_7CC26E757EE5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000530_E9F3_442e_8CF7_7CC26E757EE5" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_48B39F0F_A79C_4ac8_995B_59C79DE365BD" general="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D"/>
@@ -2955,8 +3931,8 @@
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_03FC1FD2_BDF5_4ae5_8D8D_679E9486EE84" general="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst4862A6_080C_43b0_8DCE_04D577B2D3F0" name="epo:includesNationalCriterion" association="EAID_A04862A6_080C_43b0_8DCE_04D577B2D3F0">
 							<type xmi:idref="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000493__080C_43b0_8DCE_04D577B2D3F0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000494__080C_43b0_8DCE_04D577B2D3F0" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000531__080C_43b0_8DCE_04D577B2D3F0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000532__080C_43b0_8DCE_04D577B2D3F0" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A04862A6_080C_43b0_8DCE_04D577B2D3F0">
@@ -2966,6 +3942,271 @@
 							<type xmi:idref="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" name="epo:Quantity">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_439A021A_4789_4775_8650_9C585138E43E" name="epo:hasQuantityValue">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000533_4789_4775_8650_9C585138E43E" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000534_4789_4775_8650_9C585138E43E" value="1"/>
+							<type xmi:idref="EAJava_xsd_decimal"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_27144131_8BB5_4491_A8AD_C3C93FA46553" name="epo:hasUnitDescription">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000535_8BB5_4491_A8AD_C3C93FA46553" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000536_8BB5_4491_A8AD_C3C93FA46553" value="*"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_30CBA4D5_2CA0_4043_A8BC_8FBCF102380D" supplier="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3" client="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0167DB54_9519_42f6_BD3B_F46B589F376C">
+						<memberEnd xmi:idref="EAID_dst67DB54_9519_42f6_BD3B_F46B589F376C"/>
+						<memberEnd xmi:idref="EAID_src67DB54_9519_42f6_BD3B_F46B589F376C"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src67DB54_9519_42f6_BD3B_F46B589F376C" association="EAID_0167DB54_9519_42f6_BD3B_F46B589F376C">
+							<type xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_05490F76_8D40_4d74_97D4_F3871039E80A">
+						<memberEnd xmi:idref="EAID_dst490F76_8D40_4d74_97D4_F3871039E80A"/>
+						<memberEnd xmi:idref="EAID_src490F76_8D40_4d74_97D4_F3871039E80A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src490F76_8D40_4d74_97D4_F3871039E80A" association="EAID_05490F76_8D40_4d74_97D4_F3871039E80A">
+							<type xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0AC5D04E_7364_4118_9D94_CE93A68B3CF9">
+						<memberEnd xmi:idref="EAID_dstC5D04E_7364_4118_9D94_CE93A68B3CF9"/>
+						<memberEnd xmi:idref="EAID_srcC5D04E_7364_4118_9D94_CE93A68B3CF9"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC5D04E_7364_4118_9D94_CE93A68B3CF9" association="EAID_0AC5D04E_7364_4118_9D94_CE93A68B3CF9">
+							<type xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0F1AB34D_EA8C_44fb_B232_AA4B138F066B">
+						<memberEnd xmi:idref="EAID_dst1AB34D_EA8C_44fb_B232_AA4B138F066B"/>
+						<memberEnd xmi:idref="EAID_src1AB34D_EA8C_44fb_B232_AA4B138F066B"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src1AB34D_EA8C_44fb_B232_AA4B138F066B" association="EAID_0F1AB34D_EA8C_44fb_B232_AA4B138F066B">
+							<type xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_11D3CF7A_4949_410c_A7E5_91AB91646B43">
+						<memberEnd xmi:idref="EAID_dstD3CF7A_4949_410c_A7E5_91AB91646B43"/>
+						<memberEnd xmi:idref="EAID_srcD3CF7A_4949_410c_A7E5_91AB91646B43"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD3CF7A_4949_410c_A7E5_91AB91646B43" association="EAID_11D3CF7A_4949_410c_A7E5_91AB91646B43">
+							<type xmi:idref="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1F622DE3_2DEE_491f_A5F1_B592E89F9030">
+						<memberEnd xmi:idref="EAID_dst622DE3_2DEE_491f_A5F1_B592E89F9030"/>
+						<memberEnd xmi:idref="EAID_src622DE3_2DEE_491f_A5F1_B592E89F9030"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src622DE3_2DEE_491f_A5F1_B592E89F9030" association="EAID_1F622DE3_2DEE_491f_A5F1_B592E89F9030">
+							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_2ECAEC7F_2186_4280_A2C0_6DC585D1EE96">
+						<memberEnd xmi:idref="EAID_dstCAEC7F_2186_4280_A2C0_6DC585D1EE96"/>
+						<memberEnd xmi:idref="EAID_srcCAEC7F_2186_4280_A2C0_6DC585D1EE96"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCAEC7F_2186_4280_A2C0_6DC585D1EE96" association="EAID_2ECAEC7F_2186_4280_A2C0_6DC585D1EE96">
+							<type xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_30A83FCD_B7E1_4f9c_95D1_48B460BCC4B8">
+						<memberEnd xmi:idref="EAID_dstA83FCD_B7E1_4f9c_95D1_48B460BCC4B8"/>
+						<memberEnd xmi:idref="EAID_srcA83FCD_B7E1_4f9c_95D1_48B460BCC4B8"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA83FCD_B7E1_4f9c_95D1_48B460BCC4B8" association="EAID_30A83FCD_B7E1_4f9c_95D1_48B460BCC4B8">
+							<type xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65">
+						<memberEnd xmi:idref="EAID_dst9E2AC7_4D59_4119_A715_C0AF0EF80B65"/>
+						<memberEnd xmi:idref="EAID_src9E2AC7_4D59_4119_A715_C0AF0EF80B65"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9E2AC7_4D59_4119_A715_C0AF0EF80B65" association="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65">
+							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3D54F6F9_658D_40fe_9D16_D79F46DB945C">
+						<memberEnd xmi:idref="EAID_dst54F6F9_658D_40fe_9D16_D79F46DB945C"/>
+						<memberEnd xmi:idref="EAID_src54F6F9_658D_40fe_9D16_D79F46DB945C"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src54F6F9_658D_40fe_9D16_D79F46DB945C" association="EAID_3D54F6F9_658D_40fe_9D16_D79F46DB945C">
+							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_45480564_D6B2_41da_8694_DC63D52825C1">
+						<memberEnd xmi:idref="EAID_dst480564_D6B2_41da_8694_DC63D52825C1"/>
+						<memberEnd xmi:idref="EAID_src480564_D6B2_41da_8694_DC63D52825C1"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src480564_D6B2_41da_8694_DC63D52825C1" association="EAID_45480564_D6B2_41da_8694_DC63D52825C1">
+							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_4BA4CF11_20FC_48b0_A739_471F732B8482">
+						<memberEnd xmi:idref="EAID_dstA4CF11_20FC_48b0_A739_471F732B8482"/>
+						<memberEnd xmi:idref="EAID_srcA4CF11_20FC_48b0_A739_471F732B8482"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA4CF11_20FC_48b0_A739_471F732B8482" association="EAID_4BA4CF11_20FC_48b0_A739_471F732B8482">
+							<type xmi:idref="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_55AE0CEF_3CD9_464a_82E7_387507253B10">
+						<memberEnd xmi:idref="EAID_dstAE0CEF_3CD9_464a_82E7_387507253B10"/>
+						<memberEnd xmi:idref="EAID_srcAE0CEF_3CD9_464a_82E7_387507253B10"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcAE0CEF_3CD9_464a_82E7_387507253B10" association="EAID_55AE0CEF_3CD9_464a_82E7_387507253B10">
+							<type xmi:idref="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_5C5BD66A_585D_4646_9A7B_894EA99DED44">
+						<memberEnd xmi:idref="EAID_dst5BD66A_585D_4646_9A7B_894EA99DED44"/>
+						<memberEnd xmi:idref="EAID_src5BD66A_585D_4646_9A7B_894EA99DED44"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src5BD66A_585D_4646_9A7B_894EA99DED44" association="EAID_5C5BD66A_585D_4646_9A7B_894EA99DED44">
+							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_65E8EC44_CB4C_4aa9_8218_75D01ED44538">
+						<memberEnd xmi:idref="EAID_dstE8EC44_CB4C_4aa9_8218_75D01ED44538"/>
+						<memberEnd xmi:idref="EAID_srcE8EC44_CB4C_4aa9_8218_75D01ED44538"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE8EC44_CB4C_4aa9_8218_75D01ED44538" association="EAID_65E8EC44_CB4C_4aa9_8218_75D01ED44538">
+							<type xmi:idref="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_73E249AD_BE82_405c_AC1C_956CD538804F">
+						<memberEnd xmi:idref="EAID_dstE249AD_BE82_405c_AC1C_956CD538804F"/>
+						<memberEnd xmi:idref="EAID_srcE249AD_BE82_405c_AC1C_956CD538804F"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE249AD_BE82_405c_AC1C_956CD538804F" association="EAID_73E249AD_BE82_405c_AC1C_956CD538804F">
+							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_75378C4F_ABAD_440f_8E1B_502A7CDA0486">
+						<memberEnd xmi:idref="EAID_dst378C4F_ABAD_440f_8E1B_502A7CDA0486"/>
+						<memberEnd xmi:idref="EAID_src378C4F_ABAD_440f_8E1B_502A7CDA0486"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src378C4F_ABAD_440f_8E1B_502A7CDA0486" association="EAID_75378C4F_ABAD_440f_8E1B_502A7CDA0486">
+							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_76005691_B905_4be3_99BF_394E56A591CE">
+						<memberEnd xmi:idref="EAID_dst005691_B905_4be3_99BF_394E56A591CE"/>
+						<memberEnd xmi:idref="EAID_src005691_B905_4be3_99BF_394E56A591CE"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src005691_B905_4be3_99BF_394E56A591CE" association="EAID_76005691_B905_4be3_99BF_394E56A591CE">
+							<type xmi:idref="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_770594A4_09FD_4b6e_8D27_8D44BA5CA36A">
+						<memberEnd xmi:idref="EAID_dst0594A4_09FD_4b6e_8D27_8D44BA5CA36A"/>
+						<memberEnd xmi:idref="EAID_src0594A4_09FD_4b6e_8D27_8D44BA5CA36A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0594A4_09FD_4b6e_8D27_8D44BA5CA36A" association="EAID_770594A4_09FD_4b6e_8D27_8D44BA5CA36A">
+							<type xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_838E60F9_C54C_4c80_88A3_D705701F1971">
+						<memberEnd xmi:idref="EAID_dst8E60F9_C54C_4c80_88A3_D705701F1971"/>
+						<memberEnd xmi:idref="EAID_src8E60F9_C54C_4c80_88A3_D705701F1971"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8E60F9_C54C_4c80_88A3_D705701F1971" association="EAID_838E60F9_C54C_4c80_88A3_D705701F1971">
+							<type xmi:idref="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_87C6E00F_DAEB_4e79_8340_AC2FC83206DA">
+						<memberEnd xmi:idref="EAID_dstC6E00F_DAEB_4e79_8340_AC2FC83206DA"/>
+						<memberEnd xmi:idref="EAID_srcC6E00F_DAEB_4e79_8340_AC2FC83206DA"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC6E00F_DAEB_4e79_8340_AC2FC83206DA" association="EAID_87C6E00F_DAEB_4e79_8340_AC2FC83206DA">
+							<type xmi:idref="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_87DEA454_B158_4e44_91D6_F1D258049A37">
+						<memberEnd xmi:idref="EAID_dstDEA454_B158_4e44_91D6_F1D258049A37"/>
+						<memberEnd xmi:idref="EAID_srcDEA454_B158_4e44_91D6_F1D258049A37"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDEA454_B158_4e44_91D6_F1D258049A37" association="EAID_87DEA454_B158_4e44_91D6_F1D258049A37">
+							<type xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_8C56C81B_B46D_49ef_B3BF_333FDA416F39">
+						<memberEnd xmi:idref="EAID_dst56C81B_B46D_49ef_B3BF_333FDA416F39"/>
+						<memberEnd xmi:idref="EAID_src56C81B_B46D_49ef_B3BF_333FDA416F39"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src56C81B_B46D_49ef_B3BF_333FDA416F39" association="EAID_8C56C81B_B46D_49ef_B3BF_333FDA416F39">
+							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_95D24239_8F4D_44c8_97D1_1C26296607DA">
+						<memberEnd xmi:idref="EAID_dstD24239_8F4D_44c8_97D1_1C26296607DA"/>
+						<memberEnd xmi:idref="EAID_srcD24239_8F4D_44c8_97D1_1C26296607DA"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD24239_8F4D_44c8_97D1_1C26296607DA" association="EAID_95D24239_8F4D_44c8_97D1_1C26296607DA">
+							<type xmi:idref="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9EA3B8C3_695C_4b42_8481_D40EEC904171">
+						<memberEnd xmi:idref="EAID_dstA3B8C3_695C_4b42_8481_D40EEC904171"/>
+						<memberEnd xmi:idref="EAID_srcA3B8C3_695C_4b42_8481_D40EEC904171"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA3B8C3_695C_4b42_8481_D40EEC904171" association="EAID_9EA3B8C3_695C_4b42_8481_D40EEC904171">
+							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A0FABF7A_1814_4dd4_BD97_28BD0C9F2F49">
+						<memberEnd xmi:idref="EAID_dstFABF7A_1814_4dd4_BD97_28BD0C9F2F49"/>
+						<memberEnd xmi:idref="EAID_srcFABF7A_1814_4dd4_BD97_28BD0C9F2F49"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFABF7A_1814_4dd4_BD97_28BD0C9F2F49" association="EAID_A0FABF7A_1814_4dd4_BD97_28BD0C9F2F49">
+							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B1577190_0947_4041_ACDC_BC0C377734AF">
+						<memberEnd xmi:idref="EAID_dst577190_0947_4041_ACDC_BC0C377734AF"/>
+						<memberEnd xmi:idref="EAID_src577190_0947_4041_ACDC_BC0C377734AF"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src577190_0947_4041_ACDC_BC0C377734AF" association="EAID_B1577190_0947_4041_ACDC_BC0C377734AF">
+							<type xmi:idref="EAID_BB1AAA4C_E66B_4fde_A0B6_1A30FC13503B"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B4F0448C_1741_4b38_9973_F506CB883BA2">
+						<memberEnd xmi:idref="EAID_dstF0448C_1741_4b38_9973_F506CB883BA2"/>
+						<memberEnd xmi:idref="EAID_srcF0448C_1741_4b38_9973_F506CB883BA2"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF0448C_1741_4b38_9973_F506CB883BA2" association="EAID_B4F0448C_1741_4b38_9973_F506CB883BA2">
+							<type xmi:idref="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B9C9C412_36FA_46d5_AA00_34CA1CC60CA2">
+						<memberEnd xmi:idref="EAID_dstC9C412_36FA_46d5_AA00_34CA1CC60CA2"/>
+						<memberEnd xmi:idref="EAID_srcC9C412_36FA_46d5_AA00_34CA1CC60CA2"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC9C412_36FA_46d5_AA00_34CA1CC60CA2" association="EAID_B9C9C412_36FA_46d5_AA00_34CA1CC60CA2">
+							<type xmi:idref="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C5E4577A_5BDB_4176_9418_BB9B2E957222">
+						<memberEnd xmi:idref="EAID_dstE4577A_5BDB_4176_9418_BB9B2E957222"/>
+						<memberEnd xmi:idref="EAID_srcE4577A_5BDB_4176_9418_BB9B2E957222"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE4577A_5BDB_4176_9418_BB9B2E957222" association="EAID_C5E4577A_5BDB_4176_9418_BB9B2E957222">
+							<type xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_E93A74BB_614F_4b1c_AE59_F45CD626BB7A">
+						<memberEnd xmi:idref="EAID_dst3A74BB_614F_4b1c_AE59_F45CD626BB7A"/>
+						<memberEnd xmi:idref="EAID_src3A74BB_614F_4b1c_AE59_F45CD626BB7A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3A74BB_614F_4b1c_AE59_F45CD626BB7A" association="EAID_E93A74BB_614F_4b1c_AE59_F45CD626BB7A">
+							<type xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F475E438_48A3_41f5_A736_268C91FF8AF2">
+						<memberEnd xmi:idref="EAID_dst75E438_48A3_41f5_A736_268C91FF8AF2"/>
+						<memberEnd xmi:idref="EAID_src75E438_48A3_41f5_A736_268C91FF8AF2"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src75E438_48A3_41f5_A736_268C91FF8AF2" association="EAID_F475E438_48A3_41f5_A736_268C91FF8AF2">
+							<type xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F70CA1D5_5E5E_4028_8583_6B810BB672CD">
+						<memberEnd xmi:idref="EAID_dst0CA1D5_5E5E_4028_8583_6B810BB672CD"/>
+						<memberEnd xmi:idref="EAID_src0CA1D5_5E5E_4028_8583_6B810BB672CD"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0CA1D5_5E5E_4028_8583_6B810BB672CD" association="EAID_F70CA1D5_5E5E_4028_8583_6B810BB672CD">
+							<type xmi:idref="EAID_BB1AAA4C_E66B_4fde_A0B6_1A30FC13503B"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F93A2AAD_C014_4fa4_88EE_23DE2339DB3C">
+						<memberEnd xmi:idref="EAID_dst3A2AAD_C014_4fa4_88EE_23DE2339DB3C"/>
+						<memberEnd xmi:idref="EAID_src3A2AAD_C014_4fa4_88EE_23DE2339DB3C"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3A2AAD_C014_4fa4_88EE_23DE2339DB3C" association="EAID_F93A2AAD_C014_4fa4_88EE_23DE2339DB3C">
+							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F9F5CFA7_D31A_4c48_80EF_346FB3152195">
+						<memberEnd xmi:idref="EAID_dstF5CFA7_D31A_4c48_80EF_346FB3152195"/>
+						<memberEnd xmi:idref="EAID_srcF5CFA7_D31A_4c48_80EF_346FB3152195"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF5CFA7_D31A_4c48_80EF_346FB3152195" association="EAID_F9F5CFA7_D31A_4c48_80EF_346FB3152195">
+							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_FA2388C8_1471_4d6b_9B9F_2E0BBE858668">
+						<memberEnd xmi:idref="EAID_dst2388C8_1471_4d6b_9B9F_2E0BBE858668"/>
+						<memberEnd xmi:idref="EAID_src2388C8_1471_4d6b_9B9F_2E0BBE858668"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2388C8_1471_4d6b_9B9F_2E0BBE858668" association="EAID_FA2388C8_1471_4d6b_9B9F_2E0BBE858668">
+							<type xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_A91B204C_7A0E_4608_A8D0_545E069052CC" name="epo:RequestForClarification">
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_7CBD3DD0_176F_4d6c_8821_DE0368FF9C47" general="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
 					</packagedElement>
@@ -2974,20 +4215,20 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" name="epo:ReviewDecision">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_E6D7A48F_CB77_4e9d_93C3_62DD41ADF53D" name="epo:hasDecisionDate">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000495_CB77_4e9d_93C3_62DD41ADF53D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000496_CB77_4e9d_93C3_62DD41ADF53D" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000537_CB77_4e9d_93C3_62DD41ADF53D" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000538_CB77_4e9d_93C3_62DD41ADF53D" value="1"/>
 							<type xmi:idref="EAJava_xsd_date"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_7B3A32F2_68B4_4cca_AA0C_F4AAB1D0346B" general="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst63763E_2F48_4952_926C_444F368462AA" name="epo:resolvesReviewRequest" association="EAID_9663763E_2F48_4952_926C_444F368462AA">
 							<type xmi:idref="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000497__2F48_4952_926C_444F368462AA" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000498__2F48_4952_926C_444F368462AA" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000539__2F48_4952_926C_444F368462AA" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000540__2F48_4952_926C_444F368462AA" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst3D1892_1403_4dcc_B7C6_33C21269E183" name="epo:hasRemedyValue" association="EAID_A13D1892_1403_4dcc_B7C6_33C21269E183">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000499__1403_4dcc_B7C6_33C21269E183" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000500__1403_4dcc_B7C6_33C21269E183" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000541__1403_4dcc_B7C6_33C21269E183" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000542__1403_4dcc_B7C6_33C21269E183" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9663763E_2F48_4952_926C_444F368462AA">
@@ -2998,13 +4239,6 @@
 						</ownedEnd>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_9D50C424_E7E2_4c52_B4E8_8A666E94C5BA" supplier="EAID_E95530AB_B746_4056_8805_0F3BB79051BE" client="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A13D1892_1403_4dcc_B7C6_33C21269E183">
-						<memberEnd xmi:idref="EAID_dst3D1892_1403_4dcc_B7C6_33C21269E183"/>
-						<memberEnd xmi:idref="EAID_src3D1892_1403_4dcc_B7C6_33C21269E183"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3D1892_1403_4dcc_B7C6_33C21269E183" association="EAID_A13D1892_1403_4dcc_B7C6_33C21269E183">
-							<type xmi:idref="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_BB4CF849_5E86_494d_AD24_2A89B4A5DAF1" supplier="EAID_0CC18385_984E_4d4c_A942_07304CE66481" client="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32"/>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_E9C9B328_DB7C_4af2_A37A_DA236E1A8FE3" supplier="EAID_C1D5C542_388C_4d77_B0AA_8B1D0C8C20CA" client="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32"/>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_07601514_1C57_47ce_9A2D_CD97C5116067" name="epo:Reviewer">
@@ -3020,8 +4254,8 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A" name="epo:ReviewIrregularitySummary">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_70D1117D_4D56_407f_AC7F_3F2241342033" name="epo:hasReviewIrregularityCount">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000501_4D56_407f_AC7F_3F2241342033" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000502_4D56_407f_AC7F_3F2241342033" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000543_4D56_407f_AC7F_3F2241342033" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000544_4D56_407f_AC7F_3F2241342033" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_484BA28E_0C28_4b4b_B440_E1E735697188" general="EAID_4F81C811_16F5_4332_BAEA_9843D331872F"/>
@@ -3036,19 +4270,19 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" name="epo:ReviewObject">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_F646BAC9_50C9_427a_A35D_6F824C0B5371" name="epo:hasElementReference">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000503_50C9_427a_A35D_6F824C0B5371" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000504_50C9_427a_A35D_6F824C0B5371" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000545_50C9_427a_A35D_6F824C0B5371" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000546_50C9_427a_A35D_6F824C0B5371" value="*"/>
 							<type xmi:idref="EAJava_xsd_anyURI"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_E1570BF4_A663_4c85_A496_E79BDE625A17" name="epo:hasReviewURL">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000505_A663_4c85_A496_E79BDE625A17" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000506_A663_4c85_A496_E79BDE625A17" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000547_A663_4c85_A496_E79BDE625A17" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000548_A663_4c85_A496_E79BDE625A17" value="1"/>
 							<type xmi:idref="EAJava_xsd_anyURI"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst33CDC7_EDE9_461d_85E1_1ABB6B9E21EB" name="epo:refersToPreviousReview" association="EAID_4C33CDC7_EDE9_461d_85E1_1ABB6B9E21EB">
 							<type xmi:idref="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000507__EDE9_461d_85E1_1ABB6B9E21EB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000508__EDE9_461d_85E1_1ABB6B9E21EB" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000549__EDE9_461d_85E1_1ABB6B9E21EB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000550__EDE9_461d_85E1_1ABB6B9E21EB" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_9E4FF80B_FFD0_4320_961A_5B6B18435CAA" general="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
 					</packagedElement>
@@ -3078,65 +4312,58 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" name="epo:ReviewRequest">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_DF825E2F_0CD1_4414_A52F_5BC33374FE6D" name="epo:hasNumberOfReviewRequests">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000509_0CD1_4414_A52F_5BC33374FE6D" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000510_0CD1_4414_A52F_5BC33374FE6D" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000551_0CD1_4414_A52F_5BC33374FE6D" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000552_0CD1_4414_A52F_5BC33374FE6D" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_661FB233_D59B_44ce_A5E7_049DA74AA55E" name="epo:isWithdrawn">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000511_D59B_44ce_A5E7_049DA74AA55E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000512_D59B_44ce_A5E7_049DA74AA55E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000553_D59B_44ce_A5E7_049DA74AA55E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000554_D59B_44ce_A5E7_049DA74AA55E" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_59422748_C11F_437d_8F7E_44D4FAF1B79E" name="epo:hasWithdrawalDate">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000513_C11F_437d_8F7E_44D4FAF1B79E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000514_C11F_437d_8F7E_44D4FAF1B79E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000555_C11F_437d_8F7E_44D4FAF1B79E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000556_C11F_437d_8F7E_44D4FAF1B79E" value="1"/>
 							<type xmi:idref="EAJava_xsd_date"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_383157AA_E023_4686_B908_2AA037456757" name="epo:hasWithdrawalReason">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000515_E023_4686_B908_2AA037456757" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000516_E023_4686_B908_2AA037456757" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000557_E023_4686_B908_2AA037456757" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000558_E023_4686_B908_2AA037456757" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_DAD71412_37CA_4488_BBCA_E16D118CC6D8" name="epo:hasRequestDate">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000517_37CA_4488_BBCA_E16D118CC6D8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000518_37CA_4488_BBCA_E16D118CC6D8" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000559_37CA_4488_BBCA_E16D118CC6D8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000560_37CA_4488_BBCA_E16D118CC6D8" value="1"/>
 							<type xmi:idref="EAJava_xsd_date"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_2C3C6FFD_7F77_424c_B8A1_C090490D5878" general="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst0F07D8_06B8_43e0_AB80_8F686D5C488E" name="epo:hasReviewRequestFee" association="EAID_6D0F07D8_06B8_43e0_AB80_8F686D5C488E">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000519__06B8_43e0_AB80_8F686D5C488E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000520__06B8_43e0_AB80_8F686D5C488E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000561__06B8_43e0_AB80_8F686D5C488E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000562__06B8_43e0_AB80_8F686D5C488E" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_384E8446_C9A6_4e30_9DD7_3219683AAD0C" supplier="EAID_0CC18385_984E_4d4c_A942_07304CE66481" client="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6D0F07D8_06B8_43e0_AB80_8F686D5C488E">
-						<memberEnd xmi:idref="EAID_dst0F07D8_06B8_43e0_AB80_8F686D5C488E"/>
-						<memberEnd xmi:idref="EAID_src0F07D8_06B8_43e0_AB80_8F686D5C488E"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0F07D8_06B8_43e0_AB80_8F686D5C488E" association="EAID_6D0F07D8_06B8_43e0_AB80_8F686D5C488E">
-							<type xmi:idref="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_E1801D29_495B_4d90_9640_5358E5CE90C3" supplier="EAID_E95530AB_B746_4056_8805_0F3BB79051BE" client="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC"/>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_4E7C30BC_ABE6_4736_8E07_54ED87CB1179" name="epo:ReviewRequester">
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_7B0A44E0_63E1_4c30_AB83_DA8166C24C14" general="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_92AE6E92_3A20_4642_A531_93ABFC476500" name="epo:ReviewRequestSummary">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_D66D3445_8E47_4d04_95BC_AFD636549F08" name="epo:hasTotalNumberOfComplainants">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000521_8E47_4d04_95BC_AFD636549F08" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000522_8E47_4d04_95BC_AFD636549F08" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000563_8E47_4d04_95BC_AFD636549F08" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000564_8E47_4d04_95BC_AFD636549F08" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstEB89B4_BF73_4250_B00A_CDF53D99CBCD" name="epo:hasReviewIrregularitySummary" association="EAID_29EB89B4_BF73_4250_B00A_CDF53D99CBCD">
 							<type xmi:idref="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000523__BF73_4250_B00A_CDF53D99CBCD" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000524__BF73_4250_B00A_CDF53D99CBCD" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000565__BF73_4250_B00A_CDF53D99CBCD" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000566__BF73_4250_B00A_CDF53D99CBCD" value="*"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_3777662E_A9D8_4d59_AF6E_5DFBB174C5FA" general="EAID_4F81C811_16F5_4332_BAEA_9843D331872F"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstC46ECB_7950_4db1_AA23_2C9AD7E8E999" name="epo:concernsReviewSummaryForLot" association="EAID_56C46ECB_7950_4db1_AA23_2C9AD7E8E999">
 							<type xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000525__7950_4db1_AA23_2C9AD7E8E999" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000526__7950_4db1_AA23_2C9AD7E8E999" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000567__7950_4db1_AA23_2C9AD7E8E999" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000568__7950_4db1_AA23_2C9AD7E8E999" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_56C46ECB_7950_4db1_AA23_2C9AD7E8E999">
@@ -3148,47 +4375,47 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" name="epo:ReviewTerm">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_23C008E4_9460_4e04_BCD7_38CCB8AFA518" name="epo:hasReviewProcedure">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000527_9460_4e04_BCD7_38CCB8AFA518" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000528_9460_4e04_BCD7_38CCB8AFA518" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000569_9460_4e04_BCD7_38CCB8AFA518" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000570_9460_4e04_BCD7_38CCB8AFA518" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_BB5F43BE_8210_42d8_9286_649347222247" name="epo:hasReviewDeadline">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000529_8210_42d8_9286_649347222247" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000530_8210_42d8_9286_649347222247" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000571_8210_42d8_9286_649347222247" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000572_8210_42d8_9286_649347222247" value="1"/>
 							<type xmi:idref="EAJava_xsd_dateTime"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_D0AD81EC_4513_4003_8F57_CB232AF26678" name="epo:hasReviewDeadlineInformation">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000531_4513_4003_8F57_CB232AF26678" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000532_4513_4003_8F57_CB232AF26678" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000573_4513_4003_8F57_CB232AF26678" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000574_4513_4003_8F57_CB232AF26678" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst531817_E843_4c42_8EA1_111804B30C38" name="epo:definesReviewer" association="EAID_1B531817_E843_4c42_8EA1_111804B30C38">
 							<type xmi:idref="EAID_07601514_1C57_47ce_9A2D_CD97C5116067"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000533__E843_4c42_8EA1_111804B30C38" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000534__E843_4c42_8EA1_111804B30C38" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000575__E843_4c42_8EA1_111804B30C38" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000576__E843_4c42_8EA1_111804B30C38" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst9C17AB_3D5F_4ffe_AC22_DE4C7CCE3C2E" name="epo:definesReviewProcedureInformationProvider" association="EAID_229C17AB_3D5F_4ffe_AC22_DE4C7CCE3C2E">
 							<type xmi:idref="EAID_DCE733E5_38D7_4e94_A8B8_B385E9A6811B"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000535__3D5F_4ffe_AC22_DE4C7CCE3C2E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000536__3D5F_4ffe_AC22_DE4C7CCE3C2E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000577__3D5F_4ffe_AC22_DE4C7CCE3C2E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000578__3D5F_4ffe_AC22_DE4C7CCE3C2E" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_B3295353_448F_433c_921A_A4E96D0B2738" general="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_C7F7FABE_11B6_42f1_8310_BCB1832C647A" general="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_E13C8393_D02E_4800_B8D5_38C02E2C8998" name="epo:SecurityClearanceTerm">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_FDA0BF50_CABF_495e_8376_7F059C142FA2" name="epo:hasDeadline">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000537_CABF_495e_8376_7F059C142FA2" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000538_CABF_495e_8376_7F059C142FA2" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000579_CABF_495e_8376_7F059C142FA2" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000580_CABF_495e_8376_7F059C142FA2" value="1"/>
 							<type xmi:idref="EAJava_xsd_dateTime"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_58B626C6_3D05_426d_B057_4FE0D785D8C5" name="dct:description">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000539_3D05_426d_B057_4FE0D785D8C5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000540_3D05_426d_B057_4FE0D785D8C5" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000581_3D05_426d_B057_4FE0D785D8C5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000582_3D05_426d_B057_4FE0D785D8C5" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_8710D5D2_1B92_4286_8D4C_A392932D7D7E" name="epo:isSecurityClearanceRequired">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000541_1B92_4286_8D4C_A392932D7D7E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000542_1B92_4286_8D4C_A392932D7D7E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000583_1B92_4286_8D4C_A392932D7D7E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000584_1B92_4286_8D4C_A392932D7D7E" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_2EFFE2EC_6B27_4d48_B910_6C37C39CAAFC" general="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
@@ -3196,39 +4423,32 @@
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_6966846F_842F_4149_A95B_AE374D603608" name="epo:SelectedCandidateList">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst7753B6_365D_4082_8CC4_DA85F79E7124" name="epo:containsCandidate" association="EAID_007753B6_365D_4082_8CC4_DA85F79E7124">
 							<type xmi:idref="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000543__365D_4082_8CC4_DA85F79E7124" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000544__365D_4082_8CC4_DA85F79E7124" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000585__365D_4082_8CC4_DA85F79E7124" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000586__365D_4082_8CC4_DA85F79E7124" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst4865EB_995F_486e_A7A9_407855E7F1B8" name="epo:hasStartDate" association="EAID_ED4865EB_995F_486e_A7A9_407855E7F1B8">
 							<type xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000545__995F_486e_A7A9_407855E7F1B8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000546__995F_486e_A7A9_407855E7F1B8" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000587__995F_486e_A7A9_407855E7F1B8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000588__995F_486e_A7A9_407855E7F1B8" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_ED4865EB_995F_486e_A7A9_407855E7F1B8">
-						<memberEnd xmi:idref="EAID_dst4865EB_995F_486e_A7A9_407855E7F1B8"/>
-						<memberEnd xmi:idref="EAID_src4865EB_995F_486e_A7A9_407855E7F1B8"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src4865EB_995F_486e_A7A9_407855E7F1B8" association="EAID_ED4865EB_995F_486e_A7A9_407855E7F1B8">
-							<type xmi:idref="EAID_6966846F_842F_4149_A95B_AE374D603608"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB" name="epo:SelectionCriteriaSummary">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_3A627DC2_E5DD_431b_8A44_E0CCD873D80E" name="epo:hasSelectionCriteriaStatedInProcurementDocuments">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000547_E5DD_431b_8A44_E0CCD873D80E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000548_E5DD_431b_8A44_E0CCD873D80E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000589_E5DD_431b_8A44_E0CCD873D80E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000590_E5DD_431b_8A44_E0CCD873D80E" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_F01C6008_3838_4756_A2F0_4B97431AD5FB" name="epo:describesMinimumLevelOfStandards">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000549_3838_4756_A2F0_4B97431AD5FB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000550_3838_4756_A2F0_4B97431AD5FB" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000591_3838_4756_A2F0_4B97431AD5FB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000592_3838_4756_A2F0_4B97431AD5FB" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_8D1FC032_83F1_4753_BF39_B673852D3F9A" general="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89"/>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122" name="epo:SelectionCriterion">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_3EDCE2F4_B119_4b3b_8873_8E1E9D97CE99" name="epo:isUsedForCandidateRestriction">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000551_B119_4b3b_8873_8E1E9D97CE99" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000552_B119_4b3b_8873_8E1E9D97CE99" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000593_B119_4b3b_8873_8E1E9D97CE99" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000594_B119_4b3b_8873_8E1E9D97CE99" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_B61D93A6_A88F_4730_93D5_612F44B8ECE4" general="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD"/>
@@ -3242,18 +4462,27 @@
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_857D08F9_84F2_4d98_8718_882951247DF8" general="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA"/>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_5C87BC92_AF78_4f16_994C_2F6853BD9DA7" supplier="EAID_53AB9EFA_0DDD_4512_8CA7_9D132E537955" client="EAID_2DF96E3A_E135_465d_908F_EAB3689291DE"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C" name="epo:SpecificDuration">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_443A0D12_FC67_4252_86EC_D1E5C696FA85" name="time:numericDuration">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000595_FC67_4252_86EC_D1E5C696FA85" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000596_FC67_4252_86EC_D1E5C696FA85" value="1"/>
+							<type xmi:idref="EAJava_xsd_decimal"/>
+						</ownedAttribute>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_FE0B0FB5_E0B6_41e2_AA82_ECF06C845021" general="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_90566F74_64BC_49c8_8076_1ECB982268EE" supplier="EAID_EDCD6F3A_F86A_46ca_ACD1_13C3E1A4B7F9" client="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C"/>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_4F81C811_16F5_4332_BAEA_9843D331872F" name="epo:StatisticalInformation">
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_356035E1_7546_4bda_9685_286F5A33ED5A" general="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA" name="epo:StrategicProcurement">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_0D693C4B_7C22_4de2_97E6_B0EAE94F70B9" name="epo:hasNonAccessibilityCriterionJustification">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000553_7C22_4de2_97E6_B0EAE94F70B9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000554_7C22_4de2_97E6_B0EAE94F70B9" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000597_7C22_4de2_97E6_B0EAE94F70B9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000598_7C22_4de2_97E6_B0EAE94F70B9" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_98F7F863_B485_4d58_9B75_069462E81184" name="epo:hasStrategicProcurementDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000555_B485_4d58_9B75_069462E81184" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000556_B485_4d58_9B75_069462E81184" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000599_B485_4d58_9B75_069462E81184" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000600_B485_4d58_9B75_069462E81184" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 					</packagedElement>
@@ -3267,34 +4496,37 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E" name="epo:SubcontractingEstimate">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_664E6716_07BA_4b02_9D13_99D00FD703DB" name="dct:description">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000557_07BA_4b02_9D13_99D00FD703DB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000558_07BA_4b02_9D13_99D00FD703DB" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000601_07BA_4b02_9D13_99D00FD703DB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000602_07BA_4b02_9D13_99D00FD703DB" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_961CE08A_C085_4834_BA34_2B1691E8A7F4" name="epo:hasEstimatedPercentage">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000559_C085_4834_BA34_2B1691E8A7F4" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000560_C085_4834_BA34_2B1691E8A7F4" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000603_C085_4834_BA34_2B1691E8A7F4" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000604_C085_4834_BA34_2B1691E8A7F4" value="1"/>
 							<type xmi:idref="EAJava_xsd_decimal"/>
 						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_6C70AD90_9D48_480a_BF77_791AAC05D8D5" name="epo:isSubcontractingValueKnown">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000605_9D48_480a_BF77_791AAC05D8D5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000606_9D48_480a_BF77_791AAC05D8D5" value="1"/>
+							<type xmi:idref="EAJava_xsd_boolean"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_A2B1A2FE_B767_4af0_BE7E_EF7EAB190232" name="epo:isSubcontractingPercentageKnown">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000607_B767_4af0_BE7E_EF7EAB190232" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000608_B767_4af0_BE7E_EF7EAB190232" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_467A3DAE_DEA8_4237_9133_432198D98388" name="epo:hasSubjectMatter">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000561_DEA8_4237_9133_432198D98388" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000562_DEA8_4237_9133_432198D98388" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000609_DEA8_4237_9133_432198D98388" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000610_DEA8_4237_9133_432198D98388" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstAE269D_7874_4515_A52E_6EBA9F23871A" name="epo:hasSubcontractingEstimatedValue" association="EAID_55AE269D_7874_4515_A52E_6EBA9F23871A">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000563__7874_4515_A52E_6EBA9F23871A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000564__7874_4515_A52E_6EBA9F23871A" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000611__7874_4515_A52E_6EBA9F23871A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000612__7874_4515_A52E_6EBA9F23871A" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_D24BB7D7_DC9F_43ad_AB2C_BEEC4E3BED13" general="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897"/>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_55AE269D_7874_4515_A52E_6EBA9F23871A">
-						<memberEnd xmi:idref="EAID_dstAE269D_7874_4515_A52E_6EBA9F23871A"/>
-						<memberEnd xmi:idref="EAID_srcAE269D_7874_4515_A52E_6EBA9F23871A"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcAE269D_7874_4515_A52E_6EBA9F23871A" association="EAID_55AE269D_7874_4515_A52E_6EBA9F23871A">
-							<type xmi:idref="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7C98771E_06E0_4141_9CF5_2CFE5FEB856B">
 						<memberEnd xmi:idref="EAID_dst98771E_06E0_4141_9CF5_2CFE5FEB856B"/>
 						<memberEnd xmi:idref="EAID_src98771E_06E0_4141_9CF5_2CFE5FEB856B"/>
@@ -3312,35 +4544,42 @@
 							<type xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_ED09AA70_1480_4e41_8F94_BA9A89E0B960">
+						<memberEnd xmi:idref="EAID_dst09AA70_1480_4e41_8F94_BA9A89E0B960"/>
+						<memberEnd xmi:idref="EAID_src09AA70_1480_4e41_8F94_BA9A89E0B960"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src09AA70_1480_4e41_8F94_BA9A89E0B960" association="EAID_ED09AA70_1480_4e41_8F94_BA9A89E0B960">
+							<type xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561" name="epo:SubcontractTerm">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_256489E4_B6B6_412c_AD17_AD3730D5DFBA" name="dct:description">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000565_B6B6_412c_AD17_AD3730D5DFBA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000566_B6B6_412c_AD17_AD3730D5DFBA" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000613_B6B6_412c_AD17_AD3730D5DFBA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000614_B6B6_412c_AD17_AD3730D5DFBA" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_DE9DB4E1_0EA6_4dca_BE6B_B5F4FE407B6E" name="epo:hasMaximumShare">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000567_0EA6_4dca_BE6B_B5F4FE407B6E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000568_0EA6_4dca_BE6B_B5F4FE407B6E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000615_0EA6_4dca_BE6B_B5F4FE407B6E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000616_0EA6_4dca_BE6B_B5F4FE407B6E" value="1"/>
 							<type xmi:idref="EAJava_xsd_decimal"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_A8247705_906D_4a85_A700_40F3E3506692" name="epo:hasMinimumShare">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000569_906D_4a85_A700_40F3E3506692" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000570_906D_4a85_A700_40F3E3506692" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000617_906D_4a85_A700_40F3E3506692" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000618_906D_4a85_A700_40F3E3506692" value="1"/>
 							<type xmi:idref="EAJava_xsd_decimal"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_999AAF46_5E6C_43b3_ACEB_B3E3DEF42F46" name="epo:hasSubcontractingInvolved">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000571_5E6C_43b3_ACEB_B3E3DEF42F46" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000572_5E6C_43b3_ACEB_B3E3DEF42F46" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000619_5E6C_43b3_ACEB_B3E3DEF42F46" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000620_5E6C_43b3_ACEB_B3E3DEF42F46" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_E4C9B9DC_BAAD_40d2_B56F_21B5FDF8C067" name="epo:hasMinimumSubcontractorsProposedObligation">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000573_BAAD_40d2_B56F_21B5FDF8C067" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000574_BAAD_40d2_B56F_21B5FDF8C067" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000621_BAAD_40d2_B56F_21B5FDF8C067" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000622_BAAD_40d2_B56F_21B5FDF8C067" value="1"/>
 							<type xmi:idref="EAJava_xsd_decimal"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_CB6A57C6_ED53_40e1_806D_C89FF9D2DCC9" name="epo:hasSubcontractorsProposedAboveObligation">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000575_ED53_40e1_806D_C89FF9D2DCC9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000576_ED53_40e1_806D_C89FF9D2DCC9" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000623_ED53_40e1_806D_C89FF9D2DCC9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000624_ED53_40e1_806D_C89FF9D2DCC9" value="1"/>
 							<type xmi:idref="EAJava_xsd_decimal"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_1E3BD6A4_59D5_435a_9472_AFC131D1E7F2" general="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
@@ -3348,223 +4587,202 @@
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_C8DDF2AD_D50E_4225_A715_E7C9368CEB39" supplier="EAID_9134CB43_EE09_4c07_80C3_3F39DFD09011" client="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561"/>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" name="epo:SubmissionStatisticalInformation">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_86BBDF9D_8C1C_4984_BD5E_25D9163F6316" name="epo:hasAbnormallyLowTenders">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000577_8C1C_4984_BD5E_25D9163F6316" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000578_8C1C_4984_BD5E_25D9163F6316" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000625_8C1C_4984_BD5E_25D9163F6316" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000626_8C1C_4984_BD5E_25D9163F6316" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_D5E6C297_9C46_4da7_B1B5_F589C83EA61F" name="epo:hasEEAReceivedTenders">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000579_9C46_4da7_B1B5_F589C83EA61F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000580_9C46_4da7_B1B5_F589C83EA61F" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000627_9C46_4da7_B1B5_F589C83EA61F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000628_9C46_4da7_B1B5_F589C83EA61F" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_4C4179C1_8DD5_4abd_B795_C65BE998ABE7" name="epo:hasElectronicTenders">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000581_8DD5_4abd_B795_C65BE998ABE7" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000582_8DD5_4abd_B795_C65BE998ABE7" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000629_8DD5_4abd_B795_C65BE998ABE7" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000630_8DD5_4abd_B795_C65BE998ABE7" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_987483C8_E9E1_4296_8A67_2704E861B606" name="epo:hasEstimatedTotalSubcontracts">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000583_E9E1_4296_8A67_2704E861B606" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000584_E9E1_4296_8A67_2704E861B606" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000631_E9E1_4296_8A67_2704E861B606" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000632_E9E1_4296_8A67_2704E861B606" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_DE1FE3A1_287D_475d_84A4_F2E5E5193FAD" name="epo:hasEUReceivedTenders">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000585_287D_475d_84A4_F2E5E5193FAD" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000586_287D_475d_84A4_F2E5E5193FAD" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000633_287D_475d_84A4_F2E5E5193FAD" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000634_287D_475d_84A4_F2E5E5193FAD" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_21FFFE94_9B54_4a8c_9166_AB8E17EEEFE1" name="epo:hasInadmissibleTenders">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000587_9B54_4a8c_9166_AB8E17EEEFE1" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000588_9B54_4a8c_9166_AB8E17EEEFE1" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000635_9B54_4a8c_9166_AB8E17EEEFE1" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000636_9B54_4a8c_9166_AB8E17EEEFE1" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_6B37AA70_DD58_4d75_AD92_B5CFC9EE5A10" name="epo:hasMediumTenderPerLots">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000589_DD58_4d75_AD92_B5CFC9EE5A10" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000590_DD58_4d75_AD92_B5CFC9EE5A10" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000637_DD58_4d75_AD92_B5CFC9EE5A10" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000638_DD58_4d75_AD92_B5CFC9EE5A10" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_DCDCF82F_1D3E_4c68_960A_9BF2F3B08B20" name="epo:hasNonEEAReceivedTenders">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000591_1D3E_4c68_960A_9BF2F3B08B20" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000592_1D3E_4c68_960A_9BF2F3B08B20" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000639_1D3E_4c68_960A_9BF2F3B08B20" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000640_1D3E_4c68_960A_9BF2F3B08B20" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_6C6B35EA_CE22_4288_863A_8E8C62DB94DC" name="epo:hasNonEUReceivedTenders">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000593_CE22_4288_863A_8E8C62DB94DC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000594_CE22_4288_863A_8E8C62DB94DC" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000641_CE22_4288_863A_8E8C62DB94DC" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000642_CE22_4288_863A_8E8C62DB94DC" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_4BF57180_A021_49b9_875D_5F7820C48B73" name="epo:hasNumberOfTenderersInvited">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000595_A021_49b9_875D_5F7820C48B73" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000596_A021_49b9_875D_5F7820C48B73" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000643_A021_49b9_875D_5F7820C48B73" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000644_A021_49b9_875D_5F7820C48B73" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_4FC750AC_066D_4f5d_97D2_96AC42B10531" name="epo:hasOtherCountriesReceivedTenders">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000597_066D_4f5d_97D2_96AC42B10531" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000598_066D_4f5d_97D2_96AC42B10531" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000645_066D_4f5d_97D2_96AC42B10531" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000646_066D_4f5d_97D2_96AC42B10531" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_2CAD2590_7E02_46c6_A777_E9E9132A3815" name="epo:hasReceivedMicroTenders">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000599_7E02_46c6_A777_E9E9132A3815" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000600_7E02_46c6_A777_E9E9132A3815" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000647_7E02_46c6_A777_E9E9132A3815" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000648_7E02_46c6_A777_E9E9132A3815" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_61457F70_4E2E_4945_84FF_A2A3E2C8BCA1" name="epo:hasReceivedParticipationRequests">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000601_4E2E_4945_84FF_A2A3E2C8BCA1" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000602_4E2E_4945_84FF_A2A3E2C8BCA1" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000649_4E2E_4945_84FF_A2A3E2C8BCA1" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000650_4E2E_4945_84FF_A2A3E2C8BCA1" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_356A9901_3813_42b3_8315_8C6CBF336665" name="epo:hasReceivedSmallTenders">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000603_3813_42b3_8315_8C6CBF336665" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000604_3813_42b3_8315_8C6CBF336665" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000651_3813_42b3_8315_8C6CBF336665" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000652_3813_42b3_8315_8C6CBF336665" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_43B89E28_01EA_49ea_94F2_462142A81086" name="epo:hasReceivedTenders">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000605_01EA_49ea_94F2_462142A81086" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000606_01EA_49ea_94F2_462142A81086" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000653_01EA_49ea_94F2_462142A81086" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000654_01EA_49ea_94F2_462142A81086" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_D76A5374_D2FB_4c1d_A657_3AA99D21F66E" name="epo:hasSMEReceivedTenders">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000607_D2FB_4c1d_A657_3AA99D21F66E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000608_D2FB_4c1d_A657_3AA99D21F66E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000655_D2FB_4c1d_A657_3AA99D21F66E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000656_D2FB_4c1d_A657_3AA99D21F66E" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_BBFD4D4B_9340_45d0_85E3_1BE9CC684052" name="epo:hasUnverifiedTenders">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000609_9340_45d0_85E3_1BE9CC684052" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000610_9340_45d0_85E3_1BE9CC684052" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000657_9340_45d0_85E3_1BE9CC684052" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000658_9340_45d0_85E3_1BE9CC684052" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_844C345A_C92D_4295_A2C8_8BCDFBE70B73" name="epo:hasSMEReceivedTendersExcludingSubcontractors">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000611_C92D_4295_A2C8_8BCDFBE70B73" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000612_C92D_4295_A2C8_8BCDFBE70B73" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000659_C92D_4295_A2C8_8BCDFBE70B73" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000660_C92D_4295_A2C8_8BCDFBE70B73" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst27E296_9886_44bc_86E7_B4E433F87208" name="epo:hasHighestReceivedTenderValue" association="EAID_3127E296_9886_44bc_86E7_B4E433F87208">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000613__9886_44bc_86E7_B4E433F87208" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000614__9886_44bc_86E7_B4E433F87208" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000661__9886_44bc_86E7_B4E433F87208" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000662__9886_44bc_86E7_B4E433F87208" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_31D3A42A_B28E_449d_AF5F_9D6CCD87E6A1" general="EAID_4F81C811_16F5_4332_BAEA_9843D331872F"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstD513D4_9622_4217_94D7_26E6E451AF0C" name="epo:hasLowestReceivedTenderValue" association="EAID_98D513D4_9622_4217_94D7_26E6E451AF0C">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000615__9622_4217_94D7_26E6E451AF0C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000616__9622_4217_94D7_26E6E451AF0C" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000663__9622_4217_94D7_26E6E451AF0C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000664__9622_4217_94D7_26E6E451AF0C" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstBE64C7_3F6B_4881_AB89_9342AF882E95" name="epo:summarisesInformationForAwardOutcome" association="EAID_F5BE64C7_3F6B_4881_AB89_9342AF882E95">
 							<type xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000617__3F6B_4881_AB89_9342AF882E95" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000618__3F6B_4881_AB89_9342AF882E95" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000665__3F6B_4881_AB89_9342AF882E95" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000666__3F6B_4881_AB89_9342AF882E95" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3127E296_9886_44bc_86E7_B4E433F87208">
-						<memberEnd xmi:idref="EAID_dst27E296_9886_44bc_86E7_B4E433F87208"/>
-						<memberEnd xmi:idref="EAID_src27E296_9886_44bc_86E7_B4E433F87208"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src27E296_9886_44bc_86E7_B4E433F87208" association="EAID_3127E296_9886_44bc_86E7_B4E433F87208">
-							<type xmi:idref="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_6E3C7B53_979C_4020_95DB_31C0DA62F564" supplier="EAID_12955701_35A4_47c8_8EA6_28768E083EED" client="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_98D513D4_9622_4217_94D7_26E6E451AF0C">
-						<memberEnd xmi:idref="EAID_dstD513D4_9622_4217_94D7_26E6E451AF0C"/>
-						<memberEnd xmi:idref="EAID_srcD513D4_9622_4217_94D7_26E6E451AF0C"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD513D4_9622_4217_94D7_26E6E451AF0C" association="EAID_98D513D4_9622_4217_94D7_26E6E451AF0C">
-							<type xmi:idref="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" name="epo:SubmissionTerm">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_25B4DC5C_87DD_4edb_867A_D36061C7C85B" name="epo:hasEAuctionURL">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000619_87DD_4edb_867A_D36061C7C85B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000620_87DD_4edb_867A_D36061C7C85B" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000667_87DD_4edb_867A_D36061C7C85B" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000668_87DD_4edb_867A_D36061C7C85B" value="1"/>
 							<type xmi:idref="EAJava_xsd_anyURI"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_B8F4E8C3_3C6E_4b8a_9E44_F51D72FE840E" name="epo:hasReceiptDeadline">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000621_3C6E_4b8a_9E44_F51D72FE840E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000622_3C6E_4b8a_9E44_F51D72FE840E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000669_3C6E_4b8a_9E44_F51D72FE840E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000670_3C6E_4b8a_9E44_F51D72FE840E" value="1"/>
 							<type xmi:idref="EAJava_xsd_dateTime"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_C009AB79_D7C1_4fc1_B974_73482723AB30" name="epo:hasReceiptExpressionDeadline">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000623_D7C1_4fc1_B974_73482723AB30" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000624_D7C1_4fc1_B974_73482723AB30" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000671_D7C1_4fc1_B974_73482723AB30" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000672_D7C1_4fc1_B974_73482723AB30" value="1"/>
 							<type xmi:idref="EAJava_xsd_dateTime"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_0A093F33_1E8D_431b_B4A7_BC3DD1D88947" name="epo:isGuaranteeRequired">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000625_1E8D_431b_B4A7_BC3DD1D88947" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000626_1E8D_431b_B4A7_BC3DD1D88947" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000673_1E8D_431b_B4A7_BC3DD1D88947" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000674_1E8D_431b_B4A7_BC3DD1D88947" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_7FAFE0A0_6346_40b8_8467_BD3EAA918250" name="epo:hasGuaranteeDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000627_6346_40b8_8467_BD3EAA918250" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000628_6346_40b8_8467_BD3EAA918250" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000675_6346_40b8_8467_BD3EAA918250" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000676_6346_40b8_8467_BD3EAA918250" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_0A0C8C8F_481F_4e16_B636_E9A45391BA3E" name="epo:hasSubmissionURL">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000629_481F_4e16_B636_E9A45391BA3E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000630_481F_4e16_B636_E9A45391BA3E" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000677_481F_4e16_B636_E9A45391BA3E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000678_481F_4e16_B636_E9A45391BA3E" value="*"/>
 							<type xmi:idref="EAJava_xsd_anyURI"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_5940AFF6_EDC8_41c1_A493_F3DF27FB67C5" name="epo:hasNonElectronicSubmissionDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000631_EDC8_41c1_A493_F3DF27FB67C5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000632_EDC8_41c1_A493_F3DF27FB67C5" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000679_EDC8_41c1_A493_F3DF27FB67C5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000680_EDC8_41c1_A493_F3DF27FB67C5" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_FE9E9688_0EC4_4a22_8340_EA2FAF94B78F" name="epo:hasReceiptPreliminaryMarketConsultationDeadline">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000633_0EC4_4a22_8340_EA2FAF94B78F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000634_0EC4_4a22_8340_EA2FAF94B78F" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000681_0EC4_4a22_8340_EA2FAF94B78F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000682_0EC4_4a22_8340_EA2FAF94B78F" value="1"/>
 							<type xmi:idref="EAJava_xsd_dateTime"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_DDA42505_C694_419c_B5A3_DCF52C96BA83" name="epo:isAdvancedElectronicSignatureRequired">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000635_C694_419c_B5A3_DCF52C96BA83" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000636_C694_419c_B5A3_DCF52C96BA83" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000683_C694_419c_B5A3_DCF52C96BA83" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000684_C694_419c_B5A3_DCF52C96BA83" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_B48EEE40_ED5C_48cf_AFC4_3D5FB5EE6906" name="epo:hasReceiptParticipationRequestDeadline">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000637_ED5C_48cf_AFC4_3D5FB5EE6906" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000638_ED5C_48cf_AFC4_3D5FB5EE6906" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000685_ED5C_48cf_AFC4_3D5FB5EE6906" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000686_ED5C_48cf_AFC4_3D5FB5EE6906" value="1"/>
 							<type xmi:idref="EAJava_xsd_dateTime"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_80AFF8F1_AF96_4e09_801D_A796A1DC3D1C" name="epo:isMultipleTenderSubmissionAllowed">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000639_AF96_4e09_801D_A796A1DC3D1C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000640_AF96_4e09_801D_A796A1DC3D1C" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000687_AF96_4e09_801D_A796A1DC3D1C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000688_AF96_4e09_801D_A796A1DC3D1C" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_C91BA594_4948_4ee3_BA84_B73B538B8AC5" name="epo:hasReceiptTenderDeadline">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000641_4948_4ee3_BA84_B73B538B8AC5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000642_4948_4ee3_BA84_B73B538B8AC5" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000689_4948_4ee3_BA84_B73B538B8AC5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000690_4948_4ee3_BA84_B73B538B8AC5" value="1"/>
 							<type xmi:idref="EAJava_xsd_dateTime"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_64609019_E492_413d_B12C_46646DE65A2D" name="epo:hasLateSubmissionInformationDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000643_E492_413d_B12C_46646DE65A2D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000644_E492_413d_B12C_46646DE65A2D" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000691_E492_413d_B12C_46646DE65A2D" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000692_E492_413d_B12C_46646DE65A2D" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstA9C84A_C46F_456b_A355_DA9CD314CBA0" name="epo:hasTenderValidityDuration" association="EAID_1EA9C84A_C46F_456b_A355_DA9CD314CBA0">
 							<type xmi:idref="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000645__C46F_456b_A355_DA9CD314CBA0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000646__C46F_456b_A355_DA9CD314CBA0" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000693__C46F_456b_A355_DA9CD314CBA0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000694__C46F_456b_A355_DA9CD314CBA0" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_6248DC7A_ACC5_4553_92ED_5A488B7D6FC6" general="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstC31FFB_F53F_431c_AED5_36E1786ED85F" name="epo:definesTenderReceiver" association="EAID_7BC31FFB_F53F_431c_AED5_36E1786ED85F">
 							<type xmi:idref="EAID_73C42C68_C5D6_4b6c_AA94_2CA27746393B"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000647__F53F_431c_AED5_36E1786ED85F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000648__F53F_431c_AED5_36E1786ED85F" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000695__F53F_431c_AED5_36E1786ED85F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000696__F53F_431c_AED5_36E1786ED85F" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_8DB5DB8D_4E96_4679_A104_F62859765981" general="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst7F270C_1A4E_400c_88ED_7EFEB868C4EC" name="epo:definesTenderProcessor" association="EAID_BC7F270C_1A4E_400c_88ED_7EFEB868C4EC">
 							<type xmi:idref="EAID_FD0308FC_9EDA_4a54_A4B6_FBCE76BF76A2"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000649__1A4E_400c_88ED_7EFEB868C4EC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000650__1A4E_400c_88ED_7EFEB868C4EC" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000697__1A4E_400c_88ED_7EFEB868C4EC" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000698__1A4E_400c_88ED_7EFEB868C4EC" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst7B06AA_2E5B_4fa1_B0EA_CB49790C2AAD" name="epo:hasTenderValidityPeriod" association="EAID_D07B06AA_2E5B_4fa1_B0EA_CB49790C2AAD">
 							<type xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000651__2E5B_4fa1_B0EA_CB49790C2AAD" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000652__2E5B_4fa1_B0EA_CB49790C2AAD" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000699__2E5B_4fa1_B0EA_CB49790C2AAD" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000700__2E5B_4fa1_B0EA_CB49790C2AAD" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1EA9C84A_C46F_456b_A355_DA9CD314CBA0">
-						<memberEnd xmi:idref="EAID_dstA9C84A_C46F_456b_A355_DA9CD314CBA0"/>
-						<memberEnd xmi:idref="EAID_srcA9C84A_C46F_456b_A355_DA9CD314CBA0"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA9C84A_C46F_456b_A355_DA9CD314CBA0" association="EAID_1EA9C84A_C46F_456b_A355_DA9CD314CBA0">
-							<type xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_6D0203DA_A8A3_482a_B747_66A09DEF42FC" supplier="EAID_A8A23909_CD9D_402e_B37A_C9F795BD0521" client="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA"/>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7BC31FFB_F53F_431c_AED5_36E1786ED85F">
 						<memberEnd xmi:idref="EAID_dstC31FFB_F53F_431c_AED5_36E1786ED85F"/>
@@ -3585,25 +4803,18 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_C144677A_178B_495d_A1CC_20D0D20B3AD0" supplier="EAID_8B37BCB9_9B2F_4a90_8339_DA7B0472F42E" client="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA"/>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_C325A5AA_AAE1_4e55_A542_A867A1BED99D" supplier="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5" client="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D07B06AA_2E5B_4fa1_B0EA_CB49790C2AAD">
-						<memberEnd xmi:idref="EAID_dst7B06AA_2E5B_4fa1_B0EA_CB49790C2AAD"/>
-						<memberEnd xmi:idref="EAID_src7B06AA_2E5B_4fa1_B0EA_CB49790C2AAD"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src7B06AA_2E5B_4fa1_B0EA_CB49790C2AAD" association="EAID_D07B06AA_2E5B_4fa1_B0EA_CB49790C2AAD">
-							<type xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_E2C29363_440C_4c85_8C4E_38DED0468EB4" supplier="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90" client="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA"/>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_DC5A8DC6_4D0A_4432_B667_CE2C1E6D5A96" name="epo:System">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_5CCFF70B_5C0F_4b3c_8D5E_F1C29EFEBB48" name="dct:description">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000653_5C0F_4b3c_8D5E_F1C29EFEBB48" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000654_5C0F_4b3c_8D5E_F1C29EFEBB48" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000701_5C0F_4b3c_8D5E_F1C29EFEBB48" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000702_5C0F_4b3c_8D5E_F1C29EFEBB48" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_80B8D836_6545_4db6_8C20_4A9289C81C12" general="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF47D81_D8E3_4eda_9351_165A2D6D972E" name="epo:isOwnedByAgent" association="EAID_EBF47D81_D8E3_4eda_9351_165A2D6D972E">
 							<type xmi:idref="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000655__D8E3_4eda_9351_165A2D6D972E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000656__D8E3_4eda_9351_165A2D6D972E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000703__D8E3_4eda_9351_165A2D6D972E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000704__D8E3_4eda_9351_165A2D6D972E" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_EBF47D81_D8E3_4eda_9351_165A2D6D972E">
@@ -3621,24 +4832,17 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_3780AA50_D898_4068_B300_47B46651CA0A" name="epo:Technique">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_72399903_AD44_401f_A23C_F48405982480" name="dct:description">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000657_AD44_401f_A23C_F48405982480" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000658_AD44_401f_A23C_F48405982480" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000705_AD44_401f_A23C_F48405982480" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000706_AD44_401f_A23C_F48405982480" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst5098A6_B134_4261_8994_841365A27FAB" name="epo:hasValidityPeriod" association="EAID_DE5098A6_B134_4261_8994_841365A27FAB">
 							<type xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000659__B134_4261_8994_841365A27FAB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000660__B134_4261_8994_841365A27FAB" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000707__B134_4261_8994_841365A27FAB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000708__B134_4261_8994_841365A27FAB" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_8FF77444_1F49_4895_AA8E_5C76444F3AE1" supplier="EAID_47C343CA_8534_4855_8BAE_9C5DE33229E3" client="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_DE5098A6_B134_4261_8994_841365A27FAB">
-						<memberEnd xmi:idref="EAID_dst5098A6_B134_4261_8994_841365A27FAB"/>
-						<memberEnd xmi:idref="EAID_src5098A6_B134_4261_8994_841365A27FAB"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src5098A6_B134_4261_8994_841365A27FAB" association="EAID_DE5098A6_B134_4261_8994_841365A27FAB">
-							<type xmi:idref="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_2D4516BD_7CD7_4f69_89C8_D3FC52D7CF0C">
 						<memberEnd xmi:idref="EAID_dst4516BD_7CD7_4f69_89C8_D3FC52D7CF0C"/>
 						<memberEnd xmi:idref="EAID_src4516BD_7CD7_4f69_89C8_D3FC52D7CF0C"/>
@@ -3655,19 +4859,19 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B" name="epo:TenderAwardOutcome">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_8C36560E_7BA5_4caf_9BBC_1CFC01B63943" name="epo:hasAwardRank">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000661_7BA5_4caf_9BBC_1CFC01B63943" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000662_7BA5_4caf_9BBC_1CFC01B63943" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000709_7BA5_4caf_9BBC_1CFC01B63943" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000710_7BA5_4caf_9BBC_1CFC01B63943" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst497249_92E0_435e_9C45_B9A2F9CBFE43" name="epo:concernsTender" association="EAID_00497249_92E0_435e_9C45_B9A2F9CBFE43">
 							<type xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000663__92E0_435e_9C45_B9A2F9CBFE43" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000664__92E0_435e_9C45_B9A2F9CBFE43" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000711__92E0_435e_9C45_B9A2F9CBFE43" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000712__92E0_435e_9C45_B9A2F9CBFE43" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstED3FAD_FABC_4b24_A3E6_B0420EB7CF2A" name="epo:indicatesAwardToWinner" association="EAID_24ED3FAD_FABC_4b24_A3E6_B0420EB7CF2A">
 							<type xmi:idref="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000665__FABC_4b24_A3E6_B0420EB7CF2A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000666__FABC_4b24_A3E6_B0420EB7CF2A" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000713__FABC_4b24_A3E6_B0420EB7CF2A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000714__FABC_4b24_A3E6_B0420EB7CF2A" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_C3A99946_EA61_4bb4_BBB2_994F422EB5DD" general="EAID_B2165393_B24C_4dd7_A2E2_DE976E538481"/>
 					</packagedElement>
@@ -3689,8 +4893,8 @@
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_199C3BDF_913A_42e4_A409_64CB2CE61248" general="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8" name="epo:substantiatesExclusionGround" association="EAID_3EE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8">
 							<type xmi:idref="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000667__B9E8_4e17_87D7_D2C5E8C7FFF8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000668__B9E8_4e17_87D7_D2C5E8C7FFF8" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000715__B9E8_4e17_87D7_D2C5E8C7FFF8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000716__B9E8_4e17_87D7_D2C5E8C7FFF8" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_61636EE3_DE81_4083_BF9B_6F607A63A921">
@@ -3723,24 +4927,24 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0" name="epo:VehicleInformation">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_5B166BB3_0A29_4594_97B0_16D705A9F927" name="epo:hasTotalVehicles">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000669_0A29_4594_97B0_16D705A9F927" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000670_0A29_4594_97B0_16D705A9F927" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000717_0A29_4594_97B0_16D705A9F927" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000718_0A29_4594_97B0_16D705A9F927" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_79CEE53B_719C_42c2_8AE2_8FB4C6159B75" name="epo:hasZeroEmissionVehicles">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000671_719C_42c2_8AE2_8FB4C6159B75" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000672_719C_42c2_8AE2_8FB4C6159B75" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000719_719C_42c2_8AE2_8FB4C6159B75" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000720_719C_42c2_8AE2_8FB4C6159B75" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_9437602D_8F8F_47f4_A458_A53DAE08FDF0" name="epo:hasCleanVehicles">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000673_8F8F_47f4_A458_A53DAE08FDF0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000674_8F8F_47f4_A458_A53DAE08FDF0" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000721_8F8F_47f4_A458_A53DAE08FDF0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000722_8F8F_47f4_A458_A53DAE08FDF0" value="1"/>
 							<type xmi:idref="EAJava_xsd_integer"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE43E48_CB11_4fae_87F3_C0ACAEAF591C" name="epo:concernsGreenProcurement" association="EAID_0BE43E48_CB11_4fae_87F3_C0ACAEAF591C">
 							<type xmi:idref="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000675__CB11_4fae_87F3_C0ACAEAF591C" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000676__CB11_4fae_87F3_C0ACAEAF591C" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000723__CB11_4fae_87F3_C0ACAEAF591C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000724__CB11_4fae_87F3_C0ACAEAF591C" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_78ABF07D_FFDF_40a2_8CAF_4B1C7067546E" supplier="EAID_F565346A_74A1_4bf9_82F9_EE632CBBD88D" client="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0"/>
@@ -3748,46 +4952,39 @@
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3" name="epo:Winner">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst636EE3_DE81_4083_BF9B_6F607A63A921" name="epo:needsToBeATenderer" association="EAID_61636EE3_DE81_4083_BF9B_6F607A63A921">
 							<type xmi:idref="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000677__DE81_4083_BF9B_6F607A63A921" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000678__DE81_4083_BF9B_6F607A63A921" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000725__DE81_4083_BF9B_6F607A63A921" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000726__DE81_4083_BF9B_6F607A63A921" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_E4D55FF7_2180_4a21_A34C_23F9AB59E814" general="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" name="foaf:Agent">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_B904599A_7FDD_4e84_BE6E_9839EB3B7763" name="dct:title">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000679_7FDD_4e84_BE6E_9839EB3B7763" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000680_7FDD_4e84_BE6E_9839EB3B7763" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000727_7FDD_4e84_BE6E_9839EB3B7763" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000728_7FDD_4e84_BE6E_9839EB3B7763" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_246B4CD5_545D_40e6_BC72_AB7858D869B1" name="epo:hasAlias">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000681_545D_40e6_BC72_AB7858D869B1" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000682_545D_40e6_BC72_AB7858D869B1" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000729_545D_40e6_BC72_AB7858D869B1" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000730_545D_40e6_BC72_AB7858D869B1" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst9F106B_6066_4ba7_B084_12D7110FE9E0" name="adms:identifier" association="EAID_319F106B_6066_4ba7_B084_12D7110FE9E0">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000683__6066_4ba7_B084_12D7110FE9E0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000684__6066_4ba7_B084_12D7110FE9E0" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000731__6066_4ba7_B084_12D7110FE9E0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000732__6066_4ba7_B084_12D7110FE9E0" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_srcF47D81_D8E3_4eda_9351_165A2D6D972E" name="epo:ownsSystem" association="EAID_EBF47D81_D8E3_4eda_9351_165A2D6D972E">
 							<type xmi:idref="EAID_DC5A8DC6_4D0A_4432_B667_CE2C1E6D5A96"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000685__D8E3_4eda_9351_165A2D6D972E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000686__D8E3_4eda_9351_165A2D6D972E" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000733__D8E3_4eda_9351_165A2D6D972E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000734__D8E3_4eda_9351_165A2D6D972E" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_319F106B_6066_4ba7_B084_12D7110FE9E0">
-						<memberEnd xmi:idref="EAID_dst9F106B_6066_4ba7_B084_12D7110FE9E0"/>
-						<memberEnd xmi:idref="EAID_src9F106B_6066_4ba7_B084_12D7110FE9E0"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9F106B_6066_4ba7_B084_12D7110FE9E0" association="EAID_319F106B_6066_4ba7_B084_12D7110FE9E0">
-							<type xmi:idref="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" name="foaf:Person">
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_24AB8D4E_3151_4d4e_B951_BAA8F8436033" general="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst8900B2_4B2A_411b_B5EB_19C2D921F4D1" name="epo:hasCertification" association="EAID_498900B2_4B2A_411b_B5EB_19C2D921F4D1">
 							<type xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000687__4B2A_411b_B5EB_19C2D921F4D1" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000688__4B2A_411b_B5EB_19C2D921F4D1" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000735__4B2A_411b_B5EB_19C2D921F4D1" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000736__4B2A_411b_B5EB_19C2D921F4D1" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_498900B2_4B2A_411b_B5EB_19C2D921F4D1">
@@ -3806,64 +5003,57 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_29678A10_6473_461a_BE84_76269B5BBD68" name="locn:Address">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_03D8D24B_9666_44c8_AE46_FDF98BE48098" name="locn:postName">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000689_9666_44c8_AE46_FDF98BE48098" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000690_9666_44c8_AE46_FDF98BE48098" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000737_9666_44c8_AE46_FDF98BE48098" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000738_9666_44c8_AE46_FDF98BE48098" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_5D5F6583_5ACA_48be_9C44_DEB260EE3AB7" name="locn:addressArea">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000691_5ACA_48be_9C44_DEB260EE3AB7" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000692_5ACA_48be_9C44_DEB260EE3AB7" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000739_5ACA_48be_9C44_DEB260EE3AB7" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000740_5ACA_48be_9C44_DEB260EE3AB7" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_70E756E5_00B9_4f66_9D4B_3409713C111D" name="locn:locatorName">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000693_00B9_4f66_9D4B_3409713C111D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000694_00B9_4f66_9D4B_3409713C111D" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000741_00B9_4f66_9D4B_3409713C111D" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000742_00B9_4f66_9D4B_3409713C111D" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_802D9A52_073D_455b_A0F6_DB8FE24D4365" name="locn:adminUnitL2">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000695_073D_455b_A0F6_DB8FE24D4365" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000696_073D_455b_A0F6_DB8FE24D4365" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000743_073D_455b_A0F6_DB8FE24D4365" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000744_073D_455b_A0F6_DB8FE24D4365" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_829CA5E1_0FDA_4c48_8F2E_DB19DABE380D" name="locn:fullAddress">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000697_0FDA_4c48_8F2E_DB19DABE380D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000698_0FDA_4c48_8F2E_DB19DABE380D" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000745_0FDA_4c48_8F2E_DB19DABE380D" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000746_0FDA_4c48_8F2E_DB19DABE380D" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_26BA9E10_DECA_4349_A6FE_21031DBF9E64" name="locn:locatorDesignator">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000699_DECA_4349_A6FE_21031DBF9E64" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000700_DECA_4349_A6FE_21031DBF9E64" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000747_DECA_4349_A6FE_21031DBF9E64" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000748_DECA_4349_A6FE_21031DBF9E64" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_79C9C8AE_515F_4e62_A7A2_8994B97F40FC" name="locn:adminUnitL1">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000701_515F_4e62_A7A2_8994B97F40FC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000702_515F_4e62_A7A2_8994B97F40FC" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000749_515F_4e62_A7A2_8994B97F40FC" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000750_515F_4e62_A7A2_8994B97F40FC" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_BC49BAC4_42EA_469b_B74A_6F71FE025E9D" name="locn:postCode">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000703_42EA_469b_B74A_6F71FE025E9D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000704_42EA_469b_B74A_6F71FE025E9D" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000751_42EA_469b_B74A_6F71FE025E9D" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000752_42EA_469b_B74A_6F71FE025E9D" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_2AAAB836_ACFF_41ba_AA83_669E38B9DCC0" name="locn:thoroughfare">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000705_ACFF_41ba_AA83_669E38B9DCC0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000706_ACFF_41ba_AA83_669E38B9DCC0" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000753_ACFF_41ba_AA83_669E38B9DCC0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000754_ACFF_41ba_AA83_669E38B9DCC0" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF7D14A_11BF_430e_ABED_4C9AC22FFF2A" name="locn:addressID" association="EAID_C6F7D14A_11BF_430e_ABED_4C9AC22FFF2A">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000707__11BF_430e_ABED_4C9AC22FFF2A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000708__11BF_430e_ABED_4C9AC22FFF2A" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000755__11BF_430e_ABED_4C9AC22FFF2A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000756__11BF_430e_ABED_4C9AC22FFF2A" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_626183B8_93AC_4300_B227_85988E5F2016" supplier="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40" client="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C6F7D14A_11BF_430e_ABED_4C9AC22FFF2A">
-						<memberEnd xmi:idref="EAID_dstF7D14A_11BF_430e_ABED_4C9AC22FFF2A"/>
-						<memberEnd xmi:idref="EAID_srcF7D14A_11BF_430e_ABED_4C9AC22FFF2A"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF7D14A_11BF_430e_ABED_4C9AC22FFF2A" association="EAID_C6F7D14A_11BF_430e_ABED_4C9AC22FFF2A">
-							<type xmi:idref="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_D0F25E0B_E148_41e7_8C52_BAE14F5149F6" supplier="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" client="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_28236B4B_9308_46ad_9581_3601B37AA6A4">
 						<memberEnd xmi:idref="EAID_dst236B4B_9308_46ad_9581_3601B37AA6A4"/>
@@ -3888,101 +5078,94 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_2424C22E_B54F_4b6f_BA47_E78DE21C76DE" name="locn:Geometry">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_D017DEC2_D357_4390_80F0_715754917A04" name="cv:coordinates">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000709_D357_4390_80F0_715754917A04" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000710_D357_4390_80F0_715754917A04" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000757_D357_4390_80F0_715754917A04" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000758_D357_4390_80F0_715754917A04" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_1CE71D53_1214_4337_9DD2_EE0515B85B64" name="cv:longitude">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000711_1214_4337_9DD2_EE0515B85B64" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000712_1214_4337_9DD2_EE0515B85B64" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000759_1214_4337_9DD2_EE0515B85B64" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000760_1214_4337_9DD2_EE0515B85B64" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_8602AC5B_BF7B_41b5_91EC_CB0218B68ABA" name="cv:latitude">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000713_BF7B_41b5_91EC_CB0218B68ABA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000714_BF7B_41b5_91EC_CB0218B68ABA" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000761_BF7B_41b5_91EC_CB0218B68ABA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000762_BF7B_41b5_91EC_CB0218B68ABA" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" name="org:Organization">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_18C4DE72_F4BC_41d4_AC3D_ED76B4DB6031" name="epo:hasLegalName">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000715_F4BC_41d4_AC3D_ED76B4DB6031" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000716_F4BC_41d4_AC3D_ED76B4DB6031" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000763_F4BC_41d4_AC3D_ED76B4DB6031" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000764_F4BC_41d4_AC3D_ED76B4DB6031" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_007010B6_A8F8_4270_B7F3_A6520D473D5E" name="epo:hasBuyerLegalTypeDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000717_A8F8_4270_B7F3_A6520D473D5E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000718_A8F8_4270_B7F3_A6520D473D5E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000765_A8F8_4270_B7F3_A6520D473D5E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000766_A8F8_4270_B7F3_A6520D473D5E" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_37683BEF_44D2_405c_BD81_82AFC900B45E" name="epo:hasLegalFormType">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000719_44D2_405c_BD81_82AFC900B45E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000720_44D2_405c_BD81_82AFC900B45E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000767_44D2_405c_BD81_82AFC900B45E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000768_44D2_405c_BD81_82AFC900B45E" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_603D2E08_0496_4bc9_88B1_69BC1C7E7EC5" name="epo:hasMainActivityDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000721_0496_4bc9_88B1_69BC1C7E7EC5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000722_0496_4bc9_88B1_69BC1C7E7EC5" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000769_0496_4bc9_88B1_69BC1C7E7EC5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000770_0496_4bc9_88B1_69BC1C7E7EC5" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_92AEFFF2_FA4D_44f1_804B_58D9571C4D04" name="epo:hasInternetAddress">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000723_FA4D_44f1_804B_58D9571C4D04" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000724_FA4D_44f1_804B_58D9571C4D04" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000771_FA4D_44f1_804B_58D9571C4D04" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000772_FA4D_44f1_804B_58D9571C4D04" value="*"/>
 							<type xmi:idref="EAJava_xsd_anyURI"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst57F338_A3A5_457d_AE66_986280A7B2F6" name="epo:hasLegalIdentifier" association="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000725__A3A5_457d_AE66_986280A7B2F6" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000726__A3A5_457d_AE66_986280A7B2F6" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000773__A3A5_457d_AE66_986280A7B2F6" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000774__A3A5_457d_AE66_986280A7B2F6" value="*"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_19AD8C15_4D9D_48f2_A3E1_A997E86942D2" general="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst19249F_490A_42c9_B131_6D083DB9839A" name="epo:canProvideNonDiscriminatoryEvidence" association="EAID_2F19249F_490A_42c9_B131_6D083DB9839A">
 							<type xmi:idref="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000727__490A_42c9_B131_6D083DB9839A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000728__490A_42c9_B131_6D083DB9839A" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000775__490A_42c9_B131_6D083DB9839A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000776__490A_42c9_B131_6D083DB9839A" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF93267_E672_481d_B370_202D9A0110E0" name="org:subOrganizationOf" association="EAID_2FF93267_E672_481d_B370_202D9A0110E0">
 							<type xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000729__E672_481d_B370_202D9A0110E0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000730__E672_481d_B370_202D9A0110E0" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000777__E672_481d_B370_202D9A0110E0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000778__E672_481d_B370_202D9A0110E0" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst50E4FC_E8DA_47c5_AD39_5BA2A66950B9" name="cv:registeredAddress" association="EAID_6A50E4FC_E8DA_47c5_AD39_5BA2A66950B9">
 							<type xmi:idref="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000731__E8DA_47c5_AD39_5BA2A66950B9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000732__E8DA_47c5_AD39_5BA2A66950B9" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000779__E8DA_47c5_AD39_5BA2A66950B9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000780__E8DA_47c5_AD39_5BA2A66950B9" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst71787B_152C_48e6_B55B_A94D38ED4C2F" name="epo:canProvideTaxAndSocialSecuritiesEvidence" association="EAID_8B71787B_152C_48e6_B55B_A94D38ED4C2F">
 							<type xmi:idref="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000733__152C_48e6_B55B_A94D38ED4C2F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000734__152C_48e6_B55B_A94D38ED4C2F" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000781__152C_48e6_B55B_A94D38ED4C2F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000782__152C_48e6_B55B_A94D38ED4C2F" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst23612C_1865_4c8b_82ED_0BAA7D433501" name="locn:address" association="EAID_9F23612C_1865_4c8b_82ED_0BAA7D433501">
 							<type xmi:idref="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000735__1865_4c8b_82ED_0BAA7D433501" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000736__1865_4c8b_82ED_0BAA7D433501" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000783__1865_4c8b_82ED_0BAA7D433501" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000784__1865_4c8b_82ED_0BAA7D433501" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstD44282_10C8_422c_82F3_D4CC50B411F4" name="epo:hasPrimaryContactPoint" association="EAID_C2D44282_10C8_422c_82F3_D4CC50B411F4">
 							<type xmi:idref="EAID_33E9269C_0B96_4b38_A129_C30771A9833F"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000737__10C8_422c_82F3_D4CC50B411F4" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000738__10C8_422c_82F3_D4CC50B411F4" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000785__10C8_422c_82F3_D4CC50B411F4" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000786__10C8_422c_82F3_D4CC50B411F4" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst1BEE04_A51F_434f_9F2B_CD75C658FF42" name="epo:hasCertification" association="EAID_D01BEE04_A51F_434f_9F2B_CD75C658FF42">
 							<type xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000739__A51F_434f_9F2B_CD75C658FF42" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000740__A51F_434f_9F2B_CD75C658FF42" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000787__A51F_434f_9F2B_CD75C658FF42" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000788__A51F_434f_9F2B_CD75C658FF42" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstABB55C_F52F_4373_8164_044CE03A05CB" name="epo:hasTaxIdentifier" association="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000741__F52F_4373_8164_044CE03A05CB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000742__F52F_4373_8164_044CE03A05CB" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000789__F52F_4373_8164_044CE03A05CB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000790__F52F_4373_8164_044CE03A05CB" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6">
-						<memberEnd xmi:idref="EAID_dst57F338_A3A5_457d_AE66_986280A7B2F6"/>
-						<memberEnd xmi:idref="EAID_src57F338_A3A5_457d_AE66_986280A7B2F6"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src57F338_A3A5_457d_AE66_986280A7B2F6" association="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6">
-							<type xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_15FE118D_5443_4723_8887_BFF48DC77200" supplier="EAID_B64484AC_23D5_423f_A683_B6FC29EE98CC" client="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_1FFF54A3_B491_40f9_AB43_E5A825C5F2E2" supplier="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" client="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_2FF93267_E672_481d_B370_202D9A0110E0">
@@ -4000,13 +5183,6 @@
 						</ownedEnd>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_D8B16DE0_0613_42f0_811D_F82085D6A825" supplier="EAID_5FC03FB6_FD84_4bb6_988F_5C88024446CE" client="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB">
-						<memberEnd xmi:idref="EAID_dstABB55C_F52F_4373_8164_044CE03A05CB"/>
-						<memberEnd xmi:idref="EAID_srcABB55C_F52F_4373_8164_044CE03A05CB"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcABB55C_F52F_4373_8164_044CE03A05CB" association="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB">
-							<type xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B6D90197_EC7F_4a01_8047_2DAC846D9C03">
 						<memberEnd xmi:idref="EAID_dstD90197_EC7F_4a01_8047_2DAC846D9C03"/>
 						<memberEnd xmi:idref="EAID_srcD90197_EC7F_4a01_8047_2DAC846D9C03"/>
@@ -4023,70 +5199,71 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" name="person:Person">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_3AAE7D72_B79E_4eb4_80F0_5CA37EE9A9CC" name="foaf:name">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000743_B79E_4eb4_80F0_5CA37EE9A9CC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000744_B79E_4eb4_80F0_5CA37EE9A9CC" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000791_B79E_4eb4_80F0_5CA37EE9A9CC" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000792_B79E_4eb4_80F0_5CA37EE9A9CC" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_2FEA1955_9850_48d7_9727_2F95770EFD98" name="foaf:familyName">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000745_9850_48d7_9727_2F95770EFD98" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000746_9850_48d7_9727_2F95770EFD98" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000793_9850_48d7_9727_2F95770EFD98" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000794_9850_48d7_9727_2F95770EFD98" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_610E9A03_95D6_4189_9498_4B6491677473" name="foaf:givenName">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000747_95D6_4189_9498_4B6491677473" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000748_95D6_4189_9498_4B6491677473" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000795_95D6_4189_9498_4B6491677473" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000796_95D6_4189_9498_4B6491677473" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_B886263C_9ACE_4eb3_AAA4_B695015AA072" name="person:patronymicName">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000749_9ACE_4eb3_AAA4_B695015AA072" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000750_9ACE_4eb3_AAA4_B695015AA072" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000797_9ACE_4eb3_AAA4_B695015AA072" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000798_9ACE_4eb3_AAA4_B695015AA072" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_C9671A98_14E5_4c22_8CDF_B2A44D33AB17" name="dct:alternative">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000751_14E5_4c22_8CDF_B2A44D33AB17" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000752_14E5_4c22_8CDF_B2A44D33AB17" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000799_14E5_4c22_8CDF_B2A44D33AB17" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000800_14E5_4c22_8CDF_B2A44D33AB17" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_263C8A1F_B813_473e_B8A5_0B8FD9FC3485" name="person:birthName">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000753_B813_473e_B8A5_0B8FD9FC3485" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000754_B813_473e_B8A5_0B8FD9FC3485" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000801_B813_473e_B8A5_0B8FD9FC3485" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000802_B813_473e_B8A5_0B8FD9FC3485" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_8CD78B10_2568_474b_B4FD_89DEF282507C" name="cv:birthDate">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000755_2568_474b_B4FD_89DEF282507C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000756_2568_474b_B4FD_89DEF282507C" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000803_2568_474b_B4FD_89DEF282507C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000804_2568_474b_B4FD_89DEF282507C" value="1"/>
 							<type xmi:idref="EAJava_xsd_date"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst236B4B_9308_46ad_9581_3601B37AA6A4" name="cv:registeredAddress" association="EAID_28236B4B_9308_46ad_9581_3601B37AA6A4">
 							<type xmi:idref="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000757__9308_46ad_9581_3601B37AA6A4" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000758__9308_46ad_9581_3601B37AA6A4" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000805__9308_46ad_9581_3601B37AA6A4" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000806__9308_46ad_9581_3601B37AA6A4" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_F79A58B0_3229_4f09_A0DE_6D0C5CD5A716" general="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_src0783CB_543D_493b_8D89_2DD66914E4DD" name="epo:isBeneficialOwnerOf" association="EAID_610783CB_543D_493b_8D89_2DD66914E4DD">
 							<type xmi:idref="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000759__543D_493b_8D89_2DD66914E4DD" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000760__543D_493b_8D89_2DD66914E4DD" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000807__543D_493b_8D89_2DD66914E4DD" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000808__543D_493b_8D89_2DD66914E4DD" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_677B606B_352C_459b_9644_C85CAC550728" supplier="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" client="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225"/>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_7E6F9511_A2DD_4f1c_B8AA_9EA312803C2B" supplier="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" client="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_F8F2DEF8_6045_44d5_93B9_E57CE8023BE9" name="time:Duration"/>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" name="epo:AwardDecision">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_056A68FB_CC31_4937_8CD8_3FFE6692677E" name="epo:hasAwardDecisionDate">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000761_CC31_4937_8CD8_3FFE6692677E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000762_CC31_4937_8CD8_3FFE6692677E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000809_CC31_4937_8CD8_3FFE6692677E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000810_CC31_4937_8CD8_3FFE6692677E" value="1"/>
 							<type xmi:idref="EAJava_xsd_dateTime"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_BE5D6D69_56E5_4540_9E6C_9ECA9C74AD61" name="epo:hasAdditionalNonAwardJustification">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000763_56E5_4540_9E6C_9ECA9C74AD61" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000764_56E5_4540_9E6C_9ECA9C74AD61" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000811_56E5_4540_9E6C_9ECA9C74AD61" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000812_56E5_4540_9E6C_9ECA9C74AD61" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_A1934B85_FC19_4477_B74D_B5F732EECD28" general="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst215D61_0282_4111_B11C_CBD651205C58" name="epo:comprisesAwardOutcome" association="EAID_CF215D61_0282_4111_B11C_CBD651205C58">
 							<type xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000765__0282_4111_B11C_CBD651205C58" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000766__0282_4111_B11C_CBD651205C58" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000813__0282_4111_B11C_CBD651205C58" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000814__0282_4111_B11C_CBD651205C58" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_2EC2BFAF_50AE_496d_A93E_27A2FA651CF4">
@@ -4119,80 +5296,80 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" name="epo:ProcurementObject">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_DF5B1B42_9DD2_4e8d_A789_27EB4A9F5270" name="epo:isSMESuitable">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000767_9DD2_4e8d_A789_27EB4A9F5270" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000768_9DD2_4e8d_A789_27EB4A9F5270" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000815_9DD2_4e8d_A789_27EB4A9F5270" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000816_9DD2_4e8d_A789_27EB4A9F5270" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_AAB414E4_6B76_4724_850E_FD4E9D1A9A36" name="epo:hasAdditionalInformation">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000769_6B76_4724_850E_FD4E9D1A9A36" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000770_6B76_4724_850E_FD4E9D1A9A36" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000817_6B76_4724_850E_FD4E9D1A9A36" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000818_6B76_4724_850E_FD4E9D1A9A36" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_81C8CC43_F9F3_4dbf_B86E_3117B7D59284" name="epo:isUsingEUFunds">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000771_F9F3_4dbf_B86E_3117B7D59284" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000772_F9F3_4dbf_B86E_3117B7D59284" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000819_F9F3_4dbf_B86E_3117B7D59284" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000820_F9F3_4dbf_B86E_3117B7D59284" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_7963EE6A_6E17_4cc0_9D4D_F2B3BD7DDB82" name="epo:isCoveredByGPA">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000773_6E17_4cc0_9D4D_F2B3BD7DDB82" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000774_6E17_4cc0_9D4D_F2B3BD7DDB82" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000821_6E17_4cc0_9D4D_F2B3BD7DDB82" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000822_6E17_4cc0_9D4D_F2B3BD7DDB82" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_C4978D81_7036_4dff_887C_4784F26EE895" name="epo:isRecurrent">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000775_7036_4dff_887C_4784F26EE895" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000776_7036_4dff_887C_4784F26EE895" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000823_7036_4dff_887C_4784F26EE895" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000824_7036_4dff_887C_4784F26EE895" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_8F62A6D7_E2B5_4316_8B14_C02E3FA048F0" name="epo:hasRecurrenceDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000777_E2B5_4316_8B14_C02E3FA048F0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000778_E2B5_4316_8B14_C02E3FA048F0" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000825_E2B5_4316_8B14_C02E3FA048F0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000826_E2B5_4316_8B14_C02E3FA048F0" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_9D9B9980_E3C9_4487_8DC0_2F870FD3CE34" name="epo:hasLegalBasisDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000779_E3C9_4487_8DC0_2F870FD3CE34" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000780_E3C9_4487_8DC0_2F870FD3CE34" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000827_E3C9_4487_8DC0_2F870FD3CE34" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000828_E3C9_4487_8DC0_2F870FD3CE34" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst23E4D3_4706_4097_A6E7_D6BCEF598E62" name="epo:hasPurpose" association="EAID_0823E4D3_4706_4097_A6E7_D6BCEF598E62">
 							<type xmi:idref="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000781__4706_4097_A6E7_D6BCEF598E62" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000782__4706_4097_A6E7_D6BCEF598E62" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000829__4706_4097_A6E7_D6BCEF598E62" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000830__4706_4097_A6E7_D6BCEF598E62" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst625CFF_139F_4712_8BB6_681888ACB178" name="epo:isFundedBy" association="EAID_0F625CFF_139F_4712_8BB6_681888ACB178">
 							<type xmi:idref="EAID_495BBB92_468A_4f08_9330_A0C75730B97A"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000783__139F_4712_8BB6_681888ACB178" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000784__139F_4712_8BB6_681888ACB178" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000831__139F_4712_8BB6_681888ACB178" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000832__139F_4712_8BB6_681888ACB178" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst416646_B3CA_4c57_AD37_79213AD539C8" name="epo:hasLaunchFrameworkAgreementMaximumValue" association="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000785__B3CA_4c57_AD37_79213AD539C8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000786__B3CA_4c57_AD37_79213AD539C8" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000833__B3CA_4c57_AD37_79213AD539C8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000834__B3CA_4c57_AD37_79213AD539C8" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst8697AF_821C_40da_B5DE_D7ED82169378" name="epo:isSubjectToTerm" association="EAID_818697AF_821C_40da_B5DE_D7ED82169378">
 							<type xmi:idref="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000787__821C_40da_B5DE_D7ED82169378" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000788__821C_40da_B5DE_D7ED82169378" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000835__821C_40da_B5DE_D7ED82169378" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000836__821C_40da_B5DE_D7ED82169378" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstD470D5_433B_4242_826E_974C4A3AEF87" name="epo:fulfillsStrategicProcurement" association="EAID_81D470D5_433B_4242_826E_974C4A3AEF87">
 							<type xmi:idref="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000789__433B_4242_826E_974C4A3AEF87" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000790__433B_4242_826E_974C4A3AEF87" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000837__433B_4242_826E_974C4A3AEF87" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000838__433B_4242_826E_974C4A3AEF87" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst203FD8_0FBB_48f1_B54C_5FBB7973D2FA" name="epo:foreseesConcession" association="EAID_93203FD8_0FBB_48f1_B54C_5FBB7973D2FA">
 							<type xmi:idref="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000791__0FBB_48f1_B54C_5FBB7973D2FA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000792__0FBB_48f1_B54C_5FBB7973D2FA" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000839__0FBB_48f1_B54C_5FBB7973D2FA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000840__0FBB_48f1_B54C_5FBB7973D2FA" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_AB768772_FAC4_4353_A1C6_F384FEC304AE" general="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE68ED4_8A73_411c_B751_1F0998CC86A7" name="epo:usesTechnique" association="EAID_ADE68ED4_8A73_411c_B751_1F0998CC86A7">
 							<type xmi:idref="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000793__8A73_411c_B751_1F0998CC86A7" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000794__8A73_411c_B751_1F0998CC86A7" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000841__8A73_411c_B751_1F0998CC86A7" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000842__8A73_411c_B751_1F0998CC86A7" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst463DF7_672E_4208_A39E_E74480CCE1D0" name="epo:foreseesContractSpecificTerm" association="EAID_F1463DF7_672E_4208_A39E_E74480CCE1D0">
 							<type xmi:idref="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000795__672E_4208_A39E_E74480CCE1D0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000796__672E_4208_A39E_E74480CCE1D0" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000843__672E_4208_A39E_E74480CCE1D0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000844__672E_4208_A39E_E74480CCE1D0" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0823E4D3_4706_4097_A6E7_D6BCEF598E62">
@@ -4203,13 +5380,6 @@
 						</ownedEnd>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_2FC633C9_64DB_4b46_9190_197D4A4F4C63" supplier="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" client="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8">
-						<memberEnd xmi:idref="EAID_dst416646_B3CA_4c57_AD37_79213AD539C8"/>
-						<memberEnd xmi:idref="EAID_src416646_B3CA_4c57_AD37_79213AD539C8"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src416646_B3CA_4c57_AD37_79213AD539C8" association="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8">
-							<type xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_AFFFCDAE_C459_4420_9649_6F7949D3D9BA">
 						<memberEnd xmi:idref="EAID_dstFFCDAE_C459_4420_9649_6F7949D3D9BA"/>
 						<memberEnd xmi:idref="EAID_srcFFCDAE_C459_4420_9649_6F7949D3D9BA"/>
@@ -4220,13 +5390,13 @@
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" name="epo:Lot">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst1AA305_6E1E_4123_A7F5_548146C45BC4" name="epo:specifiesProcurementCriterion" association="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4">
 							<type xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000797__6E1E_4123_A7F5_548146C45BC4" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000798__6E1E_4123_A7F5_548146C45BC4" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000845__6E1E_4123_A7F5_548146C45BC4" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000846__6E1E_4123_A7F5_548146C45BC4" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstEB98FB_35C4_4015_80BE_9C778A0BA2A5" name="epo:isSubjectToLotSpecificTerm" association="EAID_7DEB98FB_35C4_4015_80BE_9C778A0BA2A5">
 							<type xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000799__35C4_4015_80BE_9C778A0BA2A5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000800__35C4_4015_80BE_9C778A0BA2A5" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000847__35C4_4015_80BE_9C778A0BA2A5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000848__35C4_4015_80BE_9C778A0BA2A5" value="*"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_BE41CCFB_8495_440b_ADCE_908A980E0342" general="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
 					</packagedElement>
@@ -4279,6 +5449,13 @@
 							<type xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A959BE8D_107A_4aaf_BE64_567414A2ABCC">
+						<memberEnd xmi:idref="EAID_dst59BE8D_107A_4aaf_BE64_567414A2ABCC"/>
+						<memberEnd xmi:idref="EAID_src59BE8D_107A_4aaf_BE64_567414A2ABCC"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src59BE8D_107A_4aaf_BE64_567414A2ABCC" association="EAID_A959BE8D_107A_4aaf_BE64_567414A2ABCC">
+							<type xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349">
 						<memberEnd xmi:idref="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349"/>
 						<memberEnd xmi:idref="EAID_src990D3C_51ED_4626_9195_C96F98BD3349"/>
@@ -4289,40 +5466,26 @@
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" name="epo:PlannedProcurementPart">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst4516BD_7CD7_4f69_89C8_D3FC52D7CF0C" name="epo:foreseesTechnique" association="EAID_2D4516BD_7CD7_4f69_89C8_D3FC52D7CF0C">
 							<type xmi:idref="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000801__7CD7_4f69_89C8_D3FC52D7CF0C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000802__7CD7_4f69_89C8_D3FC52D7CF0C" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000849__7CD7_4f69_89C8_D3FC52D7CF0C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000850__7CD7_4f69_89C8_D3FC52D7CF0C" value="*"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_71953D29_84AD_4774_9664_258E887283AF" general="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstFFCDAE_C459_4420_9649_6F7949D3D9BA" name="epo:foreseesProcurementObject" association="EAID_AFFFCDAE_C459_4420_9649_6F7949D3D9BA">
 							<type xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000803__C459_4420_9649_6F7949D3D9BA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000804__C459_4420_9649_6F7949D3D9BA" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000851__C459_4420_9649_6F7949D3D9BA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000852__C459_4420_9649_6F7949D3D9BA" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst7EAC2F_A434_424a_8ECC_D32EF06886BB" name="epo:hasPlannedPeriod" association="EAID_D77EAC2F_A434_424a_8ECC_D32EF06886BB">
 							<type xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000805__A434_424a_8ECC_D32EF06886BB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000806__A434_424a_8ECC_D32EF06886BB" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000853__A434_424a_8ECC_D32EF06886BB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000854__A434_424a_8ECC_D32EF06886BB" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst2AC560_378D_4c18_9647_0E2E150D7463" name="epo:hasPlannedDuration" association="EAID_EB2AC560_378D_4c18_9647_0E2E150D7463">
 							<type xmi:idref="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000807__378D_4c18_9647_0E2E150D7463" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000808__378D_4c18_9647_0E2E150D7463" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000855__378D_4c18_9647_0E2E150D7463" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000856__378D_4c18_9647_0E2E150D7463" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D77EAC2F_A434_424a_8ECC_D32EF06886BB">
-						<memberEnd xmi:idref="EAID_dst7EAC2F_A434_424a_8ECC_D32EF06886BB"/>
-						<memberEnd xmi:idref="EAID_src7EAC2F_A434_424a_8ECC_D32EF06886BB"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src7EAC2F_A434_424a_8ECC_D32EF06886BB" association="EAID_D77EAC2F_A434_424a_8ECC_D32EF06886BB">
-							<type xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_EB2AC560_378D_4c18_9647_0E2E150D7463">
-						<memberEnd xmi:idref="EAID_dst2AC560_378D_4c18_9647_0E2E150D7463"/>
-						<memberEnd xmi:idref="EAID_src2AC560_378D_4c18_9647_0E2E150D7463"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2AC560_378D_4c18_9647_0E2E150D7463" association="EAID_EB2AC560_378D_4c18_9647_0E2E150D7463">
-							<type xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_5A3E83F2_4A0C_4707_ACA1_C8D3B87F7C00">
 						<memberEnd xmi:idref="EAID_dst3E83F2_4A0C_4707_ACA1_C8D3B87F7C00"/>
 						<memberEnd xmi:idref="EAID_src3E83F2_4A0C_4707_ACA1_C8D3B87F7C00"/>
@@ -4332,8 +5495,8 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C" name="epo:CertificationLabel">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_E5097931_AB6F_4533_9B27_84455D46F093" name="epo:hasReferenceURI">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000809_AB6F_4533_9B27_84455D46F093" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000810_AB6F_4533_9B27_84455D46F093" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000857_AB6F_4533_9B27_84455D46F093" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000858_AB6F_4533_9B27_84455D46F093" value="1"/>
 							<type xmi:idref="EAJava_xsd_anyURI"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_8210E652_8F84_48dd_BE0E_772ACFDB16C5" general="EAID_86057FC2_7717_4160_8952_6A9F572F43B2"/>
@@ -4348,60 +5511,60 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" name="epo:Procedure">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_790B2918_2B58_40de_B8E7_6698AA589C5E" name="epo:isAccelerated">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000811_2B58_40de_B8E7_6698AA589C5E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000812_2B58_40de_B8E7_6698AA589C5E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000859_2B58_40de_B8E7_6698AA589C5E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000860_2B58_40de_B8E7_6698AA589C5E" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_8DBF2461_62A0_40d3_B39B_A3C66EAE9CD7" name="epo:hasAcceleratedProcedureJustification">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000813_62A0_40d3_B39B_A3C66EAE9CD7" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000814_62A0_40d3_B39B_A3C66EAE9CD7" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000861_62A0_40d3_B39B_A3C66EAE9CD7" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000862_62A0_40d3_B39B_A3C66EAE9CD7" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_1237AF42_0ACB_4905_9E98_37EB4AD1C8CE" name="epo:hasMainFeature">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000815_0ACB_4905_9E98_37EB4AD1C8CE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000816_0ACB_4905_9E98_37EB4AD1C8CE" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000863_0ACB_4905_9E98_37EB4AD1C8CE" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000864_0ACB_4905_9E98_37EB4AD1C8CE" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_DCB6F0F3_A5AA_4582_8838_5A6AE79C81A6" name="epo:isJointProcurement">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000817_A5AA_4582_8838_5A6AE79C81A6" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000818_A5AA_4582_8838_5A6AE79C81A6" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000865_A5AA_4582_8838_5A6AE79C81A6" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000866_A5AA_4582_8838_5A6AE79C81A6" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_E1AF6ECF_E2E5_420f_B454_601D03392D27" name="epo:isDesignContest">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000819_E2E5_420f_B454_601D03392D27" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000820_E2E5_420f_B454_601D03392D27" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000867_E2E5_420f_B454_601D03392D27" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000868_E2E5_420f_B454_601D03392D27" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst8C734E_FD33_4153_9939_FA613CEB5D22" name="epo:isSubjectToProcedureSpecificTerm" association="EAID_1C8C734E_FD33_4153_9939_FA613CEB5D22">
 							<type xmi:idref="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000821__FD33_4153_9939_FA613CEB5D22" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000822__FD33_4153_9939_FA613CEB5D22" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000869__FD33_4153_9939_FA613CEB5D22" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000870__FD33_4153_9939_FA613CEB5D22" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst460B26_E1D3_4c16_AB2B_CBE8A5D24AC5" name="epo:isExecutedByProcurementServiceProvider" association="EAID_28460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
 							<type xmi:idref="EAID_49EC0F16_408C_4b28_B611_0048946DC070"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000823__E1D3_4c16_AB2B_CBE8A5D24AC5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000824__E1D3_4c16_AB2B_CBE8A5D24AC5" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000871__E1D3_4c16_AB2B_CBE8A5D24AC5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000872__E1D3_4c16_AB2B_CBE8A5D24AC5" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst2D6DCC_5092_48cf_878A_8035A42A43F9" name="epo:involvesBuyer" association="EAID_9B2D6DCC_5092_48cf_878A_8035A42A43F9">
 							<type xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000825__5092_48cf_878A_8035A42A43F9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000826__5092_48cf_878A_8035A42A43F9" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000873__5092_48cf_878A_8035A42A43F9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000874__5092_48cf_878A_8035A42A43F9" value="*"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_B8BA8A30_8A22_4475_A8A7_C0037581B6D3" general="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst1E7677_5AC2_42b1_AA17_2A8EC003CCFE" name="epo:isResponsibilityOfBuyer" association="EAID_D01E7677_5AC2_42b1_AA17_2A8EC003CCFE">
 							<type xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000827__5AC2_42b1_AA17_2A8EC003CCFE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000828__5AC2_42b1_AA17_2A8EC003CCFE" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000875__5AC2_42b1_AA17_2A8EC003CCFE" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000876__5AC2_42b1_AA17_2A8EC003CCFE" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349" name="epo:hasProcurementScopeDividedIntoLot" association="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349">
 							<type xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000829__51ED_4626_9195_C96F98BD3349" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000830__51ED_4626_9195_C96F98BD3349" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000877__51ED_4626_9195_C96F98BD3349" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000878__51ED_4626_9195_C96F98BD3349" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst9BB27E_7F36_41c3_8166_36C3538F2F3A" name="epo:specifiesProcurementCriteriaSummary" association="EAID_DB9BB27E_7F36_41c3_8166_36C3538F2F3A">
 							<type xmi:idref="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000831__7F36_41c3_8166_36C3538F2F3A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000832__7F36_41c3_8166_36C3538F2F3A" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000879__7F36_41c3_8166_36C3538F2F3A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000880__7F36_41c3_8166_36C3538F2F3A" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_169198B9_544A_4d67_9273_0F076E0C1306" supplier="EAID_9303CE6E_F83F_4762_A306_7FCBDE0E5A37" client="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
@@ -4459,74 +5622,56 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" name="epo:LotGroup">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_111B13D0_49D1_4dc7_8B71_0B31EC8EEB86" name="dct:title">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000833_49D1_4dc7_8B71_0B31EC8EEB86" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000834_49D1_4dc7_8B71_0B31EC8EEB86" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000881_49D1_4dc7_8B71_0B31EC8EEB86" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000882_49D1_4dc7_8B71_0B31EC8EEB86" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_173CC3A0_D7A4_446f_9BF4_D16B18C2D0C4" name="dct:description">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000835_D7A4_446f_9BF4_D16B18C2D0C4" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000836_D7A4_446f_9BF4_D16B18C2D0C4" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000883_D7A4_446f_9BF4_D16B18C2D0C4" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000884_D7A4_446f_9BF4_D16B18C2D0C4" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_EA7396EC_86FC_4bd3_B6B9_2F35805804F8" name="epo:isSMESuitable">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000885_86FC_4bd3_B6B9_2F35805804F8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000886_86FC_4bd3_B6B9_2F35805804F8" value="1"/>
+							<type xmi:idref="EAJava_xsd_boolean"/>
+						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F" name="epo:setsGroupingContextForLot" association="EAID_20732599_332F_4f0e_BFE6_593632EDB11F">
 							<type xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000837__332F_4f0e_BFE6_593632EDB11F" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000838__332F_4f0e_BFE6_593632EDB11F" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000887__332F_4f0e_BFE6_593632EDB11F" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000888__332F_4f0e_BFE6_593632EDB11F" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst5234FB_4CE0_475f_A94B_6552B0F5A59A" name="epo:isSubjectToLotSpecificTerm" association="EAID_505234FB_4CE0_475f_A94B_6552B0F5A59A">
+							<type xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000889__4CE0_475f_A94B_6552B0F5A59A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000890__4CE0_475f_A94B_6552B0F5A59A" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst771AD3_C775_4324_AEBA_EA277D05F7E8" name="epo:hasInternalIdentifier" association="EAID_55771AD3_C775_4324_AEBA_EA277D05F7E8">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000839__C775_4324_AEBA_EA277D05F7E8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000840__C775_4324_AEBA_EA277D05F7E8" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000891__C775_4324_AEBA_EA277D05F7E8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000892__C775_4324_AEBA_EA277D05F7E8" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst8CC8C6_3A48_4541_8467_9DDA71E8D534" name="adms:identifier" association="EAID_608CC8C6_3A48_4541_8467_9DDA71E8D534">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000841__3A48_4541_8467_9DDA71E8D534" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000842__3A48_4541_8467_9DDA71E8D534" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000893__3A48_4541_8467_9DDA71E8D534" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000894__3A48_4541_8467_9DDA71E8D534" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstA7614C_D179_4558_8F62_2FA41A99DF74" name="epo:hasEstimatedValue" association="EAID_72A7614C_D179_4558_8F62_2FA41A99DF74">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000843__D179_4558_8F62_2FA41A99DF74" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000844__D179_4558_8F62_2FA41A99DF74" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000895__D179_4558_8F62_2FA41A99DF74" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000896__D179_4558_8F62_2FA41A99DF74" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstC50180_5437_4a3f_9E66_5EBEFD7759BC" name="epo:hasLaunchFrameworkAgreementMaximumValue" association="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000845__5437_4a3f_9E66_5EBEFD7759BC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000846__5437_4a3f_9E66_5EBEFD7759BC" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000897__5437_4a3f_9E66_5EBEFD7759BC" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000898__5437_4a3f_9E66_5EBEFD7759BC" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst7073E1_3362_472f_B087_27A619B6C819" name="epo:specifiesProcurementCriterion" association="EAID_FC7073E1_3362_472f_B087_27A619B6C819">
 							<type xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000847__3362_472f_B087_27A619B6C819" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000848__3362_472f_B087_27A619B6C819" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000899__3362_472f_B087_27A619B6C819" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000900__3362_472f_B087_27A619B6C819" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_55771AD3_C775_4324_AEBA_EA277D05F7E8">
-						<memberEnd xmi:idref="EAID_dst771AD3_C775_4324_AEBA_EA277D05F7E8"/>
-						<memberEnd xmi:idref="EAID_src771AD3_C775_4324_AEBA_EA277D05F7E8"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src771AD3_C775_4324_AEBA_EA277D05F7E8" association="EAID_55771AD3_C775_4324_AEBA_EA277D05F7E8">
-							<type xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_608CC8C6_3A48_4541_8467_9DDA71E8D534">
-						<memberEnd xmi:idref="EAID_dst8CC8C6_3A48_4541_8467_9DDA71E8D534"/>
-						<memberEnd xmi:idref="EAID_src8CC8C6_3A48_4541_8467_9DDA71E8D534"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8CC8C6_3A48_4541_8467_9DDA71E8D534" association="EAID_608CC8C6_3A48_4541_8467_9DDA71E8D534">
-							<type xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_72A7614C_D179_4558_8F62_2FA41A99DF74">
-						<memberEnd xmi:idref="EAID_dstA7614C_D179_4558_8F62_2FA41A99DF74"/>
-						<memberEnd xmi:idref="EAID_srcA7614C_D179_4558_8F62_2FA41A99DF74"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA7614C_D179_4558_8F62_2FA41A99DF74" association="EAID_72A7614C_D179_4558_8F62_2FA41A99DF74">
-							<type xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC">
-						<memberEnd xmi:idref="EAID_dstC50180_5437_4a3f_9E66_5EBEFD7759BC"/>
-						<memberEnd xmi:idref="EAID_srcC50180_5437_4a3f_9E66_5EBEFD7759BC"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC50180_5437_4a3f_9E66_5EBEFD7759BC" association="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC">
-							<type xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_17DACA2B_8A10_4516_8C96_D5EA3AE635E9">
 						<memberEnd xmi:idref="EAID_dstDACA2B_8A10_4516_8C96_D5EA3AE635E9"/>
 						<memberEnd xmi:idref="EAID_srcDACA2B_8A10_4516_8C96_D5EA3AE635E9"/>
@@ -4578,89 +5723,61 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" name="epo:ProcurementElement">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_CA1EEF88_2E9E_40ca_8D61_5175A4D36F9E" name="dct:title">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000849_2E9E_40ca_8D61_5175A4D36F9E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000850_2E9E_40ca_8D61_5175A4D36F9E" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000901_2E9E_40ca_8D61_5175A4D36F9E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000902_2E9E_40ca_8D61_5175A4D36F9E" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_DE1FA5B9_94C7_44ae_BA93_BC77CD3943C8" name="dct:description">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000851_94C7_44ae_BA93_BC77CD3943C8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000852_94C7_44ae_BA93_BC77CD3943C8" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000903_94C7_44ae_BA93_BC77CD3943C8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000904_94C7_44ae_BA93_BC77CD3943C8" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst1AA9A3_574B_4f10_925C_C2404C3C5805" name="epo:usesChannel" association="EAID_3B1AA9A3_574B_4f10_925C_C2404C3C5805">
 							<type xmi:idref="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000853__574B_4f10_925C_C2404C3C5805" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000854__574B_4f10_925C_C2404C3C5805" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000905__574B_4f10_925C_C2404C3C5805" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000906__574B_4f10_925C_C2404C3C5805" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst3635F3_387D_467a_95E2_ACDA293AE181" name="epo:hasInternalIdentifier" association="EAID_6F3635F3_387D_467a_95E2_ACDA293AE181">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000855__387D_467a_95E2_ACDA293AE181" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000856__387D_467a_95E2_ACDA293AE181" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000907__387D_467a_95E2_ACDA293AE181" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000908__387D_467a_95E2_ACDA293AE181" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstA962A1_6ADC_4a69_9C87_1543CFCC17D9" name="epo:hasEstimatedValue" association="EAID_77A962A1_6ADC_4a69_9C87_1543CFCC17D9">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000857__6ADC_4a69_9C87_1543CFCC17D9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000858__6ADC_4a69_9C87_1543CFCC17D9" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000909__6ADC_4a69_9C87_1543CFCC17D9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000910__6ADC_4a69_9C87_1543CFCC17D9" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstFB9493_C207_456a_A0EF_B68899832EE8" name="adms:identifier" association="EAID_95FB9493_C207_456a_A0EF_B68899832EE8">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000859__C207_456a_A0EF_B68899832EE8" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000860__C207_456a_A0EF_B68899832EE8" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000911__C207_456a_A0EF_B68899832EE8" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000912__C207_456a_A0EF_B68899832EE8" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6F3635F3_387D_467a_95E2_ACDA293AE181">
-						<memberEnd xmi:idref="EAID_dst3635F3_387D_467a_95E2_ACDA293AE181"/>
-						<memberEnd xmi:idref="EAID_src3635F3_387D_467a_95E2_ACDA293AE181"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3635F3_387D_467a_95E2_ACDA293AE181" association="EAID_6F3635F3_387D_467a_95E2_ACDA293AE181">
-							<type xmi:idref="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_77A962A1_6ADC_4a69_9C87_1543CFCC17D9">
-						<memberEnd xmi:idref="EAID_dstA962A1_6ADC_4a69_9C87_1543CFCC17D9"/>
-						<memberEnd xmi:idref="EAID_srcA962A1_6ADC_4a69_9C87_1543CFCC17D9"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA962A1_6ADC_4a69_9C87_1543CFCC17D9" association="EAID_77A962A1_6ADC_4a69_9C87_1543CFCC17D9">
-							<type xmi:idref="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_95FB9493_C207_456a_A0EF_B68899832EE8">
-						<memberEnd xmi:idref="EAID_dstFB9493_C207_456a_A0EF_B68899832EE8"/>
-						<memberEnd xmi:idref="EAID_srcFB9493_C207_456a_A0EF_B68899832EE8"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFB9493_C207_456a_A0EF_B68899832EE8" association="EAID_95FB9493_C207_456a_A0EF_B68899832EE8">
-							<type xmi:idref="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07" name="epo:Purpose">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstAE0CEF_3CD9_464a_82E7_387507253B10" name="epo:hasTotalQuantity" association="EAID_55AE0CEF_3CD9_464a_82E7_387507253B10">
 							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000861__3CD9_464a_82E7_387507253B10" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000862__3CD9_464a_82E7_387507253B10" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000913__3CD9_464a_82E7_387507253B10" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000914__3CD9_464a_82E7_387507253B10" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_55AE0CEF_3CD9_464a_82E7_387507253B10">
-						<memberEnd xmi:idref="EAID_dstAE0CEF_3CD9_464a_82E7_387507253B10"/>
-						<memberEnd xmi:idref="EAID_srcAE0CEF_3CD9_464a_82E7_387507253B10"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcAE0CEF_3CD9_464a_82E7_387507253B10" association="EAID_55AE0CEF_3CD9_464a_82E7_387507253B10">
-							<type xmi:idref="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_74371426_1670_46df_8526_5A4910F24815" supplier="EAID_E55F2451_5826_4907_B311_4F37313BAEF6" client="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07"/>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_95D11AFD_5F07_4159_ABF2_BA01D9E3FEE4" supplier="EAID_E55F2451_5826_4907_B311_4F37313BAEF6" client="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07"/>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" name="epo:Certificate">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_54DC11DF_DA18_4262_A463_6D90A10A85D1" name="epo:hasCertificationNumber">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000863_DA18_4262_A463_6D90A10A85D1" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000864_DA18_4262_A463_6D90A10A85D1" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000915_DA18_4262_A463_6D90A10A85D1" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000916_DA18_4262_A463_6D90A10A85D1" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_04EC0265_2665_47d4_AEDA_E49049545B3B" general="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst176015_1FBF_4d9c_9A77_C246A6F21E71" name="epo:issuedByCertifier" association="EAID_97176015_1FBF_4d9c_9A77_C246A6F21E71">
 							<type xmi:idref="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000865__1FBF_4d9c_9A77_C246A6F21E71" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000866__1FBF_4d9c_9A77_C246A6F21E71" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000917__1FBF_4d9c_9A77_C246A6F21E71" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000918__1FBF_4d9c_9A77_C246A6F21E71" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstBED690_3A74_4118_8357_6957359310FB" name="epo:attestedByLabel" association="EAID_C3BED690_3A74_4118_8357_6957359310FB">
 							<type xmi:idref="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000867__3A74_4118_8357_6957359310FB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000868__3A74_4118_8357_6957359310FB" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000919__3A74_4118_8357_6957359310FB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000920__3A74_4118_8357_6957359310FB" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6749101F_45CB_45ba_9792_E3508C6FE92A">
@@ -4679,66 +5796,64 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" name="epo:Tender">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_497AFB0F_4C0A_478a_ABA1_C730072CAB97" name="epo:hasElectronicSubmission">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000869_4C0A_478a_ABA1_C730072CAB97" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000870_4C0A_478a_ABA1_C730072CAB97" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000921_4C0A_478a_ABA1_C730072CAB97" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000922_4C0A_478a_ABA1_C730072CAB97" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_089130B8_3D63_4690_82F1_B357630F3194" name="epo:isVariant">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000871_3D63_4690_82F1_B357630F3194" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000872_3D63_4690_82F1_B357630F3194" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000923_3D63_4690_82F1_B357630F3194" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000924_3D63_4690_82F1_B357630F3194" value="1"/>
 							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst545C91_D269_4cfe_A646_9A2FDEE01B0F" name="epo:specifiesSubcontractors" association="EAID_24545C91_D269_4cfe_A646_9A2FDEE01B0F">
 							<type xmi:idref="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000873__D269_4cfe_A646_9A2FDEE01B0F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000874__D269_4cfe_A646_9A2FDEE01B0F" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000925__D269_4cfe_A646_9A2FDEE01B0F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000926__D269_4cfe_A646_9A2FDEE01B0F" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstC8CD49_71D8_4ef9_919E_87DD36154F85" name="epo:foreseesConcession" association="EAID_47C8CD49_71D8_4ef9_919E_87DD36154F85">
 							<type xmi:idref="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000875__71D8_4ef9_919E_87DD36154F85" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000876__71D8_4ef9_919E_87DD36154F85" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000927__71D8_4ef9_919E_87DD36154F85" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000928__71D8_4ef9_919E_87DD36154F85" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstB4981B_F0BC_4d9f_9B16_DD484C6E2547" name="epo:isSubmittedForLot" association="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547">
 							<type xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000877__F0BC_4d9f_9B16_DD484C6E2547" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000878__F0BC_4d9f_9B16_DD484C6E2547" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000929__F0BC_4d9f_9B16_DD484C6E2547" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000930__F0BC_4d9f_9B16_DD484C6E2547" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst5EC3B7_635F_49aa_B61D_661F42799A98" name="epo:isSubjectToGrouping" association="EAID_7B5EC3B7_635F_49aa_B61D_661F42799A98">
 							<type xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000879__635F_49aa_B61D_661F42799A98" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000880__635F_49aa_B61D_661F42799A98" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000931__635F_49aa_B61D_661F42799A98" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000932__635F_49aa_B61D_661F42799A98" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst98771E_06E0_4141_9CF5_2CFE5FEB856B" name="epo:foreseesSubcontracting" association="EAID_7C98771E_06E0_4141_9CF5_2CFE5FEB856B">
 							<type xmi:idref="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000881__06E0_4141_9CF5_2CFE5FEB856B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000882__06E0_4141_9CF5_2CFE5FEB856B" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000933__06E0_4141_9CF5_2CFE5FEB856B" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000934__06E0_4141_9CF5_2CFE5FEB856B" value="*"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_B0961C3B_3C3E_4c2a_A3F4_443665C43EB4" general="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst964CE9_B09A_4855_B489_34E46CFF8E24" name="epo:hasFinancialOfferValue" association="EAID_D7964CE9_B09A_4855_B489_34E46CFF8E24">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000883__B09A_4855_B489_34E46CFF8E24" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000884__B09A_4855_B489_34E46CFF8E24" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000935__B09A_4855_B489_34E46CFF8E24" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000936__B09A_4855_B489_34E46CFF8E24" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst26EBD4_4329_4e57_9F78_AF7887C44E46" name="epo:isSubmitedBy" association="EAID_E026EBD4_4329_4e57_9F78_AF7887C44E46">
 							<type xmi:idref="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000885__4329_4e57_9F78_AF7887C44E46" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000886__4329_4e57_9F78_AF7887C44E46" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000937__4329_4e57_9F78_AF7887C44E46" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000938__4329_4e57_9F78_AF7887C44E46" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst53F729_4B4E_44c9_AD20_DD8131AF4BEF" name="epo:isSupportedBy" association="EAID_E453F729_4B4E_44c9_AD20_DD8131AF4BEF">
 							<type xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000887__4B4E_44c9_AD20_DD8131AF4BEF" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000888__4B4E_44c9_AD20_DD8131AF4BEF" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000939__4B4E_44c9_AD20_DD8131AF4BEF" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000940__4B4E_44c9_AD20_DD8131AF4BEF" value="1"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst09AA70_1480_4e41_8F94_BA9A89E0B960" name="epo:foreseesSubcontractor" association="EAID_ED09AA70_1480_4e41_8F94_BA9A89E0B960">
+							<type xmi:idref="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000941__1480_4e41_8F94_BA9A89E0B960" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000942__1480_4e41_8F94_BA9A89E0B960" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_19D655E2_E290_486c_A489_DFE2AC9F7B9B" supplier="EAID_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82" client="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_73E0123E_9D07_49c6_BAB3_E937B9F25B43" supplier="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" client="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D7964CE9_B09A_4855_B489_34E46CFF8E24">
-						<memberEnd xmi:idref="EAID_dst964CE9_B09A_4855_B489_34E46CFF8E24"/>
-						<memberEnd xmi:idref="EAID_src964CE9_B09A_4855_B489_34E46CFF8E24"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src964CE9_B09A_4855_B489_34E46CFF8E24" association="EAID_D7964CE9_B09A_4855_B489_34E46CFF8E24">
-							<type xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_E453F729_4B4E_44c9_AD20_DD8131AF4BEF">
 						<memberEnd xmi:idref="EAID_dst53F729_4B4E_44c9_AD20_DD8131AF4BEF"/>
 						<memberEnd xmi:idref="EAID_src53F729_4B4E_44c9_AD20_DD8131AF4BEF"/>
@@ -4755,776 +5870,36 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" name="epo:TenderGroup">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_56B00029_EF2C_47f3_9FB2_D2BCDA794426" name="dct:title">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000889_EF2C_47f3_9FB2_D2BCDA794426" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000890_EF2C_47f3_9FB2_D2BCDA794426" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000943_EF2C_47f3_9FB2_D2BCDA794426" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000944_EF2C_47f3_9FB2_D2BCDA794426" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_425B4513_4A80_406f_BCA7_4059C49A272A" name="dct:description">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000891_4A80_406f_BCA7_4059C49A272A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000892_4A80_406f_BCA7_4059C49A272A" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000945_4A80_406f_BCA7_4059C49A272A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000946_4A80_406f_BCA7_4059C49A272A" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF11C76_D909_4610_841A_BB8035525574" name="adms:identifier" association="EAID_67F11C76_D909_4610_841A_BB8035525574">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000893__D909_4610_841A_BB8035525574" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000894__D909_4610_841A_BB8035525574" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000947__D909_4610_841A_BB8035525574" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000948__D909_4610_841A_BB8035525574" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst8D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5" name="epo:comprisesTender" association="EAID_688D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5">
 							<type xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000895__0ADB_4c2a_A8CB_6EBF4CDA67D5" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000896__0ADB_4c2a_A8CB_6EBF4CDA67D5" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000949__0ADB_4c2a_A8CB_6EBF4CDA67D5" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000950__0ADB_4c2a_A8CB_6EBF4CDA67D5" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst92C123_93F7_4d51_A677_A1E36D3B53C0" name="epo:hasTotalValue" association="EAID_7A92C123_93F7_4d51_A677_A1E36D3B53C0">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000897__93F7_4d51_A677_A1E36D3B53C0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000898__93F7_4d51_A677_A1E36D3B53C0" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000951__93F7_4d51_A677_A1E36D3B53C0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000952__93F7_4d51_A677_A1E36D3B53C0" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstAB3946_257D_4382_A283_8978FB00BD51" name="epo:isSubmittedForLotGroup" association="EAID_D6AB3946_257D_4382_A283_8978FB00BD51">
 							<type xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000899__257D_4382_A283_8978FB00BD51" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000900__257D_4382_A283_8978FB00BD51" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000953__257D_4382_A283_8978FB00BD51" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000954__257D_4382_A283_8978FB00BD51" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_67F11C76_D909_4610_841A_BB8035525574">
-						<memberEnd xmi:idref="EAID_dstF11C76_D909_4610_841A_BB8035525574"/>
-						<memberEnd xmi:idref="EAID_srcF11C76_D909_4610_841A_BB8035525574"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF11C76_D909_4610_841A_BB8035525574" association="EAID_67F11C76_D909_4610_841A_BB8035525574">
-							<type xmi:idref="EAID_93ACA540_2668_42d3_BE40_C921C05C776E"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7A92C123_93F7_4d51_A677_A1E36D3B53C0">
-						<memberEnd xmi:idref="EAID_dst92C123_93F7_4d51_A677_A1E36D3B53C0"/>
-						<memberEnd xmi:idref="EAID_src92C123_93F7_4d51_A677_A1E36D3B53C0"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src92C123_93F7_4d51_A677_A1E36D3B53C0" association="EAID_7A92C123_93F7_4d51_A677_A1E36D3B53C0">
-							<type xmi:idref="EAID_93ACA540_2668_42d3_BE40_C921C05C776E"/>
-						</ownedEnd>
-					</packagedElement>
-				</packagedElement>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_715C5E37_AD21_40eb_91D0_A082D4C6829E" name="empirical types">
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" name="adms:Identifier">
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_DD21A105_2536_4ae0_A606_3868B9A27714" name="skos:notation">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000901_2536_4ae0_A606_3868B9A27714" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000902_2536_4ae0_A606_3868B9A27714" value="1"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_EC13F7E5_C9A2_45ce_A2E4_3AFC67778C5B" name="adms:schemaAgency">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000903_C9A2_45ce_A2E4_3AFC67778C5B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000904_C9A2_45ce_A2E4_3AFC67778C5B" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_291D3917_532F_4950_B4BF_22835EC1F3E6" name="epo:hasScheme">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000905_532F_4950_B4BF_22835EC1F3E6" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000906_532F_4950_B4BF_22835EC1F3E6" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_34EA5DFD_574A_4a69_9F19_59FCED4CCEFC" name="epo:hasSchemeVersion">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000907_574A_4a69_9F19_59FCED4CCEFC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000908_574A_4a69_9F19_59FCED4CCEFC" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0BDB5E69_CB31_4e1e_B095_115C894CFE58">
-						<memberEnd xmi:idref="EAID_dstDB5E69_CB31_4e1e_B095_115C894CFE58"/>
-						<memberEnd xmi:idref="EAID_srcDB5E69_CB31_4e1e_B095_115C894CFE58"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDB5E69_CB31_4e1e_B095_115C894CFE58" association="EAID_0BDB5E69_CB31_4e1e_B095_115C894CFE58">
-							<type xmi:idref="EAID_A8D775E4_EEB9_4502_B8A1_C1DD5D555864"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_11702782_CA5B_4035_84B7_1E5035469B29">
-						<memberEnd xmi:idref="EAID_dst702782_CA5B_4035_84B7_1E5035469B29"/>
-						<memberEnd xmi:idref="EAID_src702782_CA5B_4035_84B7_1E5035469B29"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src702782_CA5B_4035_84B7_1E5035469B29" association="EAID_11702782_CA5B_4035_84B7_1E5035469B29">
-							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_12549564_CE07_4367_8550_00BC16191558">
-						<memberEnd xmi:idref="EAID_dst549564_CE07_4367_8550_00BC16191558"/>
-						<memberEnd xmi:idref="EAID_src549564_CE07_4367_8550_00BC16191558"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src549564_CE07_4367_8550_00BC16191558" association="EAID_12549564_CE07_4367_8550_00BC16191558">
-							<type xmi:idref="EAID_025C0172_297F_4458_9268_2B10478B6736"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_15464872_BFB6_40bb_84F1_8A3969FE662E">
-						<memberEnd xmi:idref="EAID_dst464872_BFB6_40bb_84F1_8A3969FE662E"/>
-						<memberEnd xmi:idref="EAID_src464872_BFB6_40bb_84F1_8A3969FE662E"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src464872_BFB6_40bb_84F1_8A3969FE662E" association="EAID_15464872_BFB6_40bb_84F1_8A3969FE662E">
-							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_20A26F01_4C0B_48e1_A688_6DFFDE0D20A5">
-						<memberEnd xmi:idref="EAID_dstA26F01_4C0B_48e1_A688_6DFFDE0D20A5"/>
-						<memberEnd xmi:idref="EAID_srcA26F01_4C0B_48e1_A688_6DFFDE0D20A5"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA26F01_4C0B_48e1_A688_6DFFDE0D20A5" association="EAID_20A26F01_4C0B_48e1_A688_6DFFDE0D20A5">
-							<type xmi:idref="EAID_905EBE80_E994_48ec_B0A6_4F3CEC5EEDC0"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_23CC2B92_731F_4428_B333_8582A36D1244">
-						<memberEnd xmi:idref="EAID_dstCC2B92_731F_4428_B333_8582A36D1244"/>
-						<memberEnd xmi:idref="EAID_srcCC2B92_731F_4428_B333_8582A36D1244"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCC2B92_731F_4428_B333_8582A36D1244" association="EAID_23CC2B92_731F_4428_B333_8582A36D1244">
-							<type xmi:idref="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_31D80540_9E04_44d6_B0B4_339ED74111CC">
-						<memberEnd xmi:idref="EAID_dstD80540_9E04_44d6_B0B4_339ED74111CC"/>
-						<memberEnd xmi:idref="EAID_srcD80540_9E04_44d6_B0B4_339ED74111CC"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD80540_9E04_44d6_B0B4_339ED74111CC" association="EAID_31D80540_9E04_44d6_B0B4_339ED74111CC">
-							<type xmi:idref="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_51A6863A_1079_4af7_AE53_091E3E0514AF">
-						<memberEnd xmi:idref="EAID_dstA6863A_1079_4af7_AE53_091E3E0514AF"/>
-						<memberEnd xmi:idref="EAID_srcA6863A_1079_4af7_AE53_091E3E0514AF"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA6863A_1079_4af7_AE53_091E3E0514AF" association="EAID_51A6863A_1079_4af7_AE53_091E3E0514AF">
-							<type xmi:idref="EAID_C215EC75_82FD_45d3_832A_B3989A897692"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_5A707B7A_A266_46a0_9CA9_EBF5B2C9D483">
-						<memberEnd xmi:idref="EAID_dst707B7A_A266_46a0_9CA9_EBF5B2C9D483"/>
-						<memberEnd xmi:idref="EAID_src707B7A_A266_46a0_9CA9_EBF5B2C9D483"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src707B7A_A266_46a0_9CA9_EBF5B2C9D483" association="EAID_5A707B7A_A266_46a0_9CA9_EBF5B2C9D483">
-							<type xmi:idref="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_63091EE9_B21F_4dae_99AF_66217D43BDA9">
-						<memberEnd xmi:idref="EAID_dst091EE9_B21F_4dae_99AF_66217D43BDA9"/>
-						<memberEnd xmi:idref="EAID_src091EE9_B21F_4dae_99AF_66217D43BDA9"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src091EE9_B21F_4dae_99AF_66217D43BDA9" association="EAID_63091EE9_B21F_4dae_99AF_66217D43BDA9">
-							<type xmi:idref="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_774EE008_B895_41f1_B319_1174DD83D564">
-						<memberEnd xmi:idref="EAID_dst4EE008_B895_41f1_B319_1174DD83D564"/>
-						<memberEnd xmi:idref="EAID_src4EE008_B895_41f1_B319_1174DD83D564"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src4EE008_B895_41f1_B319_1174DD83D564" association="EAID_774EE008_B895_41f1_B319_1174DD83D564">
-							<type xmi:idref="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_77553B39_DB4D_4388_9D1B_8C8E24EB522C">
-						<memberEnd xmi:idref="EAID_dst553B39_DB4D_4388_9D1B_8C8E24EB522C"/>
-						<memberEnd xmi:idref="EAID_src553B39_DB4D_4388_9D1B_8C8E24EB522C"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src553B39_DB4D_4388_9D1B_8C8E24EB522C" association="EAID_77553B39_DB4D_4388_9D1B_8C8E24EB522C">
-							<type xmi:idref="EAID_9E80131F_7D1C_452d_98B2_308983569ECB"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7DD90B0C_4D89_4d64_AC1D_F32A308572D4">
-						<memberEnd xmi:idref="EAID_dstD90B0C_4D89_4d64_AC1D_F32A308572D4"/>
-						<memberEnd xmi:idref="EAID_srcD90B0C_4D89_4d64_AC1D_F32A308572D4"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD90B0C_4D89_4d64_AC1D_F32A308572D4" association="EAID_7DD90B0C_4D89_4d64_AC1D_F32A308572D4">
-							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA">
-						<memberEnd xmi:idref="EAID_dst6B650B_17CC_499e_A49B_8791C8D7CBEA"/>
-						<memberEnd xmi:idref="EAID_src6B650B_17CC_499e_A49B_8791C8D7CBEA"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6B650B_17CC_499e_A49B_8791C8D7CBEA" association="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA">
-							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_96C5B633_908F_48e5_82F6_C10FBDBF1DE3">
-						<memberEnd xmi:idref="EAID_dstC5B633_908F_48e5_82F6_C10FBDBF1DE3"/>
-						<memberEnd xmi:idref="EAID_srcC5B633_908F_48e5_82F6_C10FBDBF1DE3"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC5B633_908F_48e5_82F6_C10FBDBF1DE3" association="EAID_96C5B633_908F_48e5_82F6_C10FBDBF1DE3">
-							<type xmi:idref="EAID_3C8EEF69_1346_4dbe_B505_7C2D920B97B9"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9843F34E_C9D3_471a_9622_B002A7A25EA7">
-						<memberEnd xmi:idref="EAID_dst43F34E_C9D3_471a_9622_B002A7A25EA7"/>
-						<memberEnd xmi:idref="EAID_src43F34E_C9D3_471a_9622_B002A7A25EA7"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src43F34E_C9D3_471a_9622_B002A7A25EA7" association="EAID_9843F34E_C9D3_471a_9622_B002A7A25EA7">
-							<type xmi:idref="EAID_8374872A_B283_4698_9E00_72FD255BAFCB"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9F290187_06CC_4af8_83C9_F475091E0C14">
-						<memberEnd xmi:idref="EAID_dst290187_06CC_4af8_83C9_F475091E0C14"/>
-						<memberEnd xmi:idref="EAID_src290187_06CC_4af8_83C9_F475091E0C14"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src290187_06CC_4af8_83C9_F475091E0C14" association="EAID_9F290187_06CC_4af8_83C9_F475091E0C14">
-							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A489FF3B_9E63_4b65_9418_542A437B67E4">
-						<memberEnd xmi:idref="EAID_dst89FF3B_9E63_4b65_9418_542A437B67E4"/>
-						<memberEnd xmi:idref="EAID_src89FF3B_9E63_4b65_9418_542A437B67E4"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src89FF3B_9E63_4b65_9418_542A437B67E4" association="EAID_A489FF3B_9E63_4b65_9418_542A437B67E4">
-							<type xmi:idref="EAID_9E80131F_7D1C_452d_98B2_308983569ECB"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_AA0E8762_9556_4ad9_8F4A_5A66B59C8A95">
-						<memberEnd xmi:idref="EAID_dst0E8762_9556_4ad9_8F4A_5A66B59C8A95"/>
-						<memberEnd xmi:idref="EAID_src0E8762_9556_4ad9_8F4A_5A66B59C8A95"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0E8762_9556_4ad9_8F4A_5A66B59C8A95" association="EAID_AA0E8762_9556_4ad9_8F4A_5A66B59C8A95">
-							<type xmi:idref="EAID_3124967E_D23F_4c3b_9B72_E02C23A08D68"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_ACCA405B_7FF7_41ad_9ACB_A1015C643C97">
-						<memberEnd xmi:idref="EAID_dstCA405B_7FF7_41ad_9ACB_A1015C643C97"/>
-						<memberEnd xmi:idref="EAID_srcCA405B_7FF7_41ad_9ACB_A1015C643C97"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCA405B_7FF7_41ad_9ACB_A1015C643C97" association="EAID_ACCA405B_7FF7_41ad_9ACB_A1015C643C97">
-							<type xmi:idref="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_BBC722BA_3236_4fcb_B51A_14A66F3D627C">
-						<memberEnd xmi:idref="EAID_dstC722BA_3236_4fcb_B51A_14A66F3D627C"/>
-						<memberEnd xmi:idref="EAID_srcC722BA_3236_4fcb_B51A_14A66F3D627C"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC722BA_3236_4fcb_B51A_14A66F3D627C" association="EAID_BBC722BA_3236_4fcb_B51A_14A66F3D627C">
-							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C7C433B7_9297_4921_9069_80DF68AD408A">
-						<memberEnd xmi:idref="EAID_dstC433B7_9297_4921_9069_80DF68AD408A"/>
-						<memberEnd xmi:idref="EAID_srcC433B7_9297_4921_9069_80DF68AD408A"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC433B7_9297_4921_9069_80DF68AD408A" association="EAID_C7C433B7_9297_4921_9069_80DF68AD408A">
-							<type xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044">
-						<memberEnd xmi:idref="EAID_dst87FBF1_89C8_4ed0_9551_9C0C13B80044"/>
-						<memberEnd xmi:idref="EAID_src87FBF1_89C8_4ed0_9551_9C0C13B80044"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src87FBF1_89C8_4ed0_9551_9C0C13B80044" association="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044">
-							<type xmi:idref="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D42B1380_78A6_4579_B0FD_C3609EBD8AFD">
-						<memberEnd xmi:idref="EAID_dst2B1380_78A6_4579_B0FD_C3609EBD8AFD"/>
-						<memberEnd xmi:idref="EAID_src2B1380_78A6_4579_B0FD_C3609EBD8AFD"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2B1380_78A6_4579_B0FD_C3609EBD8AFD" association="EAID_D42B1380_78A6_4579_B0FD_C3609EBD8AFD">
-							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_DA6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D">
-						<memberEnd xmi:idref="EAID_dst6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D"/>
-						<memberEnd xmi:idref="EAID_src6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D" association="EAID_DA6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D">
-							<type xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_E507D198_1A41_4b43_873A_F9E88411186D">
-						<memberEnd xmi:idref="EAID_dst07D198_1A41_4b43_873A_F9E88411186D"/>
-						<memberEnd xmi:idref="EAID_src07D198_1A41_4b43_873A_F9E88411186D"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src07D198_1A41_4b43_873A_F9E88411186D" association="EAID_E507D198_1A41_4b43_873A_F9E88411186D">
-							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_ECEFDC69_19B4_47d7_A201_D8391B5C67DF">
-						<memberEnd xmi:idref="EAID_dstEFDC69_19B4_47d7_A201_D8391B5C67DF"/>
-						<memberEnd xmi:idref="EAID_srcEFDC69_19B4_47d7_A201_D8391B5C67DF"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcEFDC69_19B4_47d7_A201_D8391B5C67DF" association="EAID_ECEFDC69_19B4_47d7_A201_D8391B5C67DF">
-							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F0951C5B_94E2_4a5f_BF21_25D103CB3656">
-						<memberEnd xmi:idref="EAID_dst951C5B_94E2_4a5f_BF21_25D103CB3656"/>
-						<memberEnd xmi:idref="EAID_src951C5B_94E2_4a5f_BF21_25D103CB3656"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src951C5B_94E2_4a5f_BF21_25D103CB3656" association="EAID_F0951C5B_94E2_4a5f_BF21_25D103CB3656">
-							<type xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F3CD32F8_8180_4939_A987_53BA66264912">
-						<memberEnd xmi:idref="EAID_dstCD32F8_8180_4939_A987_53BA66264912"/>
-						<memberEnd xmi:idref="EAID_srcCD32F8_8180_4939_A987_53BA66264912"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCD32F8_8180_4939_A987_53BA66264912" association="EAID_F3CD32F8_8180_4939_A987_53BA66264912">
-							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" name="epo:Duration">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_9501DE7B_F539_4409_8D54_7B950268D75C" general="EAID_F8F2DEF8_6045_44d5_93B9_E57CE8023BE9"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_45B983F5_7502_49f2_984C_17FF6E47F8F9">
-						<memberEnd xmi:idref="EAID_dstB983F5_7502_49f2_984C_17FF6E47F8F9"/>
-						<memberEnd xmi:idref="EAID_srcB983F5_7502_49f2_984C_17FF6E47F8F9"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB983F5_7502_49f2_984C_17FF6E47F8F9" association="EAID_45B983F5_7502_49f2_984C_17FF6E47F8F9">
-							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_7D0E71D7_D624_4144_8134_2500CE9AB392" name="epo:IndefiniteDuration">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_F8285143_A232_43ae_AFC8_89D40A9529FD" general="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" name="epo:MonetaryValue">
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_2C82F10F_E6DC_49ee_8B5D_E915D4361E9C" name="epo:hasAmountValue">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000909_E6DC_49ee_8B5D_E915D4361E9C" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000910_E6DC_49ee_8B5D_E915D4361E9C" value="1"/>
-							<type xmi:idref="EAJava_xsd_decimal"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_B53ED566_A1AF_4a19_A650_4A057D5FB465" name="epo:hasCurrencyCodeListAgencyID">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000911_A1AF_4a19_A650_4A057D5FB465" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000912_A1AF_4a19_A650_4A057D5FB465" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_9BDDFF77_87A2_428c_A675_CD62FC2FF951" name="epo:hasCurrencyCodeListAgencyName">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000913_87A2_428c_A675_CD62FC2FF951" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000914_87A2_428c_A675_CD62FC2FF951" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_81C9CD14_9DC4_4cbd_8A9D_15BCC4606424" name="epo:hasCurrencyCodeListID">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000915_9DC4_4cbd_8A9D_15BCC4606424" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000916_9DC4_4cbd_8A9D_15BCC4606424" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_E9E2A1B8_A705_4847_8FE6_3B40BD241A4B" supplier="EAID_FBD046CD_CD18_4d96_99E0_63CAC8A5D594" client="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_202AF5A1_B4FE_48a4_91D4_F6387465413F">
-						<memberEnd xmi:idref="EAID_dst2AF5A1_B4FE_48a4_91D4_F6387465413F"/>
-						<memberEnd xmi:idref="EAID_src2AF5A1_B4FE_48a4_91D4_F6387465413F"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2AF5A1_B4FE_48a4_91D4_F6387465413F" association="EAID_202AF5A1_B4FE_48a4_91D4_F6387465413F">
-							<type xmi:idref="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_2729D2D0_C843_497f_B19D_1727246FC1BD">
-						<memberEnd xmi:idref="EAID_dst29D2D0_C843_497f_B19D_1727246FC1BD"/>
-						<memberEnd xmi:idref="EAID_src29D2D0_C843_497f_B19D_1727246FC1BD"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src29D2D0_C843_497f_B19D_1727246FC1BD" association="EAID_2729D2D0_C843_497f_B19D_1727246FC1BD">
-							<type xmi:idref="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_29D3C49F_AF44_49ad_8519_B199CADD080B">
-						<memberEnd xmi:idref="EAID_dstD3C49F_AF44_49ad_8519_B199CADD080B"/>
-						<memberEnd xmi:idref="EAID_srcD3C49F_AF44_49ad_8519_B199CADD080B"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD3C49F_AF44_49ad_8519_B199CADD080B" association="EAID_29D3C49F_AF44_49ad_8519_B199CADD080B">
-							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_2C64F9E7_B02B_4433_AB2C_0A6E23A8559E">
-						<memberEnd xmi:idref="EAID_dst64F9E7_B02B_4433_AB2C_0A6E23A8559E"/>
-						<memberEnd xmi:idref="EAID_src64F9E7_B02B_4433_AB2C_0A6E23A8559E"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src64F9E7_B02B_4433_AB2C_0A6E23A8559E" association="EAID_2C64F9E7_B02B_4433_AB2C_0A6E23A8559E">
-							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_2E9FE66A_E025_4563_9A59_461990838D96">
-						<memberEnd xmi:idref="EAID_dst9FE66A_E025_4563_9A59_461990838D96"/>
-						<memberEnd xmi:idref="EAID_src9FE66A_E025_4563_9A59_461990838D96"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9FE66A_E025_4563_9A59_461990838D96" association="EAID_2E9FE66A_E025_4563_9A59_461990838D96">
-							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_470D1B16_C07B_4868_91B2_799578663395">
-						<memberEnd xmi:idref="EAID_dst0D1B16_C07B_4868_91B2_799578663395"/>
-						<memberEnd xmi:idref="EAID_src0D1B16_C07B_4868_91B2_799578663395"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0D1B16_C07B_4868_91B2_799578663395" association="EAID_470D1B16_C07B_4868_91B2_799578663395">
-							<type xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_5009F883_10B2_4e9c_96A3_A1F92BE8EA63">
-						<memberEnd xmi:idref="EAID_dst09F883_10B2_4e9c_96A3_A1F92BE8EA63"/>
-						<memberEnd xmi:idref="EAID_src09F883_10B2_4e9c_96A3_A1F92BE8EA63"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src09F883_10B2_4e9c_96A3_A1F92BE8EA63" association="EAID_5009F883_10B2_4e9c_96A3_A1F92BE8EA63">
-							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_516CC611_B255_4c67_AAF8_2E19960E553F">
-						<memberEnd xmi:idref="EAID_dst6CC611_B255_4c67_AAF8_2E19960E553F"/>
-						<memberEnd xmi:idref="EAID_src6CC611_B255_4c67_AAF8_2E19960E553F"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6CC611_B255_4c67_AAF8_2E19960E553F" association="EAID_516CC611_B255_4c67_AAF8_2E19960E553F">
-							<type xmi:idref="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_569C582B_2F50_4a11_B7B6_50CA2F0A9B94">
-						<memberEnd xmi:idref="EAID_dst9C582B_2F50_4a11_B7B6_50CA2F0A9B94"/>
-						<memberEnd xmi:idref="EAID_src9C582B_2F50_4a11_B7B6_50CA2F0A9B94"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9C582B_2F50_4a11_B7B6_50CA2F0A9B94" association="EAID_569C582B_2F50_4a11_B7B6_50CA2F0A9B94">
-							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7">
-						<memberEnd xmi:idref="EAID_dst92648E_ABC4_4408_B3EA_A725F5A385F7"/>
-						<memberEnd xmi:idref="EAID_src92648E_ABC4_4408_B3EA_A725F5A385F7"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src92648E_ABC4_4408_B3EA_A725F5A385F7" association="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7">
-							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7AAF3614_44A0_4944_8E1A_EF574D760E6F">
-						<memberEnd xmi:idref="EAID_dstAF3614_44A0_4944_8E1A_EF574D760E6F"/>
-						<memberEnd xmi:idref="EAID_srcAF3614_44A0_4944_8E1A_EF574D760E6F"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcAF3614_44A0_4944_8E1A_EF574D760E6F" association="EAID_7AAF3614_44A0_4944_8E1A_EF574D760E6F">
-							<type xmi:idref="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_87123434_C2AD_43de_925D_13E9A7667A18">
-						<memberEnd xmi:idref="EAID_dst123434_C2AD_43de_925D_13E9A7667A18"/>
-						<memberEnd xmi:idref="EAID_src123434_C2AD_43de_925D_13E9A7667A18"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src123434_C2AD_43de_925D_13E9A7667A18" association="EAID_87123434_C2AD_43de_925D_13E9A7667A18">
-							<type xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_8DBBB829_4470_4b0d_A142_494C41C8807D">
-						<memberEnd xmi:idref="EAID_dstBBB829_4470_4b0d_A142_494C41C8807D"/>
-						<memberEnd xmi:idref="EAID_srcBBB829_4470_4b0d_A142_494C41C8807D"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBBB829_4470_4b0d_A142_494C41C8807D" association="EAID_8DBBB829_4470_4b0d_A142_494C41C8807D">
-							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9BF032E2_6893_45df_95FE_A08E92EA8618">
-						<memberEnd xmi:idref="EAID_dstF032E2_6893_45df_95FE_A08E92EA8618"/>
-						<memberEnd xmi:idref="EAID_srcF032E2_6893_45df_95FE_A08E92EA8618"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF032E2_6893_45df_95FE_A08E92EA8618" association="EAID_9BF032E2_6893_45df_95FE_A08E92EA8618">
-							<type xmi:idref="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A110770D_19E8_400c_A438_44EEAB172389">
-						<memberEnd xmi:idref="EAID_dst10770D_19E8_400c_A438_44EEAB172389"/>
-						<memberEnd xmi:idref="EAID_src10770D_19E8_400c_A438_44EEAB172389"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src10770D_19E8_400c_A438_44EEAB172389" association="EAID_A110770D_19E8_400c_A438_44EEAB172389">
-							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_AB852C7E_4390_46da_9255_1C4C8BE7B02F">
-						<memberEnd xmi:idref="EAID_dst852C7E_4390_46da_9255_1C4C8BE7B02F"/>
-						<memberEnd xmi:idref="EAID_src852C7E_4390_46da_9255_1C4C8BE7B02F"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src852C7E_4390_46da_9255_1C4C8BE7B02F" association="EAID_AB852C7E_4390_46da_9255_1C4C8BE7B02F">
-							<type xmi:idref="EAID_C215EC75_82FD_45d3_832A_B3989A897692"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C3F576CC_0DFC_40d6_86C4_6F47177DB0C6">
-						<memberEnd xmi:idref="EAID_dstF576CC_0DFC_40d6_86C4_6F47177DB0C6"/>
-						<memberEnd xmi:idref="EAID_srcF576CC_0DFC_40d6_86C4_6F47177DB0C6"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF576CC_0DFC_40d6_86C4_6F47177DB0C6" association="EAID_C3F576CC_0DFC_40d6_86C4_6F47177DB0C6">
-							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C753CDC6_88B6_449b_B44C_0F56A31472A7">
-						<memberEnd xmi:idref="EAID_dst53CDC6_88B6_449b_B44C_0F56A31472A7"/>
-						<memberEnd xmi:idref="EAID_src53CDC6_88B6_449b_B44C_0F56A31472A7"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src53CDC6_88B6_449b_B44C_0F56A31472A7" association="EAID_C753CDC6_88B6_449b_B44C_0F56A31472A7">
-							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_CBE972DE_D8B8_42a5_A6A1_F386873985BC">
-						<memberEnd xmi:idref="EAID_dstE972DE_D8B8_42a5_A6A1_F386873985BC"/>
-						<memberEnd xmi:idref="EAID_srcE972DE_D8B8_42a5_A6A1_F386873985BC"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE972DE_D8B8_42a5_A6A1_F386873985BC" association="EAID_CBE972DE_D8B8_42a5_A6A1_F386873985BC">
-							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F78CF3B1_3FB3_43b9_B9AB_1FE660C3663F">
-						<memberEnd xmi:idref="EAID_dst8CF3B1_3FB3_43b9_B9AB_1FE660C3663F"/>
-						<memberEnd xmi:idref="EAID_src8CF3B1_3FB3_43b9_B9AB_1FE660C3663F"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8CF3B1_3FB3_43b9_B9AB_1FE660C3663F" association="EAID_F78CF3B1_3FB3_43b9_B9AB_1FE660C3663F">
-							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" name="epo:Period">
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_C6A0334F_7F34_4839_ADEB_482CEC470A98" name="epo:hasBeginning">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000917_7F34_4839_ADEB_482CEC470A98" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000918_7F34_4839_ADEB_482CEC470A98" value="1"/>
-							<type xmi:idref="EAJava_xsd_dateTime"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_D3F00005_AF7C_45ab_927B_B38B2CEBC0D5" name="epo:hasEnd">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000919_AF7C_45ab_927B_B38B2CEBC0D5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000920_AF7C_45ab_927B_B38B2CEBC0D5" value="1"/>
-							<type xmi:idref="EAJava_xsd_dateTime"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_007A256B_E0B5_4a62_B8D7_2BC14F331BE5" supplier="EAID_5A01D361_6509_447f_B318_F20F23FBF81F" client="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_11C78626_167C_4c06_AF8A_1D37420731A9">
-						<memberEnd xmi:idref="EAID_dstC78626_167C_4c06_AF8A_1D37420731A9"/>
-						<memberEnd xmi:idref="EAID_srcC78626_167C_4c06_AF8A_1D37420731A9"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC78626_167C_4c06_AF8A_1D37420731A9" association="EAID_11C78626_167C_4c06_AF8A_1D37420731A9">
-							<type xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_33FC7129_7479_45ab_AECD_F356DB6C1872">
-						<memberEnd xmi:idref="EAID_dstFC7129_7479_45ab_AECD_F356DB6C1872"/>
-						<memberEnd xmi:idref="EAID_srcFC7129_7479_45ab_AECD_F356DB6C1872"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFC7129_7479_45ab_AECD_F356DB6C1872" association="EAID_33FC7129_7479_45ab_AECD_F356DB6C1872">
-							<type xmi:idref="EAID_A8D775E4_EEB9_4502_B8A1_C1DD5D555864"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6D569FED_815F_45f4_87EA_C0E83DC5C9AF">
-						<memberEnd xmi:idref="EAID_dst569FED_815F_45f4_87EA_C0E83DC5C9AF"/>
-						<memberEnd xmi:idref="EAID_src569FED_815F_45f4_87EA_C0E83DC5C9AF"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src569FED_815F_45f4_87EA_C0E83DC5C9AF" association="EAID_6D569FED_815F_45f4_87EA_C0E83DC5C9AF">
-							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_89C3F218_90EF_42ed_B918_7EEB88718C50">
-						<memberEnd xmi:idref="EAID_dstC3F218_90EF_42ed_B918_7EEB88718C50"/>
-						<memberEnd xmi:idref="EAID_srcC3F218_90EF_42ed_B918_7EEB88718C50"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC3F218_90EF_42ed_B918_7EEB88718C50" association="EAID_89C3F218_90EF_42ed_B918_7EEB88718C50">
-							<type xmi:idref="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_8FF88923_D9FB_4937_B866_FABECBC1DB55">
-						<memberEnd xmi:idref="EAID_dstF88923_D9FB_4937_B866_FABECBC1DB55"/>
-						<memberEnd xmi:idref="EAID_srcF88923_D9FB_4937_B866_FABECBC1DB55"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF88923_D9FB_4937_B866_FABECBC1DB55" association="EAID_8FF88923_D9FB_4937_B866_FABECBC1DB55">
-							<type xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9EDDC1AB_FC05_462d_A479_433862DD01D8">
-						<memberEnd xmi:idref="EAID_dstDDC1AB_FC05_462d_A479_433862DD01D8"/>
-						<memberEnd xmi:idref="EAID_srcDDC1AB_FC05_462d_A479_433862DD01D8"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDDC1AB_FC05_462d_A479_433862DD01D8" association="EAID_9EDDC1AB_FC05_462d_A479_433862DD01D8">
-							<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B2FBB3C3_8542_4cd9_8B7E_A25D4A6C9048">
-						<memberEnd xmi:idref="EAID_dstFBB3C3_8542_4cd9_8B7E_A25D4A6C9048"/>
-						<memberEnd xmi:idref="EAID_srcFBB3C3_8542_4cd9_8B7E_A25D4A6C9048"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFBB3C3_8542_4cd9_8B7E_A25D4A6C9048" association="EAID_B2FBB3C3_8542_4cd9_8B7E_A25D4A6C9048">
-							<type xmi:idref="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_DCA21CBC_3D4F_480a_B24B_49A69CC51624">
-						<memberEnd xmi:idref="EAID_dstA21CBC_3D4F_480a_B24B_49A69CC51624"/>
-						<memberEnd xmi:idref="EAID_srcA21CBC_3D4F_480a_B24B_49A69CC51624"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA21CBC_3D4F_480a_B24B_49A69CC51624" association="EAID_DCA21CBC_3D4F_480a_B24B_49A69CC51624">
-							<type xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" name="epo:Quantity">
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_439A021A_4789_4775_8650_9C585138E43E" name="epo:hasQuantityValue">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000921_4789_4775_8650_9C585138E43E" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000922_4789_4775_8650_9C585138E43E" value="1"/>
-							<type xmi:idref="EAJava_xsd_decimal"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_27144131_8BB5_4491_A8AD_C3C93FA46553" name="epo:hasUnitDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000923_8BB5_4491_A8AD_C3C93FA46553" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000924_8BB5_4491_A8AD_C3C93FA46553" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_30CBA4D5_2CA0_4043_A8BC_8FBCF102380D" supplier="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3" client="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0167DB54_9519_42f6_BD3B_F46B589F376C">
-						<memberEnd xmi:idref="EAID_dst67DB54_9519_42f6_BD3B_F46B589F376C"/>
-						<memberEnd xmi:idref="EAID_src67DB54_9519_42f6_BD3B_F46B589F376C"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src67DB54_9519_42f6_BD3B_F46B589F376C" association="EAID_0167DB54_9519_42f6_BD3B_F46B589F376C">
-							<type xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_05490F76_8D40_4d74_97D4_F3871039E80A">
-						<memberEnd xmi:idref="EAID_dst490F76_8D40_4d74_97D4_F3871039E80A"/>
-						<memberEnd xmi:idref="EAID_src490F76_8D40_4d74_97D4_F3871039E80A"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src490F76_8D40_4d74_97D4_F3871039E80A" association="EAID_05490F76_8D40_4d74_97D4_F3871039E80A">
-							<type xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0AC5D04E_7364_4118_9D94_CE93A68B3CF9">
-						<memberEnd xmi:idref="EAID_dstC5D04E_7364_4118_9D94_CE93A68B3CF9"/>
-						<memberEnd xmi:idref="EAID_srcC5D04E_7364_4118_9D94_CE93A68B3CF9"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC5D04E_7364_4118_9D94_CE93A68B3CF9" association="EAID_0AC5D04E_7364_4118_9D94_CE93A68B3CF9">
-							<type xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0F1AB34D_EA8C_44fb_B232_AA4B138F066B">
-						<memberEnd xmi:idref="EAID_dst1AB34D_EA8C_44fb_B232_AA4B138F066B"/>
-						<memberEnd xmi:idref="EAID_src1AB34D_EA8C_44fb_B232_AA4B138F066B"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src1AB34D_EA8C_44fb_B232_AA4B138F066B" association="EAID_0F1AB34D_EA8C_44fb_B232_AA4B138F066B">
-							<type xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_11D3CF7A_4949_410c_A7E5_91AB91646B43">
-						<memberEnd xmi:idref="EAID_dstD3CF7A_4949_410c_A7E5_91AB91646B43"/>
-						<memberEnd xmi:idref="EAID_srcD3CF7A_4949_410c_A7E5_91AB91646B43"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD3CF7A_4949_410c_A7E5_91AB91646B43" association="EAID_11D3CF7A_4949_410c_A7E5_91AB91646B43">
-							<type xmi:idref="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1F622DE3_2DEE_491f_A5F1_B592E89F9030">
-						<memberEnd xmi:idref="EAID_dst622DE3_2DEE_491f_A5F1_B592E89F9030"/>
-						<memberEnd xmi:idref="EAID_src622DE3_2DEE_491f_A5F1_B592E89F9030"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src622DE3_2DEE_491f_A5F1_B592E89F9030" association="EAID_1F622DE3_2DEE_491f_A5F1_B592E89F9030">
-							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_2ECAEC7F_2186_4280_A2C0_6DC585D1EE96">
-						<memberEnd xmi:idref="EAID_dstCAEC7F_2186_4280_A2C0_6DC585D1EE96"/>
-						<memberEnd xmi:idref="EAID_srcCAEC7F_2186_4280_A2C0_6DC585D1EE96"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCAEC7F_2186_4280_A2C0_6DC585D1EE96" association="EAID_2ECAEC7F_2186_4280_A2C0_6DC585D1EE96">
-							<type xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65">
-						<memberEnd xmi:idref="EAID_dst9E2AC7_4D59_4119_A715_C0AF0EF80B65"/>
-						<memberEnd xmi:idref="EAID_src9E2AC7_4D59_4119_A715_C0AF0EF80B65"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9E2AC7_4D59_4119_A715_C0AF0EF80B65" association="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65">
-							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3D54F6F9_658D_40fe_9D16_D79F46DB945C">
-						<memberEnd xmi:idref="EAID_dst54F6F9_658D_40fe_9D16_D79F46DB945C"/>
-						<memberEnd xmi:idref="EAID_src54F6F9_658D_40fe_9D16_D79F46DB945C"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src54F6F9_658D_40fe_9D16_D79F46DB945C" association="EAID_3D54F6F9_658D_40fe_9D16_D79F46DB945C">
-							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_45480564_D6B2_41da_8694_DC63D52825C1">
-						<memberEnd xmi:idref="EAID_dst480564_D6B2_41da_8694_DC63D52825C1"/>
-						<memberEnd xmi:idref="EAID_src480564_D6B2_41da_8694_DC63D52825C1"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src480564_D6B2_41da_8694_DC63D52825C1" association="EAID_45480564_D6B2_41da_8694_DC63D52825C1">
-							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_4BA4CF11_20FC_48b0_A739_471F732B8482">
-						<memberEnd xmi:idref="EAID_dstA4CF11_20FC_48b0_A739_471F732B8482"/>
-						<memberEnd xmi:idref="EAID_srcA4CF11_20FC_48b0_A739_471F732B8482"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA4CF11_20FC_48b0_A739_471F732B8482" association="EAID_4BA4CF11_20FC_48b0_A739_471F732B8482">
-							<type xmi:idref="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_5C5BD66A_585D_4646_9A7B_894EA99DED44">
-						<memberEnd xmi:idref="EAID_dst5BD66A_585D_4646_9A7B_894EA99DED44"/>
-						<memberEnd xmi:idref="EAID_src5BD66A_585D_4646_9A7B_894EA99DED44"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src5BD66A_585D_4646_9A7B_894EA99DED44" association="EAID_5C5BD66A_585D_4646_9A7B_894EA99DED44">
-							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_65E8EC44_CB4C_4aa9_8218_75D01ED44538">
-						<memberEnd xmi:idref="EAID_dstE8EC44_CB4C_4aa9_8218_75D01ED44538"/>
-						<memberEnd xmi:idref="EAID_srcE8EC44_CB4C_4aa9_8218_75D01ED44538"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE8EC44_CB4C_4aa9_8218_75D01ED44538" association="EAID_65E8EC44_CB4C_4aa9_8218_75D01ED44538">
-							<type xmi:idref="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_75378C4F_ABAD_440f_8E1B_502A7CDA0486">
-						<memberEnd xmi:idref="EAID_dst378C4F_ABAD_440f_8E1B_502A7CDA0486"/>
-						<memberEnd xmi:idref="EAID_src378C4F_ABAD_440f_8E1B_502A7CDA0486"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src378C4F_ABAD_440f_8E1B_502A7CDA0486" association="EAID_75378C4F_ABAD_440f_8E1B_502A7CDA0486">
-							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_76005691_B905_4be3_99BF_394E56A591CE">
-						<memberEnd xmi:idref="EAID_dst005691_B905_4be3_99BF_394E56A591CE"/>
-						<memberEnd xmi:idref="EAID_src005691_B905_4be3_99BF_394E56A591CE"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src005691_B905_4be3_99BF_394E56A591CE" association="EAID_76005691_B905_4be3_99BF_394E56A591CE">
-							<type xmi:idref="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_770594A4_09FD_4b6e_8D27_8D44BA5CA36A">
-						<memberEnd xmi:idref="EAID_dst0594A4_09FD_4b6e_8D27_8D44BA5CA36A"/>
-						<memberEnd xmi:idref="EAID_src0594A4_09FD_4b6e_8D27_8D44BA5CA36A"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0594A4_09FD_4b6e_8D27_8D44BA5CA36A" association="EAID_770594A4_09FD_4b6e_8D27_8D44BA5CA36A">
-							<type xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_838E60F9_C54C_4c80_88A3_D705701F1971">
-						<memberEnd xmi:idref="EAID_dst8E60F9_C54C_4c80_88A3_D705701F1971"/>
-						<memberEnd xmi:idref="EAID_src8E60F9_C54C_4c80_88A3_D705701F1971"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8E60F9_C54C_4c80_88A3_D705701F1971" association="EAID_838E60F9_C54C_4c80_88A3_D705701F1971">
-							<type xmi:idref="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_87C6E00F_DAEB_4e79_8340_AC2FC83206DA">
-						<memberEnd xmi:idref="EAID_dstC6E00F_DAEB_4e79_8340_AC2FC83206DA"/>
-						<memberEnd xmi:idref="EAID_srcC6E00F_DAEB_4e79_8340_AC2FC83206DA"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC6E00F_DAEB_4e79_8340_AC2FC83206DA" association="EAID_87C6E00F_DAEB_4e79_8340_AC2FC83206DA">
-							<type xmi:idref="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_87DEA454_B158_4e44_91D6_F1D258049A37">
-						<memberEnd xmi:idref="EAID_dstDEA454_B158_4e44_91D6_F1D258049A37"/>
-						<memberEnd xmi:idref="EAID_srcDEA454_B158_4e44_91D6_F1D258049A37"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDEA454_B158_4e44_91D6_F1D258049A37" association="EAID_87DEA454_B158_4e44_91D6_F1D258049A37">
-							<type xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_8C56C81B_B46D_49ef_B3BF_333FDA416F39">
-						<memberEnd xmi:idref="EAID_dst56C81B_B46D_49ef_B3BF_333FDA416F39"/>
-						<memberEnd xmi:idref="EAID_src56C81B_B46D_49ef_B3BF_333FDA416F39"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src56C81B_B46D_49ef_B3BF_333FDA416F39" association="EAID_8C56C81B_B46D_49ef_B3BF_333FDA416F39">
-							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_95D24239_8F4D_44c8_97D1_1C26296607DA">
-						<memberEnd xmi:idref="EAID_dstD24239_8F4D_44c8_97D1_1C26296607DA"/>
-						<memberEnd xmi:idref="EAID_srcD24239_8F4D_44c8_97D1_1C26296607DA"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD24239_8F4D_44c8_97D1_1C26296607DA" association="EAID_95D24239_8F4D_44c8_97D1_1C26296607DA">
-							<type xmi:idref="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9EA3B8C3_695C_4b42_8481_D40EEC904171">
-						<memberEnd xmi:idref="EAID_dstA3B8C3_695C_4b42_8481_D40EEC904171"/>
-						<memberEnd xmi:idref="EAID_srcA3B8C3_695C_4b42_8481_D40EEC904171"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA3B8C3_695C_4b42_8481_D40EEC904171" association="EAID_9EA3B8C3_695C_4b42_8481_D40EEC904171">
-							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A0FABF7A_1814_4dd4_BD97_28BD0C9F2F49">
-						<memberEnd xmi:idref="EAID_dstFABF7A_1814_4dd4_BD97_28BD0C9F2F49"/>
-						<memberEnd xmi:idref="EAID_srcFABF7A_1814_4dd4_BD97_28BD0C9F2F49"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFABF7A_1814_4dd4_BD97_28BD0C9F2F49" association="EAID_A0FABF7A_1814_4dd4_BD97_28BD0C9F2F49">
-							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B1577190_0947_4041_ACDC_BC0C377734AF">
-						<memberEnd xmi:idref="EAID_dst577190_0947_4041_ACDC_BC0C377734AF"/>
-						<memberEnd xmi:idref="EAID_src577190_0947_4041_ACDC_BC0C377734AF"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src577190_0947_4041_ACDC_BC0C377734AF" association="EAID_B1577190_0947_4041_ACDC_BC0C377734AF">
-							<type xmi:idref="EAID_BB1AAA4C_E66B_4fde_A0B6_1A30FC13503B"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B4F0448C_1741_4b38_9973_F506CB883BA2">
-						<memberEnd xmi:idref="EAID_dstF0448C_1741_4b38_9973_F506CB883BA2"/>
-						<memberEnd xmi:idref="EAID_srcF0448C_1741_4b38_9973_F506CB883BA2"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF0448C_1741_4b38_9973_F506CB883BA2" association="EAID_B4F0448C_1741_4b38_9973_F506CB883BA2">
-							<type xmi:idref="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B9C9C412_36FA_46d5_AA00_34CA1CC60CA2">
-						<memberEnd xmi:idref="EAID_dstC9C412_36FA_46d5_AA00_34CA1CC60CA2"/>
-						<memberEnd xmi:idref="EAID_srcC9C412_36FA_46d5_AA00_34CA1CC60CA2"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC9C412_36FA_46d5_AA00_34CA1CC60CA2" association="EAID_B9C9C412_36FA_46d5_AA00_34CA1CC60CA2">
-							<type xmi:idref="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C5E4577A_5BDB_4176_9418_BB9B2E957222">
-						<memberEnd xmi:idref="EAID_dstE4577A_5BDB_4176_9418_BB9B2E957222"/>
-						<memberEnd xmi:idref="EAID_srcE4577A_5BDB_4176_9418_BB9B2E957222"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE4577A_5BDB_4176_9418_BB9B2E957222" association="EAID_C5E4577A_5BDB_4176_9418_BB9B2E957222">
-							<type xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_E93A74BB_614F_4b1c_AE59_F45CD626BB7A">
-						<memberEnd xmi:idref="EAID_dst3A74BB_614F_4b1c_AE59_F45CD626BB7A"/>
-						<memberEnd xmi:idref="EAID_src3A74BB_614F_4b1c_AE59_F45CD626BB7A"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3A74BB_614F_4b1c_AE59_F45CD626BB7A" association="EAID_E93A74BB_614F_4b1c_AE59_F45CD626BB7A">
-							<type xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F475E438_48A3_41f5_A736_268C91FF8AF2">
-						<memberEnd xmi:idref="EAID_dst75E438_48A3_41f5_A736_268C91FF8AF2"/>
-						<memberEnd xmi:idref="EAID_src75E438_48A3_41f5_A736_268C91FF8AF2"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src75E438_48A3_41f5_A736_268C91FF8AF2" association="EAID_F475E438_48A3_41f5_A736_268C91FF8AF2">
-							<type xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F70CA1D5_5E5E_4028_8583_6B810BB672CD">
-						<memberEnd xmi:idref="EAID_dst0CA1D5_5E5E_4028_8583_6B810BB672CD"/>
-						<memberEnd xmi:idref="EAID_src0CA1D5_5E5E_4028_8583_6B810BB672CD"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0CA1D5_5E5E_4028_8583_6B810BB672CD" association="EAID_F70CA1D5_5E5E_4028_8583_6B810BB672CD">
-							<type xmi:idref="EAID_BB1AAA4C_E66B_4fde_A0B6_1A30FC13503B"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F93A2AAD_C014_4fa4_88EE_23DE2339DB3C">
-						<memberEnd xmi:idref="EAID_dst3A2AAD_C014_4fa4_88EE_23DE2339DB3C"/>
-						<memberEnd xmi:idref="EAID_src3A2AAD_C014_4fa4_88EE_23DE2339DB3C"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3A2AAD_C014_4fa4_88EE_23DE2339DB3C" association="EAID_F93A2AAD_C014_4fa4_88EE_23DE2339DB3C">
-							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F9F5CFA7_D31A_4c48_80EF_346FB3152195">
-						<memberEnd xmi:idref="EAID_dstF5CFA7_D31A_4c48_80EF_346FB3152195"/>
-						<memberEnd xmi:idref="EAID_srcF5CFA7_D31A_4c48_80EF_346FB3152195"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF5CFA7_D31A_4c48_80EF_346FB3152195" association="EAID_F9F5CFA7_D31A_4c48_80EF_346FB3152195">
-							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_FA2388C8_1471_4d6b_9B9F_2E0BBE858668">
-						<memberEnd xmi:idref="EAID_dst2388C8_1471_4d6b_9B9F_2E0BBE858668"/>
-						<memberEnd xmi:idref="EAID_src2388C8_1471_4d6b_9B9F_2E0BBE858668"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2388C8_1471_4d6b_9B9F_2E0BBE858668" association="EAID_FA2388C8_1471_4d6b_9B9F_2E0BBE858668">
-							<type xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C" name="epo:SpecificDuration">
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_443A0D12_FC67_4252_86EC_D1E5C696FA85" name="time:numericDuration">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000925_FC67_4252_86EC_D1E5C696FA85" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000926_FC67_4252_86EC_D1E5C696FA85" value="1"/>
-							<type xmi:idref="EAJava_xsd_decimal"/>
-						</ownedAttribute>
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_FE0B0FB5_E0B6_41e2_AA82_ECF06C845021" general="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_90566F74_64BC_49c8_8076_1ECB982268EE" supplier="EAID_EDCD6F3A_F86A_46ca_ACD1_13C3E1A4B7F9" client="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C"/>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_F8F2DEF8_6045_44d5_93B9_E57CE8023BE9" name="time:Duration"/>
 				</packagedElement>
 				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_CE5E556D_E033_494e_BC8F_925DAAC7560E" name="controlled vocabularies">
 					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_B7F675EC_18B3_49b1_AAF4_E0FAB88D85EE" name="at-voc:access-rights"/>
@@ -5594,275 +5969,108 @@
 				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_44875764_5D12_4111_BD8B_ACB95D3A83DC" name="xsd:integer"/>
 			</packagedElement>
 		</packagedElement>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_7C7E5BCA_D4BF_435c_9C21_FBFDE3637417" isFrame="false" modelElement="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684">
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_BA06_515432E59702" modelElement="EAID_9E4FA39A_DB0C_4c05_BA06_515432E59702">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_BA06_515432E59702" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_BA06_515432E59702" x="17" y="31" width="170" height="115"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_B2F5_BD41CC5DDBC9" modelElement="EAID_F990707E_C758_4479_B2F5_BD41CC5DDBC9">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_B2F5_BD41CC5DDBC9" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_B2F5_BD41CC5DDBC9" x="17" y="247" width="170" height="115"/>
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_BE36C015_6DEA_4e64_88D7_DCA46A2951B5" isFrame="false" modelElement="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A">
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_BF42_2A6E50CAF4E6" modelElement="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_BF42_2A6E50CAF4E6" text="epo:LotGroup"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_BF42_2A6E50CAF4E6" x="494" y="603" width="171" height="59"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_8A46_9B20895C7AD2" modelElement="EAID_D6C95713_EB11_4af7_8A46_9B20895C7AD2">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_8A46_9B20895C7AD2" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_8A46_9B20895C7AD2" x="205" y="247" width="170" height="115"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_AC62_FA4769B4D88C" modelElement="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_AC62_FA4769B4D88C" text="epo:Lot"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_AC62_FA4769B4D88C" x="408" y="426" width="247" height="62"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_9261_B680435DC8F5" modelElement="EAID_D964D718_09AD_453d_9261_B680435DC8F5">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_9261_B680435DC8F5" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_9261_B680435DC8F5" x="393" y="247" width="170" height="115"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_B2BD_3FD3B49365EE" modelElement="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_B2BD_3FD3B49365EE" text="epo:ContractLotCompletionInformation"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_B2BD_3FD3B49365EE" x="2105" y="428" width="298" height="59"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_AED6_D94302F09660" modelElement="EAID_155C7FA7_6962_4810_AED6_D94302F09660">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_AED6_D94302F09660" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_AED6_D94302F09660" x="579" y="247" width="170" height="115"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_A416_3E77939F9B7A" modelElement="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_A416_3E77939F9B7A" text="epo:LotAwardOutcome"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_A416_3E77939F9B7A" x="1242" y="270" width="273" height="72"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_B978_81AE2B81BF17" modelElement="EAID_24A53112_91DE_40c0_B978_81AE2B81BF17">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_B978_81AE2B81BF17" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_B978_81AE2B81BF17" x="766" y="247" width="170" height="115"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_B4D4_D8AE4F96B00B" modelElement="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_B4D4_D8AE4F96B00B" text="epo:TenderAwardOutcome"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_B4D4_D8AE4F96B00B" x="1257" y="526" width="178" height="59"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_93F3_A9FAE5CE18B1" modelElement="EAID_EED92360_39E2_48e3_93F3_A9FAE5CE18B1">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_93F3_A9FAE5CE18B1" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_93F3_A9FAE5CE18B1" x="17" y="439" width="170" height="115"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_8372_75A07B6AB066" modelElement="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_8372_75A07B6AB066" text="epo:Contract"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_8372_75A07B6AB066" x="1721" y="417" width="216" height="79"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_AB06_08AA082CD52B" modelElement="EAID_C0FA4596_11C5_4b97_AB06_08AA082CD52B">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_AB06_08AA082CD52B" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_AB06_08AA082CD52B" x="205" y="439" width="170" height="115"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_B8D8_207479C15419" modelElement="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_B8D8_207479C15419" text="epo:Tender"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_B8D8_207479C15419" x="850" y="415" width="219" height="85"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_9F81_DB71EAB73C34" modelElement="EAID_46C02EA3_5EA6_48ea_9F81_DB71EAB73C34">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_9F81_DB71EAB73C34" text="NavigationCell"/>
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D4BF_435c_9F81_DB71EAB73C34" text="monetary value - completion"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_9F81_DB71EAB73C34" x="393" y="439" width="170" height="115"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_95C9_B8B685B22E32" modelElement="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_95C9_B8B685B22E32" text="epo:ReviewDecision"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_95C9_B8B685B22E32" x="2086" y="532" width="174" height="70"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_9C6E_449B3E20BCF2" modelElement="EAID_F889D07C_8647_44f2_9C6E_449B3E20BCF2">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_9C6E_449B3E20BCF2" text="NavigationCell"/>
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D4BF_435c_9C6E_449B3E20BCF2" text="procurement object relations"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_9C6E_449B3E20BCF2" x="17" y="642" width="170" height="115"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_80B0_0C345D6703F4" modelElement="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_80B0_0C345D6703F4" text="epo:Procedure"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_80B0_0C345D6703F4" x="460" y="207" width="287" height="101"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_958E_D9BF99277B20" modelElement="EAID_A3FE9B4C_382E_40dc_958E_D9BF99277B20">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_958E_D9BF99277B20" text="NavigationCell"/>
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D4BF_435c_958E_D9BF99277B20" text="agent relations"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_958E_D9BF99277B20" x="17" y="942" width="170" height="115"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_BE40_C921C05C776E" modelElement="EAID_93ACA540_2668_42d3_BE40_C921C05C776E">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_BE40_C921C05C776E" text="epo:TenderGroup"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_BE40_C921C05C776E" x="907" y="603" width="171" height="59"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_9C28_3C22B15A8113" modelElement="EAID_BF31E977_E54E_4706_9C28_3C22B15A8113">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_9C28_3C22B15A8113" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_9C28_3C22B15A8113" x="393" y="942" width="170" height="115"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_8AC2_D7789CCFB7F8" modelElement="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_8AC2_D7789CCFB7F8" text="epo:AwardDecision"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_8AC2_D7789CCFB7F8" x="1347" y="76" width="273" height="72"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_81EA_0B04F7E45A43" modelElement="EAID_68D5E5EA_FC7A_4339_81EA_0B04F7E45A43">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_81EA_0B04F7E45A43" text="NavigationCell"/>
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D4BF_435c_81EA_0B04F7E45A43" text="role relations"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_81EA_0B04F7E45A43" x="17" y="1092" width="170" height="115"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_A53A_502157F5F45A" modelElement="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_A53A_502157F5F45A" text="epo:PlannedProcurementPart"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_A53A_502157F5F45A" x="36" y="60" width="181" height="61"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_B63D_56DEA2854500" modelElement="EAID_DE4D587C_087C_40fa_B63D_56DEA2854500">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_B63D_56DEA2854500" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_B63D_56DEA2854500" x="205" y="1092" width="170" height="115"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_B59A_3107FF9B30BC" modelElement="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_B59A_3107FF9B30BC" text="epo:ReviewRequest"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_B59A_3107FF9B30BC" x="2054" y="691" width="238" height="111"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_A2A1_A7DEA1E5A1B0" modelElement="EAID_4C442DBD_D8E5_4d12_A2A1_A7DEA1E5A1B0">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_A2A1_A7DEA1E5A1B0" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_A2A1_A7DEA1E5A1B0" x="393" y="1092" width="170" height="115"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_BAA8_68D1BF528FF5" modelElement="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_BAA8_68D1BF528FF5" text="epo:ProcurementObject"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_BAA8_68D1BF528FF5" x="408" y="23" width="232" height="137"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_9EE2_A6F61F870DB6" modelElement="EAID_954E4827_D178_4ebc_9EE2_A6F61F870DB6">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_9EE2_A6F61F870DB6" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_9EE2_A6F61F870DB6" x="581" y="1234" width="170" height="115"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_BE33_620A29646687" modelElement="EAID_E7437025_771F_4143_BE33_620A29646687">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_BE33_620A29646687" text="epo:AwardOutcome"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_BE33_620A29646687" x="1412" y="193" width="143" height="43"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_8E8A_A6EC221BAB4F" modelElement="EAID_DF46765F_128C_4cd8_8E8A_A6EC221BAB4F">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_8E8A_A6EC221BAB4F" text="NavigationCell"/>
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D4BF_435c_8E8A_A6EC221BAB4F" text="technique"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_8E8A_A6EC221BAB4F" x="774" y="1234" width="170" height="115"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_AD48_245A5F11A4D5" modelElement="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_AD48_245A5F11A4D5" text="epo:MiniCompetitionAwardOutcome"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_AD48_245A5F11A4D5" x="1399" y="352" width="185" height="36"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_9A19_747532DBC93F" modelElement="EAID_2F3555E6_B9A6_4208_9A19_747532DBC93F">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_9A19_747532DBC93F" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_9A19_747532DBC93F" x="205" y="790" width="170" height="115"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BE36C015_6DEA_4e64_A283_8978FB00BD51" source="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" target="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" modelElement="EAID_D6AB3946_257D_4382_A283_8978FB00BD51">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_6DEA_4e64_A283_8978FB00BD51" text="+epo:isSubmittedForLotGroup" modelElement="EAID_dstAB3946_257D_4382_A283_8978FB00BD51">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DEA_4e64_A283_8978FB00BD51" x="687" y="631" width="120" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6DEA_4e64_A283_8978FB00BD51" text="1" modelElement="EAID_dstAB3946_257D_4382_A283_8978FB00BD51">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_A283_8978FB00BD51" x="668" y="654" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_A283_8978FB00BD51" x="907" y="649"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_A283_8978FB00BD51" x="665" y="649"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_BE70_0ED3FC280AF1" modelElement="EAID_03490E2B_19F2_47c3_BE70_0ED3FC280AF1">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_BE70_0ED3FC280AF1" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_BE70_0ED3FC280AF1" x="393" y="790" width="170" height="115"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BE36C015_6DEA_4e64_9BBA_3C0E1D4E25A8" source="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" target="EAID_E7437025_771F_4143_BE33_620A29646687" modelElement="EAID_36C907D3_6701_4489_9BBA_3C0E1D4E25A8">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_9BBA_3C0E1D4E25A8" x="1535" y="352"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_9BBA_3C0E1D4E25A8" x="1535" y="236"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_8358_F904A686244F" modelElement="EAID_24F90E61_753D_4cf6_8358_F904A686244F">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_8358_F904A686244F" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_8358_F904A686244F" x="581" y="790" width="170" height="115"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BE36C015_6DEA_4e64_926C_444F368462AA" source="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" target="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" modelElement="EAID_9663763E_2F48_4952_926C_444F368462AA">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_6DEA_4e64_926C_444F368462AA" text="+epo:resolvesReviewRequest" modelElement="EAID_dst63763E_2F48_4952_926C_444F368462AA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DEA_4e64_926C_444F368462AA" x="2126" y="654" width="118" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6DEA_4e64_926C_444F368462AA" text="1" modelElement="EAID_dst63763E_2F48_4952_926C_444F368462AA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_926C_444F368462AA" x="2181" y="673" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_926C_444F368462AA" x="2173" y="602"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_926C_444F368462AA" x="2173" y="691"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_A068_667A0CDFBA55" modelElement="EAID_03EE3ECF_9EFF_4bf9_A068_667A0CDFBA55">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_A068_667A0CDFBA55" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_A068_667A0CDFBA55" x="774" y="790" width="170" height="115"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BE36C015_6DEA_4e64_BFE6_593632EDB11F" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_20732599_332F_4f0e_BFE6_593632EDB11F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_6DEA_4e64_BFE6_593632EDB11F" text="+epo:setsGroupingContextForLot" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DEA_4e64_BFE6_593632EDB11F" x="506" y="514" width="131" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6DEA_4e64_BFE6_593632EDB11F" text="1..*" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_BFE6_593632EDB11F" x="593" y="493" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_BFE6_593632EDB11F" x="581" y="603"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_BFE6_593632EDB11F" x="581" y="488"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_BC07_A09D9044B69E" modelElement="EAID_B4D0C52E_CCFA_47ce_BC07_A09D9044B69E">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_BC07_A09D9044B69E" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_BC07_A09D9044B69E" x="17" y="1670" width="170" height="115"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_BEC6_8F4C43A57375" modelElement="EAID_9AC5B7BC_A46F_4781_BEC6_8F4C43A57375">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_BEC6_8F4C43A57375" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_BEC6_8F4C43A57375" x="17" y="1526" width="170" height="115"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_A7BA_FCC3A6DFD2D4" modelElement="EAID_B4C14031_6888_4fe3_A7BA_FCC3A6DFD2D4">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_A7BA_FCC3A6DFD2D4" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_A7BA_FCC3A6DFD2D4" x="17" y="1972" width="170" height="115"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_8C0E_32D2FDF93E0A" modelElement="EAID_34185A69_499F_47f1_8C0E_32D2FDF93E0A">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_8C0E_32D2FDF93E0A" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_8C0E_32D2FDF93E0A" x="205" y="1972" width="170" height="115"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_B461_D8E61394AC5F" modelElement="EAID_BC642D11_1E40_47fb_B461_D8E61394AC5F">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_B461_D8E61394AC5F" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_B461_D8E61394AC5F" x="205" y="642" width="170" height="115"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_A5E4_27CEF50C4AEE" modelElement="EAID_6D0F1BE0_EAAB_45e5_A5E4_27CEF50C4AEE">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_A5E4_27CEF50C4AEE" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_A5E4_27CEF50C4AEE" x="17" y="790" width="170" height="115"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_A8F1_E76DB6160274" modelElement="EAID_28150437_F427_4fd1_A8F1_E76DB6160274">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_A8F1_E76DB6160274" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_A8F1_E76DB6160274" x="205" y="942" width="170" height="115"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_9F41_C132E65F5A8C" modelElement="EAID_DD64E73D_237E_4f7a_9F41_C132E65F5A8C">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_9F41_C132E65F5A8C" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_9F41_C132E65F5A8C" x="17" y="1234" width="170" height="115"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_923B_C062EFED7F92" modelElement="EAID_8A4B2A45_E204_4d18_923B_C062EFED7F92">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_923B_C062EFED7F92" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_923B_C062EFED7F92" x="205" y="1234" width="170" height="115"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_A6C8_9365E51D44B5" modelElement="EAID_40B3A0DE_5AC9_467f_A6C8_9365E51D44B5">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_A6C8_9365E51D44B5" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_A6C8_9365E51D44B5" x="393" y="1234" width="170" height="115"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_9166_7C66D155CDF2" modelElement="EAID_5774D0B1_FD6B_4941_9166_7C66D155CDF2">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_9166_7C66D155CDF2" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_9166_7C66D155CDF2" x="17" y="1376" width="170" height="115"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_A20E_C4A2122FB1CD" modelElement="EAID_EABD8F02_7B1E_48f0_A20E_C4A2122FB1CD">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_A20E_C4A2122FB1CD" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_A20E_C4A2122FB1CD" x="205" y="1376" width="170" height="115"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_9700_9AB5F7313EA7" modelElement="EAID_A07ACD80_0370_46e1_9700_9AB5F7313EA7">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_9700_9AB5F7313EA7" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_9700_9AB5F7313EA7" x="393" y="1376" width="170" height="115"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_8349_0AFFD331805A" modelElement="EAID_FBF5331A_BB9B_4776_8349_0AFFD331805A">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_8349_0AFFD331805A" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_8349_0AFFD331805A" x="581" y="1377" width="170" height="115"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_A1CC_44703211E656" modelElement="EAID_C8769750_6B24_4bcb_A1CC_44703211E656">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_A1CC_44703211E656" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_A1CC_44703211E656" x="205" y="1526" width="170" height="115"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_A828_75F42C4318A2" modelElement="EAID_20C55572_E53F_4e04_A828_75F42C4318A2">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_A828_75F42C4318A2" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_A828_75F42C4318A2" x="205" y="1670" width="170" height="115"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_8182_0CD2C2717FB5" modelElement="EAID_FBCD0D5C_5298_43ea_8182_0CD2C2717FB5">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_8182_0CD2C2717FB5" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_8182_0CD2C2717FB5" x="393" y="1670" width="170" height="115"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_9508_6BD01DF20BAF" modelElement="EAID_DA25DD8C_13A3_468b_9508_6BD01DF20BAF">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_9508_6BD01DF20BAF" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_9508_6BD01DF20BAF" x="17" y="1822" width="170" height="115"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_A57F_3E11F136E2A8" modelElement="EAID_D4B88387_1DF7_47e8_A57F_3E11F136E2A8">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_A57F_3E11F136E2A8" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_A57F_3E11F136E2A8" x="205" y="1822" width="170" height="115"/>
-			</ownedElement>
-		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_BE36C015_6DEA_4e64_88D7_DCA46A2951B5" isFrame="false" modelElement="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A">
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_BF42_2A6E50CAF4E6" modelElement="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_BF42_2A6E50CAF4E6" text="epo:LotGroup"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_BF42_2A6E50CAF4E6" x="494" y="603" width="171" height="59"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_AC62_FA4769B4D88C" modelElement="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_AC62_FA4769B4D88C" text="epo:Lot"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_AC62_FA4769B4D88C" x="408" y="426" width="247" height="62"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_B2BD_3FD3B49365EE" modelElement="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_B2BD_3FD3B49365EE" text="epo:ContractLotCompletionInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_B2BD_3FD3B49365EE" x="2105" y="428" width="298" height="59"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_A416_3E77939F9B7A" modelElement="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_A416_3E77939F9B7A" text="epo:LotAwardOutcome"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_A416_3E77939F9B7A" x="1242" y="270" width="273" height="72"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_B4D4_D8AE4F96B00B" modelElement="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_B4D4_D8AE4F96B00B" text="epo:TenderAwardOutcome"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_B4D4_D8AE4F96B00B" x="1257" y="526" width="178" height="59"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_8372_75A07B6AB066" modelElement="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_8372_75A07B6AB066" text="epo:Contract"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_8372_75A07B6AB066" x="1721" y="417" width="216" height="79"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_B8D8_207479C15419" modelElement="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_B8D8_207479C15419" text="epo:Tender"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_B8D8_207479C15419" x="850" y="415" width="219" height="85"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_95C9_B8B685B22E32" modelElement="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_95C9_B8B685B22E32" text="epo:ReviewDecision"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_95C9_B8B685B22E32" x="2086" y="532" width="174" height="70"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_80B0_0C345D6703F4" modelElement="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_80B0_0C345D6703F4" text="epo:Procedure"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_80B0_0C345D6703F4" x="460" y="207" width="287" height="101"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_BE40_C921C05C776E" modelElement="EAID_93ACA540_2668_42d3_BE40_C921C05C776E">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_BE40_C921C05C776E" text="epo:TenderGroup"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_BE40_C921C05C776E" x="907" y="603" width="171" height="59"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_8AC2_D7789CCFB7F8" modelElement="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_8AC2_D7789CCFB7F8" text="epo:AwardDecision"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_8AC2_D7789CCFB7F8" x="1347" y="76" width="273" height="72"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_A53A_502157F5F45A" modelElement="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_A53A_502157F5F45A" text="epo:PlannedProcurementPart"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_A53A_502157F5F45A" x="36" y="60" width="181" height="61"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_B59A_3107FF9B30BC" modelElement="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_B59A_3107FF9B30BC" text="epo:ReviewRequest"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_B59A_3107FF9B30BC" x="2054" y="691" width="238" height="111"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_BAA8_68D1BF528FF5" modelElement="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_BAA8_68D1BF528FF5" text="epo:ProcurementObject"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_BAA8_68D1BF528FF5" x="408" y="23" width="232" height="137"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_BE33_620A29646687" modelElement="EAID_E7437025_771F_4143_BE33_620A29646687">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_BE33_620A29646687" text="epo:AwardOutcome"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_BE33_620A29646687" x="1412" y="193" width="143" height="43"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_AD48_245A5F11A4D5" modelElement="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_AD48_245A5F11A4D5" text="epo:MiniCompetitionAwardOutcome"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_AD48_245A5F11A4D5" x="1399" y="352" width="185" height="36"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BE36C015_6DEA_4e64_A283_8978FB00BD51" source="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" target="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" modelElement="EAID_D6AB3946_257D_4382_A283_8978FB00BD51">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_6DEA_4e64_A283_8978FB00BD51" text="+epo:isSubmittedForLotGroup" modelElement="EAID_dstAB3946_257D_4382_A283_8978FB00BD51">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DEA_4e64_A283_8978FB00BD51" x="687" y="631" width="120" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6DEA_4e64_A283_8978FB00BD51" text="1" modelElement="EAID_dstAB3946_257D_4382_A283_8978FB00BD51">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_A283_8978FB00BD51" x="668" y="654" width="6" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_A283_8978FB00BD51" x="907" y="649"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_A283_8978FB00BD51" x="665" y="649"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BE36C015_6DEA_4e64_9BBA_3C0E1D4E25A8" source="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" target="EAID_E7437025_771F_4143_BE33_620A29646687" modelElement="EAID_36C907D3_6701_4489_9BBA_3C0E1D4E25A8">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_9BBA_3C0E1D4E25A8" x="1535" y="352"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_9BBA_3C0E1D4E25A8" x="1535" y="236"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BE36C015_6DEA_4e64_926C_444F368462AA" source="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" target="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" modelElement="EAID_9663763E_2F48_4952_926C_444F368462AA">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_6DEA_4e64_926C_444F368462AA" text="+epo:resolvesReviewRequest" modelElement="EAID_dst63763E_2F48_4952_926C_444F368462AA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DEA_4e64_926C_444F368462AA" x="2126" y="654" width="118" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6DEA_4e64_926C_444F368462AA" text="1" modelElement="EAID_dst63763E_2F48_4952_926C_444F368462AA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_926C_444F368462AA" x="2181" y="673" width="6" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_926C_444F368462AA" x="2173" y="602"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_926C_444F368462AA" x="2173" y="691"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BE36C015_6DEA_4e64_BFE6_593632EDB11F" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_20732599_332F_4f0e_BFE6_593632EDB11F">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_6DEA_4e64_BFE6_593632EDB11F" text="+epo:setsGroupingContextForLot" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DEA_4e64_BFE6_593632EDB11F" x="506" y="514" width="131" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6DEA_4e64_BFE6_593632EDB11F" text="1..*" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_BFE6_593632EDB11F" x="593" y="493" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_BFE6_593632EDB11F" x="581" y="603"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_BFE6_593632EDB11F" x="581" y="488"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BE36C015_6DEA_4e64_ADCE_908A980E0342" source="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" target="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" modelElement="EAID_BE41CCFB_8495_440b_ADCE_908A980E0342">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_ADCE_908A980E0342" x="429" y="426"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_ADCE_908A980E0342" x="429" y="160"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BE36C015_6DEA_4e64_ADCE_908A980E0342" source="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" target="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" modelElement="EAID_BE41CCFB_8495_440b_ADCE_908A980E0342">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_ADCE_908A980E0342" x="429" y="426"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_ADCE_908A980E0342" x="429" y="160"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BE36C015_6DEA_4e64_A8A7_C0037581B6D3" source="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" target="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" modelElement="EAID_B8BA8A30_8A22_4475_A8A7_C0037581B6D3">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_A8A7_C0037581B6D3" x="579" y="207"/>
@@ -6012,6 +6220,173 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_6DEA_4e64_B61D_661F42799A98" x="665" y="611"/>
 			</ownedElement>
 		</umldi:Diagram>
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_7C7E5BCA_D4BF_435c_9C21_FBFDE3637417" isFrame="false" modelElement="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A">
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_BA06_515432E59702" modelElement="EAID_9E4FA39A_DB0C_4c05_BA06_515432E59702">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_BA06_515432E59702" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_BA06_515432E59702" x="17" y="31" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_B2F5_BD41CC5DDBC9" modelElement="EAID_F990707E_C758_4479_B2F5_BD41CC5DDBC9">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_B2F5_BD41CC5DDBC9" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_B2F5_BD41CC5DDBC9" x="17" y="247" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_8A46_9B20895C7AD2" modelElement="EAID_D6C95713_EB11_4af7_8A46_9B20895C7AD2">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_8A46_9B20895C7AD2" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_8A46_9B20895C7AD2" x="205" y="247" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_9261_B680435DC8F5" modelElement="EAID_D964D718_09AD_453d_9261_B680435DC8F5">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_9261_B680435DC8F5" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_9261_B680435DC8F5" x="393" y="247" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_AED6_D94302F09660" modelElement="EAID_155C7FA7_6962_4810_AED6_D94302F09660">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_AED6_D94302F09660" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_AED6_D94302F09660" x="579" y="247" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_B978_81AE2B81BF17" modelElement="EAID_24A53112_91DE_40c0_B978_81AE2B81BF17">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_B978_81AE2B81BF17" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_B978_81AE2B81BF17" x="766" y="247" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_93F3_A9FAE5CE18B1" modelElement="EAID_EED92360_39E2_48e3_93F3_A9FAE5CE18B1">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_93F3_A9FAE5CE18B1" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_93F3_A9FAE5CE18B1" x="17" y="439" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_AB06_08AA082CD52B" modelElement="EAID_C0FA4596_11C5_4b97_AB06_08AA082CD52B">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_AB06_08AA082CD52B" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_AB06_08AA082CD52B" x="205" y="439" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_9F81_DB71EAB73C34" modelElement="EAID_46C02EA3_5EA6_48ea_9F81_DB71EAB73C34">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_9F81_DB71EAB73C34" text="NavigationCell"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D4BF_435c_9F81_DB71EAB73C34" text="monetary value - completion"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_9F81_DB71EAB73C34" x="393" y="439" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_9C6E_449B3E20BCF2" modelElement="EAID_F889D07C_8647_44f2_9C6E_449B3E20BCF2">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_9C6E_449B3E20BCF2" text="NavigationCell"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D4BF_435c_9C6E_449B3E20BCF2" text="procurement object relations"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_9C6E_449B3E20BCF2" x="17" y="642" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_958E_D9BF99277B20" modelElement="EAID_A3FE9B4C_382E_40dc_958E_D9BF99277B20">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_958E_D9BF99277B20" text="NavigationCell"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D4BF_435c_958E_D9BF99277B20" text="agent relations"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_958E_D9BF99277B20" x="17" y="942" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_9C28_3C22B15A8113" modelElement="EAID_BF31E977_E54E_4706_9C28_3C22B15A8113">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_9C28_3C22B15A8113" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_9C28_3C22B15A8113" x="393" y="942" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_81EA_0B04F7E45A43" modelElement="EAID_68D5E5EA_FC7A_4339_81EA_0B04F7E45A43">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_81EA_0B04F7E45A43" text="NavigationCell"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D4BF_435c_81EA_0B04F7E45A43" text="role relations"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_81EA_0B04F7E45A43" x="17" y="1092" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_B63D_56DEA2854500" modelElement="EAID_DE4D587C_087C_40fa_B63D_56DEA2854500">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_B63D_56DEA2854500" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_B63D_56DEA2854500" x="205" y="1092" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_A2A1_A7DEA1E5A1B0" modelElement="EAID_4C442DBD_D8E5_4d12_A2A1_A7DEA1E5A1B0">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_A2A1_A7DEA1E5A1B0" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_A2A1_A7DEA1E5A1B0" x="393" y="1092" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_9EE2_A6F61F870DB6" modelElement="EAID_954E4827_D178_4ebc_9EE2_A6F61F870DB6">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_9EE2_A6F61F870DB6" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_9EE2_A6F61F870DB6" x="581" y="1234" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_8E8A_A6EC221BAB4F" modelElement="EAID_DF46765F_128C_4cd8_8E8A_A6EC221BAB4F">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_8E8A_A6EC221BAB4F" text="NavigationCell"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D4BF_435c_8E8A_A6EC221BAB4F" text="technique"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_8E8A_A6EC221BAB4F" x="774" y="1234" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_9A19_747532DBC93F" modelElement="EAID_2F3555E6_B9A6_4208_9A19_747532DBC93F">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_9A19_747532DBC93F" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_9A19_747532DBC93F" x="205" y="790" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_BE70_0ED3FC280AF1" modelElement="EAID_03490E2B_19F2_47c3_BE70_0ED3FC280AF1">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_BE70_0ED3FC280AF1" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_BE70_0ED3FC280AF1" x="393" y="790" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_8358_F904A686244F" modelElement="EAID_24F90E61_753D_4cf6_8358_F904A686244F">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_8358_F904A686244F" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_8358_F904A686244F" x="581" y="790" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_A068_667A0CDFBA55" modelElement="EAID_03EE3ECF_9EFF_4bf9_A068_667A0CDFBA55">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_A068_667A0CDFBA55" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_A068_667A0CDFBA55" x="774" y="790" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_BC07_A09D9044B69E" modelElement="EAID_B4D0C52E_CCFA_47ce_BC07_A09D9044B69E">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_BC07_A09D9044B69E" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_BC07_A09D9044B69E" x="17" y="1670" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_BEC6_8F4C43A57375" modelElement="EAID_9AC5B7BC_A46F_4781_BEC6_8F4C43A57375">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_BEC6_8F4C43A57375" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_BEC6_8F4C43A57375" x="17" y="1526" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_A7BA_FCC3A6DFD2D4" modelElement="EAID_B4C14031_6888_4fe3_A7BA_FCC3A6DFD2D4">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_A7BA_FCC3A6DFD2D4" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_A7BA_FCC3A6DFD2D4" x="17" y="1972" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_8C0E_32D2FDF93E0A" modelElement="EAID_34185A69_499F_47f1_8C0E_32D2FDF93E0A">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_8C0E_32D2FDF93E0A" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_8C0E_32D2FDF93E0A" x="205" y="1972" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_B461_D8E61394AC5F" modelElement="EAID_BC642D11_1E40_47fb_B461_D8E61394AC5F">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_B461_D8E61394AC5F" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_B461_D8E61394AC5F" x="205" y="642" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_A5E4_27CEF50C4AEE" modelElement="EAID_6D0F1BE0_EAAB_45e5_A5E4_27CEF50C4AEE">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_A5E4_27CEF50C4AEE" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_A5E4_27CEF50C4AEE" x="17" y="790" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_A8F1_E76DB6160274" modelElement="EAID_28150437_F427_4fd1_A8F1_E76DB6160274">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_A8F1_E76DB6160274" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_A8F1_E76DB6160274" x="205" y="942" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_9F41_C132E65F5A8C" modelElement="EAID_DD64E73D_237E_4f7a_9F41_C132E65F5A8C">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_9F41_C132E65F5A8C" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_9F41_C132E65F5A8C" x="17" y="1234" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_923B_C062EFED7F92" modelElement="EAID_8A4B2A45_E204_4d18_923B_C062EFED7F92">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_923B_C062EFED7F92" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_923B_C062EFED7F92" x="205" y="1234" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_A6C8_9365E51D44B5" modelElement="EAID_40B3A0DE_5AC9_467f_A6C8_9365E51D44B5">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_A6C8_9365E51D44B5" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_A6C8_9365E51D44B5" x="393" y="1234" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_9166_7C66D155CDF2" modelElement="EAID_5774D0B1_FD6B_4941_9166_7C66D155CDF2">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_9166_7C66D155CDF2" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_9166_7C66D155CDF2" x="17" y="1376" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_A20E_C4A2122FB1CD" modelElement="EAID_EABD8F02_7B1E_48f0_A20E_C4A2122FB1CD">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_A20E_C4A2122FB1CD" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_A20E_C4A2122FB1CD" x="205" y="1376" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_9700_9AB5F7313EA7" modelElement="EAID_A07ACD80_0370_46e1_9700_9AB5F7313EA7">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_9700_9AB5F7313EA7" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_9700_9AB5F7313EA7" x="393" y="1376" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_8349_0AFFD331805A" modelElement="EAID_FBF5331A_BB9B_4776_8349_0AFFD331805A">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_8349_0AFFD331805A" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_8349_0AFFD331805A" x="581" y="1377" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_A1CC_44703211E656" modelElement="EAID_C8769750_6B24_4bcb_A1CC_44703211E656">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_A1CC_44703211E656" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_A1CC_44703211E656" x="205" y="1526" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_A828_75F42C4318A2" modelElement="EAID_20C55572_E53F_4e04_A828_75F42C4318A2">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_A828_75F42C4318A2" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_A828_75F42C4318A2" x="205" y="1670" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_8182_0CD2C2717FB5" modelElement="EAID_FBCD0D5C_5298_43ea_8182_0CD2C2717FB5">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_8182_0CD2C2717FB5" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_8182_0CD2C2717FB5" x="393" y="1670" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_9508_6BD01DF20BAF" modelElement="EAID_DA25DD8C_13A3_468b_9508_6BD01DF20BAF">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_9508_6BD01DF20BAF" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_9508_6BD01DF20BAF" x="17" y="1822" width="170" height="115"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_A57F_3E11F136E2A8" modelElement="EAID_D4B88387_1DF7_47e8_A57F_3E11F136E2A8">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_A57F_3E11F136E2A8" text="NavigationCell"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_A57F_3E11F136E2A8" x="205" y="1822" width="170" height="115"/>
+			</ownedElement>
+		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_4BA59459_2BE8_4a2a_9BD6_72CB34B74A87" isFrame="false" modelElement="EAPK_B734BB7B_9769_4212_99E0_41BB15EB13D0">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4BA59459_2BE8_4a2a_9B44_2FCDD6AB5C9D" modelElement="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2BE8_4a2a_9B44_2FCDD6AB5C9D" text="epo:MonetaryValue"/>
@@ -6019,7 +6394,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4BA59459_2BE8_4a2a_B152_611B940C8A5E" modelElement="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2BE8_4a2a_B152_611B940C8A5E" text="epo:SubcontractingEstimate"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2BE8_4a2a_B152_611B940C8A5E" x="245" y="401" width="220" height="85"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2BE8_4a2a_B152_611B940C8A5E" x="244" y="390" width="268" height="111"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4BA59459_2BE8_4a2a_B727_BC88B30CF43C" modelElement="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2BE8_4a2a_B727_BC88B30CF43C" text="epo:ConcessionEstimate"/>
@@ -6031,7 +6406,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4BA59459_2BE8_4a2a_8C56_63A3A737F49A" modelElement="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2BE8_4a2a_8C56_63A3A737F49A" text="epo:SubmissionStatisticalInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2BE8_4a2a_8C56_63A3A737F49A" x="491" y="456" width="315" height="280"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2BE8_4a2a_8C56_63A3A737F49A" x="523" y="456" width="315" height="280"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4BA59459_2BE8_4a2a_BAA8_68D1BF528FF5" modelElement="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2BE8_4a2a_BAA8_68D1BF528FF5" text="epo:ProcurementObject"/>
@@ -6052,7 +6427,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4BA59459_2BE8_4a2a_BF42_2A6E50CAF4E6" modelElement="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2BE8_4a2a_BF42_2A6E50CAF4E6" text="epo:LotGroup"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2BE8_4a2a_BF42_2A6E50CAF4E6" x="1058" y="702" width="171" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2BE8_4a2a_BF42_2A6E50CAF4E6" x="1058" y="702" width="179" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4BA59459_2BE8_4a2a_835A_24C87816F40C" modelElement="EAID_44E7963D_28F5_4263_835A_24C87816F40C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2BE8_4a2a_835A_24C87816F40C" text="epo:DesignContestRegimeTerm"/>
@@ -6102,13 +6477,13 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_9CF5_2CFE5FEB856B" source="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" target="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E" modelElement="EAID_7C98771E_06E0_4141_9CF5_2CFE5FEB856B">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2BE8_4a2a_9CF5_2CFE5FEB856B" text="+epo:foreseesSubcontracting" modelElement="EAID_dst98771E_06E0_4141_9CF5_2CFE5FEB856B">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_9CF5_2CFE5FEB856B" x="245" y="352" width="117" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_9CF5_2CFE5FEB856B" x="252" y="343" width="117" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2BE8_4a2a_9CF5_2CFE5FEB856B" text="0..*" modelElement="EAID_dst98771E_06E0_4141_9CF5_2CFE5FEB856B">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_9CF5_2CFE5FEB856B" x="311" y="383" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_9CF5_2CFE5FEB856B" x="326" y="372" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_9CF5_2CFE5FEB856B" x="303" y="293"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_9CF5_2CFE5FEB856B" x="303" y="401"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_9CF5_2CFE5FEB856B" x="318" y="293"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_9CF5_2CFE5FEB856B" x="318" y="390"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_B61D_661F42799A98" source="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" target="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" modelElement="EAID_7B5EC3B7_635F_49aa_B61D_661F42799A98">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2BE8_4a2a_B61D_661F42799A98" text="+epo:isSubjectToGrouping" modelElement="EAID_dst5EC3B7_635F_49aa_B61D_661F42799A98">
@@ -6173,8 +6548,8 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2BE8_4a2a_94D7_26E6E451AF0C" text="0..1" modelElement="EAID_dstD513D4_9622_4217_94D7_26E6E451AF0C">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_94D7_26E6E451AF0C" x="983" y="461" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_94D7_26E6E451AF0C" x="806" y="617"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_94D7_26E6E451AF0C" x="971" y="617"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_94D7_26E6E451AF0C" x="838" y="620"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_94D7_26E6E451AF0C" x="971" y="620"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2BE8_4a2a_94D7_26E6E451AF0C" x="971" y="456"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_86E7_B4E433F87208" source="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_3127E296_9886_44bc_86E7_B4E433F87208">
@@ -6184,8 +6559,8 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2BE8_4a2a_86E7_B4E433F87208" text="0..1" modelElement="EAID_dst27E296_9886_44bc_86E7_B4E433F87208">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_86E7_B4E433F87208" x="1070" y="461" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_86E7_B4E433F87208" x="806" y="650"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_86E7_B4E433F87208" x="1058" y="650"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_86E7_B4E433F87208" x="838" y="654"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_86E7_B4E433F87208" x="1058" y="654"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2BE8_4a2a_86E7_B4E433F87208" x="1058" y="456"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_B489_34E46CFF8E24" source="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_D7964CE9_B09A_4855_B489_34E46CFF8E24">
@@ -6211,44 +6586,44 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_B54C_5FBB7973D2FA" source="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" target="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" modelElement="EAID_93203FD8_0FBB_48f1_B54C_5FBB7973D2FA">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2BE8_4a2a_B54C_5FBB7973D2FA" text="+epo:foreseesConcession" modelElement="EAID_dst203FD8_0FBB_48f1_B54C_5FBB7973D2FA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_B54C_5FBB7973D2FA" x="567" y="172" width="102" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_B54C_5FBB7973D2FA" x="569" y="172" width="102" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2BE8_4a2a_B54C_5FBB7973D2FA" text="0..1" modelElement="EAID_dst203FD8_0FBB_48f1_B54C_5FBB7973D2FA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_B54C_5FBB7973D2FA" x="627" y="192" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_B54C_5FBB7973D2FA" x="629" y="192" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_B54C_5FBB7973D2FA" x="294" y="151"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_B54C_5FBB7973D2FA" x="619" y="151"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2BE8_4a2a_B54C_5FBB7973D2FA" x="619" y="210"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_B54C_5FBB7973D2FA" x="294" y="164"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_B54C_5FBB7973D2FA" x="621" y="164"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2BE8_4a2a_B54C_5FBB7973D2FA" x="621" y="210"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_9E66_5EBEFD7759BC" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2BE8_4a2a_9E66_5EBEFD7759BC" text="+epo:hasLaunchFrameworkAgreementMaximumValue" modelElement="EAID_dstC50180_5437_4a3f_9E66_5EBEFD7759BC">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_9E66_5EBEFD7759BC" x="1188" y="470" width="14" height="221"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_9E66_5EBEFD7759BC" x="1191" y="470" width="14" height="221"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2BE8_4a2a_9E66_5EBEFD7759BC" text="0..1" modelElement="EAID_dstC50180_5437_4a3f_9E66_5EBEFD7759BC">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_9E66_5EBEFD7759BC" x="1219" y="461" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_9E66_5EBEFD7759BC" x="1222" y="461" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_9E66_5EBEFD7759BC" x="1207" y="702"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_9E66_5EBEFD7759BC" x="1207" y="456"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_9E66_5EBEFD7759BC" x="1210" y="702"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_9E66_5EBEFD7759BC" x="1210" y="456"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_8F62_2FA41A99DF74" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_72A7614C_D179_4558_8F62_2FA41A99DF74">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2BE8_4a2a_8F62_2FA41A99DF74" text="+epo:hasEstimatedValue" modelElement="EAID_dstA7614C_D179_4558_8F62_2FA41A99DF74">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_8F62_2FA41A99DF74" x="1108" y="473" width="14" height="101"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_8F62_2FA41A99DF74" x="1111" y="473" width="14" height="101"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2BE8_4a2a_8F62_2FA41A99DF74" text="0..1" modelElement="EAID_dstA7614C_D179_4558_8F62_2FA41A99DF74">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_8F62_2FA41A99DF74" x="1142" y="461" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_8F62_2FA41A99DF74" x="1145" y="461" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_8F62_2FA41A99DF74" x="1130" y="702"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_8F62_2FA41A99DF74" x="1130" y="456"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_8F62_2FA41A99DF74" x="1133" y="702"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_8F62_2FA41A99DF74" x="1133" y="456"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_BFE6_593632EDB11F" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_20732599_332F_4f0e_BFE6_593632EDB11F">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2BE8_4a2a_BFE6_593632EDB11F" text="+epo:setsGroupingContextForLot" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_BFE6_593632EDB11F" x="1079" y="786" width="131" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_BFE6_593632EDB11F" x="1080" y="786" width="131" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2BE8_4a2a_BFE6_593632EDB11F" text="1..*" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_BFE6_593632EDB11F" x="1153" y="802" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_BFE6_593632EDB11F" x="1154" y="802" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_BFE6_593632EDB11F" x="1145" y="772"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_BFE6_593632EDB11F" x="1145" y="820"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_BFE6_593632EDB11F" x="1146" y="772"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_BFE6_593632EDB11F" x="1146" y="820"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_9F54_76A56333BE1E" source="EAID_44E7963D_28F5_4263_835A_24C87816F40C" target="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496" modelElement="EAID_B851F167_3C73_4e45_9F54_76A56333BE1E">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2BE8_4a2a_9F54_76A56333BE1E" text="+epo:definesPrize" modelElement="EAID_dst51F167_3C73_4e45_9F54_76A56333BE1E">
@@ -6314,13 +6689,13 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_A52E_6EBA9F23871A" source="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_55AE269D_7874_4515_A52E_6EBA9F23871A">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2BE8_4a2a_A52E_6EBA9F23871A" text="+epo:hasSubcontractingEstimatedValue" modelElement="EAID_dstAE269D_7874_4515_A52E_6EBA9F23871A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_A52E_6EBA9F23871A" x="749" y="406" width="137" height="27"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_A52E_6EBA9F23871A" x="743" y="416" width="160" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2BE8_4a2a_A52E_6EBA9F23871A" text="0..1" modelElement="EAID_dstAE269D_7874_4515_A52E_6EBA9F23871A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_A52E_6EBA9F23871A" x="884" y="440" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_A52E_6EBA9F23871A" x="884" y="441" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_A52E_6EBA9F23871A" x="465" y="434"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_A52E_6EBA9F23871A" x="921" y="434"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_A52E_6EBA9F23871A" x="512" y="435"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_A52E_6EBA9F23871A" x="921" y="435"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_147ECFF1_21DD_4c94_B672_811B0C917F55" isFrame="false" modelElement="EAPK_B734BB7B_9769_4212_99E0_41BB15EB13D0">
@@ -6330,11 +6705,11 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_147ECFF1_21DD_4c94_9B44_2FCDD6AB5C9D" modelElement="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_21DD_4c94_9B44_2FCDD6AB5C9D" text="epo:MonetaryValue"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_21DD_4c94_9B44_2FCDD6AB5C9D" x="587" y="49" width="410" height="221"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_21DD_4c94_9B44_2FCDD6AB5C9D" x="587" y="49" width="410" height="241"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_147ECFF1_21DD_4c94_BF42_2A6E50CAF4E6" modelElement="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_21DD_4c94_BF42_2A6E50CAF4E6" text="epo:LotGroup"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_21DD_4c94_BF42_2A6E50CAF4E6" x="124" y="330" width="171" height="62"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_21DD_4c94_BF42_2A6E50CAF4E6" x="124" y="330" width="179" height="75"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_147ECFF1_21DD_4c94_AC62_FA4769B4D88C" modelElement="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_21DD_4c94_AC62_FA4769B4D88C" text="epo:Lot"/>
@@ -6354,10 +6729,10 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_147ECFF1_21DD_4c94_80CC_7E68CBDEDED2" modelElement="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_21DD_4c94_80CC_7E68CBDEDED2" text="epo:LotGroupAwardInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_21DD_4c94_80CC_7E68CBDEDED2" x="130" y="194" width="158" height="46"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_21DD_4c94_80CC_7E68CBDEDED2" x="135" y="189" width="158" height="55"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_147ECFF1_21DD_4c94_B90C_6DEFC3C6D8BB" modelElement="EAID_C451EC7C_9778_40f3_B90C_6DEFC3C6D8BB">
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_21DD_4c94_B90C_6DEFC3C6D8BB" x="250" y="252" width="119" height="43"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_21DD_4c94_B90C_6DEFC3C6D8BB" x="471" y="362" width="119" height="43"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_147ECFF1_21DD_4c94_8AC2_D7789CCFB7F8" modelElement="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_21DD_4c94_8AC2_D7789CCFB7F8" text="epo:AwardDecision"/>
@@ -6386,95 +6761,105 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_BB1A_167306D6B16C" source="EAID_E7437025_771F_4143_BE33_620A29646687" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_D257E7B8_BA32_4888_BB1A_167306D6B16C">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_21DD_4c94_BB1A_167306D6B16C" text="+epo:hasBargainPrice" modelElement="EAID_dst57E7B8_BA32_4888_BB1A_167306D6B16C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_BB1A_167306D6B16C" x="470" y="243" width="87" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_BB1A_167306D6B16C" x="470" y="262" width="87" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_21DD_4c94_BB1A_167306D6B16C" text="0..1" modelElement="EAID_dst57E7B8_BA32_4888_BB1A_167306D6B16C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_BB1A_167306D6B16C" x="568" y="267" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_BB1A_167306D6B16C" x="568" y="286" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_BB1A_167306D6B16C" x="434" y="456"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_BB1A_167306D6B16C" x="434" y="262"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_21DD_4c94_BB1A_167306D6B16C" x="587" y="262"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_BB1A_167306D6B16C" x="437" y="456"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_BB1A_167306D6B16C" x="437" y="281"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_21DD_4c94_BB1A_167306D6B16C" x="587" y="281"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_82EA_14ABA20458B6" source="EAID_E7437025_771F_4143_BE33_620A29646687" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_547A511C_F377_4405_82EA_14ABA20458B6">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_21DD_4c94_82EA_14ABA20458B6" text="+epo:hasAwardedValue" modelElement="EAID_dst7A511C_F377_4405_82EA_14ABA20458B6">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_82EA_14ABA20458B6" x="446" y="218" width="97" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_82EA_14ABA20458B6" x="446" y="235" width="97" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_21DD_4c94_82EA_14ABA20458B6" text="0..1" modelElement="EAID_dst7A511C_F377_4405_82EA_14ABA20458B6">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_82EA_14ABA20458B6" x="568" y="241" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_82EA_14ABA20458B6" x="568" y="258" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_82EA_14ABA20458B6" x="377" y="456"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_82EA_14ABA20458B6" x="377" y="236"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_21DD_4c94_82EA_14ABA20458B6" x="587" y="236"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_82EA_14ABA20458B6" x="380" y="456"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_82EA_14ABA20458B6" x="380" y="253"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_21DD_4c94_82EA_14ABA20458B6" x="587" y="253"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_93CA_CC7ACC63568D" source="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" target="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" modelElement="EAID_4B36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_21DD_4c94_93CA_CC7ACC63568D" text="+epo:describesLotGroup" modelElement="EAID_dst36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_93CA_CC7ACC63568D" x="161" y="297" width="97" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_93CA_CC7ACC63568D" x="166" y="297" width="97" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_21DD_4c94_93CA_CC7ACC63568D" text="1" modelElement="EAID_dst36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_93CA_CC7ACC63568D" x="218" y="312" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_93CA_CC7ACC63568D" x="223" y="312" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_93CA_CC7ACC63568D" x="210" y="240"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_93CA_CC7ACC63568D" x="210" y="330"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_93CA_CC7ACC63568D" x="215" y="244"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_93CA_CC7ACC63568D" x="215" y="330"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_B06C_0EA23C9FD1C7" source="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_01B7EE24_F987_4c92_B06C_0EA23C9FD1C7">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_21DD_4c94_B06C_0EA23C9FD1C7" text="+epo:hasGroupFrameworkAgreementMaximumValue" modelElement="EAID_dstB7EE24_F987_4c92_B06C_0EA23C9FD1C7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_B06C_0EA23C9FD1C7" x="350" y="193" width="217" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_B06C_0EA23C9FD1C7" x="350" y="183" width="217" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_21DD_4c94_B06C_0EA23C9FD1C7" text="0..1" modelElement="EAID_dstB7EE24_F987_4c92_B06C_0EA23C9FD1C7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_B06C_0EA23C9FD1C7" x="568" y="215" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_B06C_0EA23C9FD1C7" x="568" y="205" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_B06C_0EA23C9FD1C7" x="293" y="200"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_B06C_0EA23C9FD1C7" x="587" y="200"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_9823_548DE5751CA7" source="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_F890093A_076E_4f9b_9823_548DE5751CA7">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_21DD_4c94_9823_548DE5751CA7" text="+epo:hasApproximateGroupFrameworkAgreementValue" modelElement="EAID_dst90093A_076E_4f9b_9823_548DE5751CA7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_9823_548DE5751CA7" x="338" y="206" width="227" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_21DD_4c94_9823_548DE5751CA7" text="0..1" modelElement="EAID_dst90093A_076E_4f9b_9823_548DE5751CA7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_9823_548DE5751CA7" x="568" y="230" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_B06C_0EA23C9FD1C7" x="288" y="210"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_B06C_0EA23C9FD1C7" x="587" y="210"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_9823_548DE5751CA7" x="293" y="225"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_9823_548DE5751CA7" x="587" y="225"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_A935_786F35AF2AFB" source="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_653ADA02_9DFC_48b4_A935_786F35AF2AFB">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_21DD_4c94_A935_786F35AF2AFB" text="+epo:hasApproximateFrameworkAgreementValue" modelElement="EAID_dst3ADA02_9DFC_48b4_A935_786F35AF2AFB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_A935_786F35AF2AFB" x="352" y="95" width="203" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_A935_786F35AF2AFB" x="352" y="97" width="203" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_21DD_4c94_A935_786F35AF2AFB" text="0..1" modelElement="EAID_dst3ADA02_9DFC_48b4_A935_786F35AF2AFB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_A935_786F35AF2AFB" x="568" y="119" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_A935_786F35AF2AFB" x="568" y="121" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_A935_786F35AF2AFB" x="313" y="114"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_A935_786F35AF2AFB" x="587" y="114"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_A935_786F35AF2AFB" x="313" y="116"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_A935_786F35AF2AFB" x="587" y="116"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_A374_A1CFC018D076" source="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_C8D53635_0827_4589_A374_A1CFC018D076">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_21DD_4c94_A374_A1CFC018D076" text="+epo:hasTotalAwardedValue" modelElement="EAID_dstD53635_0827_4589_A374_A1CFC018D076">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_A374_A1CFC018D076" x="405" y="50" width="117" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_A374_A1CFC018D076" x="405" y="52" width="117" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_21DD_4c94_A374_A1CFC018D076" text="0..1" modelElement="EAID_dstD53635_0827_4589_A374_A1CFC018D076">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_A374_A1CFC018D076" x="568" y="69" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_A374_A1CFC018D076" x="568" y="71" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_A374_A1CFC018D076" x="313" y="64"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_A374_A1CFC018D076" x="587" y="64"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_A374_A1CFC018D076" x="313" y="66"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_A374_A1CFC018D076" x="587" y="66"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_B071_A8B833BDA1EF" source="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_079E96B7_4324_4eba_B071_A8B833BDA1EF">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_21DD_4c94_B071_A8B833BDA1EF" text="+epo:hasMaximumFrameworkAgreementAwardedValue" modelElement="EAID_dst9E96B7_4324_4eba_B071_A8B833BDA1EF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_B071_A8B833BDA1EF" x="329" y="69" width="229" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_B071_A8B833BDA1EF" x="329" y="71" width="229" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_21DD_4c94_B071_A8B833BDA1EF" text="0..1" modelElement="EAID_dst9E96B7_4324_4eba_B071_A8B833BDA1EF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_B071_A8B833BDA1EF" x="567" y="95" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_B071_A8B833BDA1EF" x="567" y="97" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_B071_A8B833BDA1EF" x="313" y="88"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_B071_A8B833BDA1EF" x="587" y="88"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_B071_A8B833BDA1EF" x="313" y="90"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_B071_A8B833BDA1EF" x="587" y="90"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_8469_562A93DEF12E" source="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_949017B7_0159_4fe1_8469_562A93DEF12E">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_21DD_4c94_8469_562A93DEF12E" text="+epo:hasProcurementLowestReceivedTenderValue" modelElement="EAID_dst9017B7_0159_4fe1_8469_562A93DEF12E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_8469_562A93DEF12E" x="341" y="121" width="204" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_8469_562A93DEF12E" x="341" y="123" width="204" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_21DD_4c94_8469_562A93DEF12E" text="0..1" modelElement="EAID_dst9017B7_0159_4fe1_8469_562A93DEF12E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_8469_562A93DEF12E" x="568" y="143" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_8469_562A93DEF12E" x="568" y="145" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_8469_562A93DEF12E" x="313" y="138"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_8469_562A93DEF12E" x="587" y="138"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_8469_562A93DEF12E" x="313" y="140"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_8469_562A93DEF12E" x="587" y="140"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_92AE_A27F7DFCCAC3" source="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_510F8DDB_DB12_48df_92AE_A27F7DFCCAC3">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_21DD_4c94_92AE_A27F7DFCCAC3" text="+epo:hasProcurementHighestReceivedTenderValue" modelElement="EAID_dst0F8DDB_DB12_48df_92AE_A27F7DFCCAC3">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_92AE_A27F7DFCCAC3" x="341" y="147" width="206" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_92AE_A27F7DFCCAC3" x="341" y="148" width="206" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_21DD_4c94_92AE_A27F7DFCCAC3" text="0..1" modelElement="EAID_dst0F8DDB_DB12_48df_92AE_A27F7DFCCAC3">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_92AE_A27F7DFCCAC3" x="568" y="171" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_92AE_A27F7DFCCAC3" x="568" y="172" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_92AE_A27F7DFCCAC3" x="313" y="166"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_92AE_A27F7DFCCAC3" x="587" y="166"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_92AE_A27F7DFCCAC3" x="313" y="167"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_92AE_A27F7DFCCAC3" x="587" y="167"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_94BC_1C90816E0487" source="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_96BA801A_E8C8_4628_94BC_1C90816E0487">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_21DD_4c94_94BC_1C90816E0487" text="+epo:concernsLot" modelElement="EAID_dstBA801A_E8C8_4628_94BC_1C90816E0487">
@@ -6492,23 +6877,23 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_8D8A_71BD69D25161" source="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_1E87247C_598C_4f96_8D8A_71BD69D25161">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_21DD_4c94_8D8A_71BD69D25161" text="+epo:hasFrameworkAgreementMaximumValue" modelElement="EAID_dst87247C_598C_4f96_8D8A_71BD69D25161">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_8D8A_71BD69D25161" x="799" y="350" width="193" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_8D8A_71BD69D25161" x="799" y="370" width="193" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_21DD_4c94_8D8A_71BD69D25161" text="0..1" modelElement="EAID_dst87247C_598C_4f96_8D8A_71BD69D25161">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_8D8A_71BD69D25161" x="898" y="275" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_8D8A_71BD69D25161" x="898" y="295" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_8D8A_71BD69D25161" x="886" y="431"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_8D8A_71BD69D25161" x="886" y="270"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_8D8A_71BD69D25161" x="886" y="290"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_A6DC_62DFC84C122D" source="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_8E7619CE_95A4_4f77_A6DC_62DFC84C122D">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_21DD_4c94_A6DC_62DFC84C122D" text="+epo:hasApproximateFrameworkAgreementValue" modelElement="EAID_dst7619CE_95A4_4f77_A6DC_62DFC84C122D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_A6DC_62DFC84C122D" x="609" y="318" width="203" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_A6DC_62DFC84C122D" x="609" y="338" width="203" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_21DD_4c94_A6DC_62DFC84C122D" text="0..1" modelElement="EAID_dst7619CE_95A4_4f77_A6DC_62DFC84C122D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_A6DC_62DFC84C122D" x="730" y="275" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_A6DC_62DFC84C122D" x="730" y="295" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_A6DC_62DFC84C122D" x="718" y="431"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_A6DC_62DFC84C122D" x="718" y="270"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_A6DC_62DFC84C122D" x="718" y="290"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_A283_8978FB00BD51" source="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" target="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" modelElement="EAID_D6AB3946_257D_4382_A283_8978FB00BD51">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_21DD_4c94_A283_8978FB00BD51" text="+epo:isSubmittedForLotGroup" modelElement="EAID_dstAB3946_257D_4382_A283_8978FB00BD51">
@@ -6535,25 +6920,25 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_A677_A1E36D3B53C0" source="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_7A92C123_93F7_4d51_A677_A1E36D3B53C0">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_21DD_4c94_A677_A1E36D3B53C0" text="+epo:hasTotalValue" modelElement="EAID_dst92C123_93F7_4d51_A677_A1E36D3B53C0">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_A677_A1E36D3B53C0" x="1000" y="69" width="81" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_A677_A1E36D3B53C0" x="1000" y="75" width="81" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_21DD_4c94_A677_A1E36D3B53C0" text="0..1" modelElement="EAID_dst92C123_93F7_4d51_A677_A1E36D3B53C0">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_A677_A1E36D3B53C0" x="1000" y="92" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_A677_A1E36D3B53C0" x="1000" y="98" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_A677_A1E36D3B53C0" x="1445" y="456"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_A677_A1E36D3B53C0" x="1445" y="87"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_21DD_4c94_A677_A1E36D3B53C0" x="997" y="87"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_A677_A1E36D3B53C0" x="1445" y="93"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_21DD_4c94_A677_A1E36D3B53C0" x="997" y="93"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_9953_EA1E6D255A89" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_3220FB6D_76C7_486a_9953_EA1E6D255A89">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_21DD_4c94_9953_EA1E6D255A89" text="+epo:hasContractValue" modelElement="EAID_dst20FB6D_76C7_486a_9953_EA1E6D255A89">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_9953_EA1E6D255A89" x="1017" y="117" width="94" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_9953_EA1E6D255A89" x="1017" y="120" width="94" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_21DD_4c94_9953_EA1E6D255A89" text="0..1" modelElement="EAID_dst20FB6D_76C7_486a_9953_EA1E6D255A89">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_9953_EA1E6D255A89" x="1000" y="137" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_9953_EA1E6D255A89" x="1000" y="140" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_9953_EA1E6D255A89" x="1123" y="603"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_9953_EA1E6D255A89" x="1123" y="132"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_21DD_4c94_9953_EA1E6D255A89" x="997" y="132"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_9953_EA1E6D255A89" x="1123" y="135"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_21DD_4c94_9953_EA1E6D255A89" x="997" y="135"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_8F66_FA023FA190E7" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_21DD_4c94_8F66_FA023FA190E7" text="+epo:hasLotReference" modelElement="EAID_dstCFA3D8_50E1_40f7_8F66_FA023FA190E7">
@@ -6587,8 +6972,8 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_21DD_4c94_B11C_CBD651205C58" x="368" y="497"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_8FE6_3B40BD241A4B" source="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" target="EAID_FBD046CD_CD18_4d96_99E0_63CAC8A5D594" modelElement="EAID_E9E2A1B8_A705_4847_8FE6_3B40BD241A4B">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_8FE6_3B40BD241A4B" x="997" y="211"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_8FE6_3B40BD241A4B" x="1062" y="211"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_8FE6_3B40BD241A4B" x="997" y="213"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_8FE6_3B40BD241A4B" x="1062" y="213"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_21DD_4c94_8FE6_3B40BD241A4B" x="1062" y="325"/>
 			</ownedElement>
 		</umldi:Diagram>
@@ -7009,7 +7394,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_BF42_2A6E50CAF4E6" modelElement="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_BF42_2A6E50CAF4E6" text="epo:LotGroup"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_BF42_2A6E50CAF4E6" x="1980" y="783" width="172" height="99"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_BF42_2A6E50CAF4E6" x="1980" y="783" width="179" height="99"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_B53F_E7A5B530FFFD" modelElement="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_B53F_E7A5B530FFFD" text="epo:ProcedureSpecificTerm"/>
@@ -7133,19 +7518,26 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_AFA8_D5DCED9D61C7" text="dct:Location"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_AFA8_D5DCED9D61C7" x="2093" y="1151" width="200" height="70"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_98A5_58BD6A43131C" source="EAID_82AA47D1_6939_4328_8108_0018817C75BD" target="EAID_29678A10_6473_461a_BE84_76269B5BBD68" modelElement="EAID_A8CBD7C1_E82A_4979_98A5_58BD6A43131C">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_98A5_58BD6A43131C" text="+epo:definesOpeningPlace" modelElement="EAID_dstCBD7C1_E82A_4979_98A5_58BD6A43131C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_98A5_58BD6A43131C" x="2074" y="1785" width="108" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_B4C7_BC3E17610EF7" source="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" target="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" modelElement="EAID_A02EFC84_74F8_415f_B4C7_BC3E17610EF7">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_B4C7_BC3E17610EF7" text="+epo:definesSpecificPlaceOfPerformance" modelElement="EAID_dst2EFC84_74F8_415f_B4C7_BC3E17610EF7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_B4C7_BC3E17610EF7" x="2092" y="1105" width="165" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_98A5_58BD6A43131C" text="0..1" modelElement="EAID_dstCBD7C1_E82A_4979_98A5_58BD6A43131C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_98A5_58BD6A43131C" x="2146" y="1750" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_B4C7_BC3E17610EF7" text="0..*" modelElement="EAID_dst2EFC84_74F8_415f_B4C7_BC3E17610EF7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_B4C7_BC3E17610EF7" x="2185" y="1133" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_98A5_58BD6A43131C" x="1202" y="431"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_98A5_58BD6A43131C" x="1202" y="255"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_98A5_58BD6A43131C" x="2850" y="255"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_5E59_49bd_98A5_58BD6A43131C" x="2850" y="1958"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_5E59_49bd_98A5_58BD6A43131C" x="2134" y="1958"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_5E59_49bd_98A5_58BD6A43131C" x="2134" y="1745"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_B4C7_BC3E17610EF7" x="2043" y="461"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_B4C7_BC3E17610EF7" x="2177" y="461"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_B4C7_BC3E17610EF7" x="2177" y="1151"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_AB11_165E12CB38A6" source="EAID_49EC0F16_408C_4b28_B611_0048946DC070" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_4714A192_0DFA_49f4_AB11_165E12CB38A6">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_AB11_165E12CB38A6" text="+epo:actsOnBehalfOf" modelElement="EAID_dst14A192_0DFA_49f4_AB11_165E12CB38A6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_AB11_165E12CB38A6" x="1156" y="1504" width="87" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_AB11_165E12CB38A6" text="1..*" modelElement="EAID_dst14A192_0DFA_49f4_AB11_165E12CB38A6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_AB11_165E12CB38A6" x="1223" y="1528" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_AB11_165E12CB38A6" x="1088" y="1522"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_AB11_165E12CB38A6" x="1254" y="1522"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_9939_FA613CEB5D22" source="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_1C8C734E_FD33_4153_9939_FA613CEB5D22">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_9939_FA613CEB5D22" text="+epo:isSubjectToProcedureSpecificTerm" modelElement="EAID_dst8C734E_FD33_4153_9939_FA613CEB5D22">
@@ -7194,7 +7586,7 @@
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_A7B8_F5FEC69BBDA5" x="2408" y="1909" width="143" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_A7B8_F5FEC69BBDA5" text="0..*" modelElement="EAID_dst812517_A9DA_432d_A7B8_F5FEC69BBDA5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_A7B8_F5FEC69BBDA5" x="2534" y="1932" width="100" height="10"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_A7B8_F5FEC69BBDA5" x="2534" y="1932" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_A7B8_F5FEC69BBDA5" x="1369" y="1581"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_A7B8_F5FEC69BBDA5" x="1369" y="1927"/>
@@ -7228,31 +7620,25 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_8BC2_8F80AD12DA02" x="2043" y="393"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_8BC2_8F80AD12DA02" x="2170" y="393"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_BE3B_872E1A0882C0" source="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" target="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" modelElement="EAID_D62CD782_93C6_480f_BE3B_872E1A0882C0">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_BE3B_872E1A0882C0" x="1743" y="501"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_BE3B_872E1A0882C0" x="1743" y="615"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_BE3B_872E1A0882C0" x="1651" y="615"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_AB11_165E12CB38A6" source="EAID_49EC0F16_408C_4b28_B611_0048946DC070" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_4714A192_0DFA_49f4_AB11_165E12CB38A6">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_AB11_165E12CB38A6" text="+epo:actsOnBehalfOf" modelElement="EAID_dst14A192_0DFA_49f4_AB11_165E12CB38A6">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_AB11_165E12CB38A6" x="1156" y="1504" width="87" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_9195_C96F98BD3349" source="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_9195_C96F98BD3349" text="+epo:hasProcurementScopeDividedIntoLot" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_9195_C96F98BD3349" x="1603" y="916" width="171" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_AB11_165E12CB38A6" text="1..*" modelElement="EAID_dst14A192_0DFA_49f4_AB11_165E12CB38A6">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_AB11_165E12CB38A6" x="1223" y="1528" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_9195_C96F98BD3349" text="1..*" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_9195_C96F98BD3349" x="1733" y="902" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_AB11_165E12CB38A6" x="1088" y="1522"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_AB11_165E12CB38A6" x="1254" y="1522"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_9195_C96F98BD3349" x="1721" y="1095"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_9195_C96F98BD3349" x="1721" y="897"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_B4C7_BC3E17610EF7" source="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" target="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" modelElement="EAID_A02EFC84_74F8_415f_B4C7_BC3E17610EF7">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_B4C7_BC3E17610EF7" text="+epo:definesSpecificPlaceOfPerformance" modelElement="EAID_dst2EFC84_74F8_415f_B4C7_BC3E17610EF7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_B4C7_BC3E17610EF7" x="2092" y="1105" width="165" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_8694_914903478877" source="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" target="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561" modelElement="EAID_F593B546_502A_413a_8694_914903478877">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_8694_914903478877" text="+epo:definesSubcontractingTerm" modelElement="EAID_dst93B546_502A_413a_8694_914903478877">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_8694_914903478877" x="1891" y="519" width="133" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_B4C7_BC3E17610EF7" text="0..*" modelElement="EAID_dst2EFC84_74F8_415f_B4C7_BC3E17610EF7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_B4C7_BC3E17610EF7" x="2185" y="1133" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_8694_914903478877" text="0..1" modelElement="EAID_dst93B546_502A_413a_8694_914903478877">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_8694_914903478877" x="1965" y="540" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_B4C7_BC3E17610EF7" x="2043" y="461"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_B4C7_BC3E17610EF7" x="2177" y="461"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_B4C7_BC3E17610EF7" x="2177" y="1151"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_8694_914903478877" x="1957" y="501"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_8694_914903478877" x="1957" y="558"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_A7F5_548146C45BC4" source="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_A7F5_548146C45BC4" text="+epo:specifiesProcurementCriterion" modelElement="EAID_dst1AA305_6E1E_4123_A7F5_548146C45BC4">
@@ -7265,6 +7651,20 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_A7F5_548146C45BC4" x="1752" y="703"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_A7F5_548146C45BC4" x="2502" y="703"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_98A5_58BD6A43131C" source="EAID_82AA47D1_6939_4328_8108_0018817C75BD" target="EAID_29678A10_6473_461a_BE84_76269B5BBD68" modelElement="EAID_A8CBD7C1_E82A_4979_98A5_58BD6A43131C">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_98A5_58BD6A43131C" text="+epo:definesOpeningPlace" modelElement="EAID_dstCBD7C1_E82A_4979_98A5_58BD6A43131C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_98A5_58BD6A43131C" x="2074" y="1785" width="108" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_98A5_58BD6A43131C" text="0..1" modelElement="EAID_dstCBD7C1_E82A_4979_98A5_58BD6A43131C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_98A5_58BD6A43131C" x="2146" y="1750" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_98A5_58BD6A43131C" x="1202" y="431"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_98A5_58BD6A43131C" x="1202" y="255"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_98A5_58BD6A43131C" x="2850" y="255"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_5E59_49bd_98A5_58BD6A43131C" x="2850" y="1958"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_5E59_49bd_98A5_58BD6A43131C" x="2134" y="1958"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_5E59_49bd_98A5_58BD6A43131C" x="2134" y="1745"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_BF56_83000481AB12" source="EAID_82AA47D1_6939_4328_8108_0018817C75BD" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_15042E3E_B61C_4d75_BF56_83000481AB12">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_BF56_83000481AB12" x="1154" y="457"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_BF56_83000481AB12" x="549" y="457"/>
@@ -7348,15 +7748,10 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_8346_839CB32AF64E" x="2293" y="1186"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_8346_839CB32AF64E" x="2467" y="1186"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_8694_914903478877" source="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" target="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561" modelElement="EAID_F593B546_502A_413a_8694_914903478877">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_8694_914903478877" text="+epo:definesSubcontractingTerm" modelElement="EAID_dst93B546_502A_413a_8694_914903478877">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_8694_914903478877" x="1891" y="519" width="133" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_8694_914903478877" text="0..1" modelElement="EAID_dst93B546_502A_413a_8694_914903478877">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_8694_914903478877" x="1965" y="540" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_8694_914903478877" x="1957" y="501"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_8694_914903478877" x="1957" y="558"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_BE3B_872E1A0882C0" source="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" target="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" modelElement="EAID_D62CD782_93C6_480f_BE3B_872E1A0882C0">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_BE3B_872E1A0882C0" x="1743" y="501"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_BE3B_872E1A0882C0" x="1743" y="615"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_BE3B_872E1A0882C0" x="1651" y="615"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_A80D_69ACBFA6147C" source="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" target="EAID_D278CCD5_4E82_42f5_9A9B_C25371C94006" modelElement="EAID_277C636A_D943_484f_A80D_69ACBFA6147C">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_A80D_69ACBFA6147C" x="2502" y="624"/>
@@ -7476,15 +7871,9 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_9563_4C96020D607C" x="2615" y="588"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_9563_4C96020D607C" x="2611" y="496"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_9195_C96F98BD3349" source="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_9195_C96F98BD3349" text="+epo:hasProcurementScopeDividedIntoLot" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_9195_C96F98BD3349" x="1603" y="916" width="171" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_9195_C96F98BD3349" text="1..*" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_9195_C96F98BD3349" x="1733" y="902" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_9195_C96F98BD3349" x="1721" y="1095"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_9195_C96F98BD3349" x="1721" y="897"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_AF48_1EE54018D9E5" source="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" target="EAID_02014F61_A766_467e_BD3D_7F41689C651B" modelElement="EAID_91E24989_0AB1_44de_AF48_1EE54018D9E5">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_AF48_1EE54018D9E5" x="2524" y="461"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_AF48_1EE54018D9E5" x="2402" y="461"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_B380_6FDE59360DAF" source="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_34156914_725C_4a26_B380_6FDE59360DAF">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_B380_6FDE59360DAF" text="+epo:refersToPreviousProcedureLot" modelElement="EAID_dst156914_725C_4a26_B380_6FDE59360DAF">
@@ -7540,6 +7929,17 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_80CD_0C45E80E9AEE" x="833" y="1306"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_80CD_0C45E80E9AEE" x="833" y="1512"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_A94B_6552B0F5A59A" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_505234FB_4CE0_475f_A94B_6552B0F5A59A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_A94B_6552B0F5A59A" text="+epo:isSubjectToLotSpecificTerm" modelElement="EAID_dst5234FB_4CE0_475f_A94B_6552B0F5A59A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_A94B_6552B0F5A59A" x="1193" y="707" width="132" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_A94B_6552B0F5A59A" text="0..*" modelElement="EAID_dst5234FB_4CE0_475f_A94B_6552B0F5A59A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_A94B_6552B0F5A59A" x="1157" y="733" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_A94B_6552B0F5A59A" x="2083" y="783"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_A94B_6552B0F5A59A" x="2083" y="728"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_A94B_6552B0F5A59A" x="1154" y="728"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_BFE6_593632EDB11F" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_20732599_332F_4f0e_BFE6_593632EDB11F">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_BFE6_593632EDB11F" text="+epo:setsGroupingContextForLot" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_BFE6_593632EDB11F" x="1847" y="812" width="131" height="14"/>
@@ -7557,7 +7957,7 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_8F62_2FA41A99DF74" text="0..1" modelElement="EAID_dstA7614C_D179_4558_8F62_2FA41A99DF74">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_8F62_2FA41A99DF74" x="2555" y="942" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_8F62_2FA41A99DF74" x="2152" y="838"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_8F62_2FA41A99DF74" x="2159" y="838"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_8F62_2FA41A99DF74" x="2547" y="838"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_8F62_2FA41A99DF74" x="2547" y="960"/>
 			</ownedElement>
@@ -7568,7 +7968,7 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_9E66_5EBEFD7759BC" text="0..1" modelElement="EAID_dstC50180_5437_4a3f_9E66_5EBEFD7759BC">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_9E66_5EBEFD7759BC" x="2422" y="942" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_9E66_5EBEFD7759BC" x="2152" y="866"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_9E66_5EBEFD7759BC" x="2159" y="866"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_9E66_5EBEFD7759BC" x="2414" y="866"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_9E66_5EBEFD7759BC" x="2414" y="960"/>
 			</ownedElement>
@@ -7579,7 +7979,7 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_B087_27A619B6C819" text="0..*" modelElement="EAID_dst7073E1_3362_472f_B087_27A619B6C819">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_B087_27A619B6C819" x="2619" y="717" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_B087_27A619B6C819" x="2152" y="807"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_B087_27A619B6C819" x="2159" y="807"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_B087_27A619B6C819" x="2607" y="807"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_B087_27A619B6C819" x="2607" y="712"/>
 			</ownedElement>
@@ -7598,10 +7998,6 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_ADCE_908A980E0342" x="1596" y="833"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_ADCE_908A980E0342" x="1325" y="838"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_AF48_1EE54018D9E5" source="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" target="EAID_02014F61_A766_467e_BD3D_7F41689C651B" modelElement="EAID_91E24989_0AB1_44de_AF48_1EE54018D9E5">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_AF48_1EE54018D9E5" x="2524" y="461"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_AF48_1EE54018D9E5" x="2402" y="461"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_B227_85988E5F2016" source="EAID_29678A10_6473_461a_BE84_76269B5BBD68" target="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40" modelElement="EAID_626183B8_93AC_4300_B227_85988E5F2016">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_B227_85988E5F2016" x="2246" y="1592"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_B227_85988E5F2016" x="2246" y="1474"/>
@@ -7623,7 +8019,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_47122B38_736F_476f_B152_611B940C8A5E" modelElement="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_736F_476f_B152_611B940C8A5E" text="epo:SubcontractingEstimate"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_736F_476f_B152_611B940C8A5E" x="1244" y="376" width="250" height="85"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_736F_476f_B152_611B940C8A5E" x="1244" y="376" width="268" height="111"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_47122B38_736F_476f_9491_D5301EE0DDE7" modelElement="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_736F_476f_9491_D5301EE0DDE7" text="epo:Subcontractor"/>
@@ -7672,23 +8068,23 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_47122B38_736F_476f_9CF5_2CFE5FEB856B" source="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" target="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E" modelElement="EAID_7C98771E_06E0_4141_9CF5_2CFE5FEB856B">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_736F_476f_9CF5_2CFE5FEB856B" text="+epo:foreseesSubcontracting" modelElement="EAID_dst98771E_06E0_4141_9CF5_2CFE5FEB856B">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_736F_476f_9CF5_2CFE5FEB856B" x="1140" y="375" width="94" height="27"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_736F_476f_9CF5_2CFE5FEB856B" x="1140" y="379" width="94" height="27"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_736F_476f_9CF5_2CFE5FEB856B" text="0..*" modelElement="EAID_dst98771E_06E0_4141_9CF5_2CFE5FEB856B">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_736F_476f_9CF5_2CFE5FEB856B" x="1225" y="417" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_736F_476f_9CF5_2CFE5FEB856B" x="1225" y="421" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_9CF5_2CFE5FEB856B" x="1134" y="412"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_9CF5_2CFE5FEB856B" x="1244" y="412"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_9CF5_2CFE5FEB856B" x="1134" y="416"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_9CF5_2CFE5FEB856B" x="1244" y="416"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_47122B38_736F_476f_A646_9A2FDEE01B0F" source="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" target="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" modelElement="EAID_24545C91_D269_4cfe_A646_9A2FDEE01B0F">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_736F_476f_A646_9A2FDEE01B0F" text="+epo:specifiesSubcontractors" modelElement="EAID_dst545C91_D269_4cfe_A646_9A2FDEE01B0F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_736F_476f_A646_9A2FDEE01B0F" x="1046" y="326" width="117" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_736F_476f_A646_9A2FDEE01B0F" x="1074" y="326" width="117" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_736F_476f_A646_9A2FDEE01B0F" text="0..*" modelElement="EAID_dst545C91_D269_4cfe_A646_9A2FDEE01B0F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_736F_476f_A646_9A2FDEE01B0F" x="1099" y="302" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_736F_476f_A646_9A2FDEE01B0F" x="1127" y="302" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_A646_9A2FDEE01B0F" x="1087" y="363"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_A646_9A2FDEE01B0F" x="1087" y="297"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_A646_9A2FDEE01B0F" x="1115" y="363"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_A646_9A2FDEE01B0F" x="1115" y="297"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_47122B38_736F_476f_B61D_661F42799A98" source="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" target="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" modelElement="EAID_7B5EC3B7_635F_49aa_B61D_661F42799A98">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_736F_476f_B61D_661F42799A98" text="+epo:isSubjectToGrouping" modelElement="EAID_dst5EC3B7_635F_49aa_B61D_661F42799A98">
@@ -7711,6 +8107,16 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_9B16_DD484C6E2547" x="1019" y="475"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_9B16_DD484C6E2547" x="1019" y="636"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_47122B38_736F_476f_8F94_BA9A89E0B960" source="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" target="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" modelElement="EAID_ED09AA70_1480_4e41_8F94_BA9A89E0B960">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_736F_476f_8F94_BA9A89E0B960" text="+epo:foreseesSubcontractor" modelElement="EAID_dst09AA70_1480_4e41_8F94_BA9A89E0B960">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_736F_476f_8F94_BA9A89E0B960" x="987" y="341" width="113" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_736F_476f_8F94_BA9A89E0B960" text="0..*" modelElement="EAID_dst09AA70_1480_4e41_8F94_BA9A89E0B960">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_736F_476f_8F94_BA9A89E0B960" x="1086" y="302" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_8F94_BA9A89E0B960" x="1074" y="363"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_8F94_BA9A89E0B960" x="1074" y="297"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_47122B38_736F_476f_B489_34E46CFF8E24" source="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_D7964CE9_B09A_4855_B489_34E46CFF8E24">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_736F_476f_B489_34E46CFF8E24" text="+epo:hasFinancialOfferValue" modelElement="EAID_dst964CE9_B09A_4855_B489_34E46CFF8E24">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_736F_476f_B489_34E46CFF8E24" x="749" y="483" width="117" height="14"/>
@@ -7812,7 +8218,7 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_736F_476f_A52E_6EBA9F23871A" text="0..1" modelElement="EAID_dstAE269D_7874_4515_A52E_6EBA9F23871A">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_736F_476f_A52E_6EBA9F23871A" x="749" y="555" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_A52E_6EBA9F23871A" x="1439" y="461"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_A52E_6EBA9F23871A" x="1439" y="487"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_A52E_6EBA9F23871A" x="1439" y="552"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_736F_476f_A52E_6EBA9F23871A" x="733" y="552"/>
 			</ownedElement>
@@ -7824,11 +8230,11 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0717D631_676D_41e7_9B44_2FCDD6AB5C9D" modelElement="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_676D_41e7_9B44_2FCDD6AB5C9D" text="epo:MonetaryValue"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_9B44_2FCDD6AB5C9D" x="653" y="22" width="412" height="253"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_9B44_2FCDD6AB5C9D" x="653" y="22" width="412" height="273"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0717D631_676D_41e7_BF42_2A6E50CAF4E6" modelElement="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_676D_41e7_BF42_2A6E50CAF4E6" text="epo:LotGroup"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_BF42_2A6E50CAF4E6" x="197" y="395" width="171" height="62"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_BF42_2A6E50CAF4E6" x="197" y="395" width="179" height="75"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0717D631_676D_41e7_AC62_FA4769B4D88C" modelElement="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_676D_41e7_AC62_FA4769B4D88C" text="epo:Lot"/>
@@ -7848,7 +8254,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0717D631_676D_41e7_B8D8_207479C15419" modelElement="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_676D_41e7_B8D8_207479C15419" text="epo:Tender"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_B8D8_207479C15419" x="1129" y="624" width="224" height="87"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_B8D8_207479C15419" x="1129" y="625" width="224" height="87"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0717D631_676D_41e7_8AC2_D7789CCFB7F8" modelElement="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_676D_41e7_8AC2_D7789CCFB7F8" text="epo:AwardDecision"/>
@@ -7868,63 +8274,73 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0717D631_676D_41e7_B06C_0EA23C9FD1C7" source="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_01B7EE24_F987_4c92_B06C_0EA23C9FD1C7">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_676D_41e7_B06C_0EA23C9FD1C7" text="+epo:hasGroupFrameworkAgreementMaximumValue" modelElement="EAID_dstB7EE24_F987_4c92_B06C_0EA23C9FD1C7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_B06C_0EA23C9FD1C7" x="419" y="168" width="217" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_B06C_0EA23C9FD1C7" x="419" y="169" width="217" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_676D_41e7_B06C_0EA23C9FD1C7" text="0..1" modelElement="EAID_dstB7EE24_F987_4c92_B06C_0EA23C9FD1C7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_B06C_0EA23C9FD1C7" x="634" y="190" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_B06C_0EA23C9FD1C7" x="634" y="191" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_B06C_0EA23C9FD1C7" x="340" y="186"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_B06C_0EA23C9FD1C7" x="653" y="186"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0717D631_676D_41e7_9823_548DE5751CA7" source="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_F890093A_076E_4f9b_9823_548DE5751CA7">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_676D_41e7_9823_548DE5751CA7" text="+epo:hasApproximateGroupFrameworkAgreementValue" modelElement="EAID_dst90093A_076E_4f9b_9823_548DE5751CA7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_9823_548DE5751CA7" x="412" y="195" width="227" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_676D_41e7_9823_548DE5751CA7" text="0..1" modelElement="EAID_dst90093A_076E_4f9b_9823_548DE5751CA7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_9823_548DE5751CA7" x="634" y="216" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_B06C_0EA23C9FD1C7" x="340" y="185"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_B06C_0EA23C9FD1C7" x="653" y="185"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_9823_548DE5751CA7" x="340" y="211"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_9823_548DE5751CA7" x="653" y="211"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0717D631_676D_41e7_A935_786F35AF2AFB" source="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_653ADA02_9DFC_48b4_A935_786F35AF2AFB">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_676D_41e7_A935_786F35AF2AFB" text="+epo:hasApproximateFrameworkAgreementValue" modelElement="EAID_dst3ADA02_9DFC_48b4_A935_786F35AF2AFB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_A935_786F35AF2AFB" x="423" y="70" width="203" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_A935_786F35AF2AFB" x="423" y="72" width="203" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_676D_41e7_A935_786F35AF2AFB" text="0..1" modelElement="EAID_dst3ADA02_9DFC_48b4_A935_786F35AF2AFB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_A935_786F35AF2AFB" x="634" y="91" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_A935_786F35AF2AFB" x="634" y="93" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_A935_786F35AF2AFB" x="373" y="86"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_A935_786F35AF2AFB" x="653" y="86"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_A935_786F35AF2AFB" x="373" y="88"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_A935_786F35AF2AFB" x="653" y="88"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0717D631_676D_41e7_A374_A1CFC018D076" source="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_C8D53635_0827_4589_A374_A1CFC018D076">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_676D_41e7_A374_A1CFC018D076" text="+epo:hasTotalAwardedValue" modelElement="EAID_dstD53635_0827_4589_A374_A1CFC018D076">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_A374_A1CFC018D076" x="510" y="18" width="117" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_A374_A1CFC018D076" x="510" y="20" width="117" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_676D_41e7_A374_A1CFC018D076" text="0..1" modelElement="EAID_dstD53635_0827_4589_A374_A1CFC018D076">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_A374_A1CFC018D076" x="634" y="40" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_A374_A1CFC018D076" x="634" y="42" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_A374_A1CFC018D076" x="373" y="35"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_A374_A1CFC018D076" x="653" y="35"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_A374_A1CFC018D076" x="373" y="37"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_A374_A1CFC018D076" x="653" y="37"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0717D631_676D_41e7_B071_A8B833BDA1EF" source="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_079E96B7_4324_4eba_B071_A8B833BDA1EF">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_676D_41e7_B071_A8B833BDA1EF" text="+epo:hasMaximumFrameworkAgreementAwardedValue" modelElement="EAID_dst9E96B7_4324_4eba_B071_A8B833BDA1EF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_B071_A8B833BDA1EF" x="404" y="94" width="229" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_B071_A8B833BDA1EF" x="404" y="95" width="229" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_676D_41e7_B071_A8B833BDA1EF" text="0..1" modelElement="EAID_dst9E96B7_4324_4eba_B071_A8B833BDA1EF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_B071_A8B833BDA1EF" x="635" y="121" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_B071_A8B833BDA1EF" x="635" y="122" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_B071_A8B833BDA1EF" x="373" y="111"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_B071_A8B833BDA1EF" x="653" y="111"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_B071_A8B833BDA1EF" x="373" y="112"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_B071_A8B833BDA1EF" x="653" y="112"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0717D631_676D_41e7_8469_562A93DEF12E" source="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_949017B7_0159_4fe1_8469_562A93DEF12E">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_676D_41e7_8469_562A93DEF12E" text="+epo:hasProcurementLowestReceivedTenderValue" modelElement="EAID_dst9017B7_0159_4fe1_8469_562A93DEF12E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_8469_562A93DEF12E" x="423" y="45" width="204" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_8469_562A93DEF12E" x="423" y="47" width="204" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_676D_41e7_8469_562A93DEF12E" text="0..1" modelElement="EAID_dst9017B7_0159_4fe1_8469_562A93DEF12E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_8469_562A93DEF12E" x="634" y="67" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_8469_562A93DEF12E" x="634" y="69" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_8469_562A93DEF12E" x="373" y="62"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_8469_562A93DEF12E" x="653" y="62"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_8469_562A93DEF12E" x="373" y="64"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_8469_562A93DEF12E" x="653" y="64"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0717D631_676D_41e7_92AE_A27F7DFCCAC3" source="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_510F8DDB_DB12_48df_92AE_A27F7DFCCAC3">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_676D_41e7_92AE_A27F7DFCCAC3" text="+epo:hasProcurementHighestReceivedTenderValue" modelElement="EAID_dst0F8DDB_DB12_48df_92AE_A27F7DFCCAC3">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_92AE_A27F7DFCCAC3" x="422" y="127" width="206" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_92AE_A27F7DFCCAC3" x="422" y="128" width="206" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_676D_41e7_92AE_A27F7DFCCAC3" text="0..1" modelElement="EAID_dst0F8DDB_DB12_48df_92AE_A27F7DFCCAC3">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_92AE_A27F7DFCCAC3" x="634" y="150" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_92AE_A27F7DFCCAC3" x="634" y="151" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_92AE_A27F7DFCCAC3" x="373" y="145"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_92AE_A27F7DFCCAC3" x="653" y="145"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_92AE_A27F7DFCCAC3" x="373" y="146"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_92AE_A27F7DFCCAC3" x="653" y="146"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0717D631_676D_41e7_94BC_1C90816E0487" source="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_96BA801A_E8C8_4628_94BC_1C90816E0487">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_676D_41e7_94BC_1C90816E0487" text="+epo:concernsLot" modelElement="EAID_dstBA801A_E8C8_4628_94BC_1C90816E0487">
@@ -7942,23 +8358,23 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0717D631_676D_41e7_8D8A_71BD69D25161" source="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_1E87247C_598C_4f96_8D8A_71BD69D25161">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_676D_41e7_8D8A_71BD69D25161" text="+epo:hasFrameworkAgreementMaximumValue" modelElement="EAID_dst87247C_598C_4f96_8D8A_71BD69D25161">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_8D8A_71BD69D25161" x="714" y="316" width="193" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_8D8A_71BD69D25161" x="746" y="323" width="193" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_676D_41e7_8D8A_71BD69D25161" text="0..1" modelElement="EAID_dst87247C_598C_4f96_8D8A_71BD69D25161">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_8D8A_71BD69D25161" x="823" y="280" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_8D8A_71BD69D25161" x="823" y="300" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_8D8A_71BD69D25161" x="811" y="363"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_8D8A_71BD69D25161" x="811" y="275"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_8D8A_71BD69D25161" x="811" y="295"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0717D631_676D_41e7_93CA_CC7ACC63568D" source="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" target="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" modelElement="EAID_4B36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_676D_41e7_93CA_CC7ACC63568D" text="+epo:describesLotGroup" modelElement="EAID_dst36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_93CA_CC7ACC63568D" x="223" y="362" width="97" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_93CA_CC7ACC63568D" x="224" y="362" width="97" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_676D_41e7_93CA_CC7ACC63568D" text="1" modelElement="EAID_dst36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_93CA_CC7ACC63568D" x="280" y="377" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_93CA_CC7ACC63568D" x="281" y="377" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_93CA_CC7ACC63568D" x="272" y="219"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_93CA_CC7ACC63568D" x="272" y="395"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_93CA_CC7ACC63568D" x="273" y="219"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_93CA_CC7ACC63568D" x="273" y="395"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0717D631_676D_41e7_9BBA_3C0E1D4E25A8" source="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" target="EAID_E7437025_771F_4143_BE33_620A29646687" modelElement="EAID_36C907D3_6701_4489_9BBA_3C0E1D4E25A8">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_9BBA_3C0E1D4E25A8" x="726" y="528"/>
@@ -7977,25 +8393,25 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0717D631_676D_41e7_9E66_5EBEFD7759BC" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_676D_41e7_9E66_5EBEFD7759BC" text="+epo:hasLaunchFrameworkAgreementMaximumValue" modelElement="EAID_dstC50180_5437_4a3f_9E66_5EBEFD7759BC">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_9E66_5EBEFD7759BC" x="401" y="221" width="221" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_9E66_5EBEFD7759BC" x="401" y="244" width="221" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_676D_41e7_9E66_5EBEFD7759BC" text="0..1" modelElement="EAID_dstC50180_5437_4a3f_9E66_5EBEFD7759BC">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_9E66_5EBEFD7759BC" x="634" y="243" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_9E66_5EBEFD7759BC" x="634" y="266" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_9E66_5EBEFD7759BC" x="361" y="395"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_9E66_5EBEFD7759BC" x="361" y="238"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_676D_41e7_9E66_5EBEFD7759BC" x="653" y="238"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_9E66_5EBEFD7759BC" x="361" y="261"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_676D_41e7_9E66_5EBEFD7759BC" x="653" y="261"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0717D631_676D_41e7_8F62_2FA41A99DF74" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_72A7614C_D179_4558_8F62_2FA41A99DF74">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_676D_41e7_8F62_2FA41A99DF74" text="+epo:hasEstimatedValue" modelElement="EAID_dstA7614C_D179_4558_8F62_2FA41A99DF74">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_8F62_2FA41A99DF74" x="511" y="195" width="101" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_8F62_2FA41A99DF74" x="511" y="220" width="101" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_676D_41e7_8F62_2FA41A99DF74" text="0..1" modelElement="EAID_dstA7614C_D179_4558_8F62_2FA41A99DF74">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_8F62_2FA41A99DF74" x="634" y="216" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_8F62_2FA41A99DF74" x="634" y="241" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_8F62_2FA41A99DF74" x="347" y="395"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_8F62_2FA41A99DF74" x="347" y="211"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_676D_41e7_8F62_2FA41A99DF74" x="653" y="211"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_8F62_2FA41A99DF74" x="349" y="395"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_8F62_2FA41A99DF74" x="349" y="236"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_676D_41e7_8F62_2FA41A99DF74" x="653" y="236"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0717D631_676D_41e7_BFE6_593632EDB11F" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_20732599_332F_4f0e_BFE6_593632EDB11F">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_676D_41e7_BFE6_593632EDB11F" text="+epo:setsGroupingContextForLot" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
@@ -8004,7 +8420,7 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_676D_41e7_BFE6_593632EDB11F" text="1..*" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_BFE6_593632EDB11F" x="774" y="673" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_BFE6_593632EDB11F" x="263" y="457"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_BFE6_593632EDB11F" x="263" y="470"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_BFE6_593632EDB11F" x="263" y="668"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_676D_41e7_BFE6_593632EDB11F" x="793" y="668"/>
 			</ownedElement>
@@ -8020,13 +8436,13 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0717D631_676D_41e7_9C45_B9A2F9CBFE43" source="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B" target="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" modelElement="EAID_00497249_92E0_435e_9C45_B9A2F9CBFE43">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_676D_41e7_9C45_B9A2F9CBFE43" text="+epo:concernsTender" modelElement="EAID_dst497249_92E0_435e_9C45_B9A2F9CBFE43">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_9C45_B9A2F9CBFE43" x="1193" y="580" width="87" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_9C45_B9A2F9CBFE43" x="1193" y="581" width="87" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_676D_41e7_9C45_B9A2F9CBFE43" text="1" modelElement="EAID_dst497249_92E0_435e_9C45_B9A2F9CBFE43">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_9C45_B9A2F9CBFE43" x="1249" y="606" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_9C45_B9A2F9CBFE43" x="1249" y="607" width="6" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_9C45_B9A2F9CBFE43" x="1241" y="474"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_9C45_B9A2F9CBFE43" x="1241" y="624"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_9C45_B9A2F9CBFE43" x="1241" y="625"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0717D631_676D_41e7_B11C_CBD651205C58" source="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" target="EAID_E7437025_771F_4143_BE33_620A29646687" modelElement="EAID_CF215D61_0282_4111_B11C_CBD651205C58">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_676D_41e7_B11C_CBD651205C58" text="+epo:comprisesAwardOutcome" modelElement="EAID_dst215D61_0282_4111_B11C_CBD651205C58">
@@ -8040,14 +8456,14 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0717D631_676D_41e7_BB1A_167306D6B16C" source="EAID_E7437025_771F_4143_BE33_620A29646687" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_D257E7B8_BA32_4888_BB1A_167306D6B16C">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_676D_41e7_BB1A_167306D6B16C" text="+epo:hasBargainPrice" modelElement="EAID_dst57E7B8_BA32_4888_BB1A_167306D6B16C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_BB1A_167306D6B16C" x="531" y="248" width="87" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_BB1A_167306D6B16C" x="535" y="270" width="87" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_676D_41e7_BB1A_167306D6B16C" text="0..1" modelElement="EAID_dst57E7B8_BA32_4888_BB1A_167306D6B16C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_BB1A_167306D6B16C" x="634" y="272" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_BB1A_167306D6B16C" x="634" y="289" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_BB1A_167306D6B16C" x="484" y="367"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_BB1A_167306D6B16C" x="484" y="267"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_676D_41e7_BB1A_167306D6B16C" x="653" y="267"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_BB1A_167306D6B16C" x="482" y="367"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_BB1A_167306D6B16C" x="482" y="284"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_676D_41e7_BB1A_167306D6B16C" x="653" y="284"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0717D631_676D_41e7_83E6_3CAF530D5403" source="EAID_E7437025_771F_4143_BE33_620A29646687" target="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B" modelElement="EAID_AF4C01E9_6CF5_410f_83E6_3CAF530D5403">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_676D_41e7_83E6_3CAF530D5403" text="+epo:comprisesTenderAwardOutcome" modelElement="EAID_dst4C01E9_6CF5_410f_83E6_3CAF530D5403">
@@ -8061,24 +8477,24 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0717D631_676D_41e7_82EA_14ABA20458B6" source="EAID_E7437025_771F_4143_BE33_620A29646687" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_547A511C_F377_4405_82EA_14ABA20458B6">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_676D_41e7_82EA_14ABA20458B6" text="+epo:hasAwardedValue" modelElement="EAID_dst7A511C_F377_4405_82EA_14ABA20458B6">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_82EA_14ABA20458B6" x="647" y="301" width="97" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_82EA_14ABA20458B6" x="647" y="321" width="97" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_676D_41e7_82EA_14ABA20458B6" text="0..1" modelElement="EAID_dst7A511C_F377_4405_82EA_14ABA20458B6">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_82EA_14ABA20458B6" x="716" y="280" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_82EA_14ABA20458B6" x="716" y="300" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_82EA_14ABA20458B6" x="544" y="374"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_82EA_14ABA20458B6" x="704" y="374"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_676D_41e7_82EA_14ABA20458B6" x="704" y="275"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_676D_41e7_82EA_14ABA20458B6" x="704" y="295"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0717D631_676D_41e7_A6DC_62DFC84C122D" source="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_8E7619CE_95A4_4f77_A6DC_62DFC84C122D">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_676D_41e7_A6DC_62DFC84C122D" text="+epo:hasApproximateFrameworkAgreementValue" modelElement="EAID_dst7619CE_95A4_4f77_A6DC_62DFC84C122D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_A6DC_62DFC84C122D" x="852" y="333" width="203" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_A6DC_62DFC84C122D" x="869" y="347" width="203" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_676D_41e7_A6DC_62DFC84C122D" text="0..1" modelElement="EAID_dst7619CE_95A4_4f77_A6DC_62DFC84C122D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_A6DC_62DFC84C122D" x="961" y="280" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_A6DC_62DFC84C122D" x="961" y="300" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_A6DC_62DFC84C122D" x="949" y="363"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_A6DC_62DFC84C122D" x="949" y="275"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_A6DC_62DFC84C122D" x="949" y="295"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_C31DC6F6_AFC8_4f2d_A78D_1C226568295B" isFrame="false" modelElement="EAPK_4200ABB9_EB75_4f04_8F9A_4D873BD27C72">
@@ -8269,7 +8685,7 @@
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_B023DE7D_2242_4a87_8ED4_8DCE14AD388C" isFrame="false" modelElement="EAPK_73E8F652_9D0B_4be2_A5D2_5EC0D734782C">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B023DE7D_2242_4a87_BF42_2A6E50CAF4E6" modelElement="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2242_4a87_BF42_2A6E50CAF4E6" text="epo:LotGroup"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2242_4a87_BF42_2A6E50CAF4E6" x="1009" y="302" width="171" height="61"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2242_4a87_BF42_2A6E50CAF4E6" x="1004" y="296" width="179" height="75"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B023DE7D_2242_4a87_AC62_FA4769B4D88C" modelElement="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2242_4a87_AC62_FA4769B4D88C" text="epo:Lot"/>
@@ -8305,17 +8721,17 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B023DE7D_2242_4a87_AD7B_7484B8FDA398" modelElement="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2242_4a87_AD7B_7484B8FDA398" text="adms:Identifier"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2242_4a87_AD7B_7484B8FDA398" x="991" y="73" width="207" height="88"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2242_4a87_AD7B_7484B8FDA398" x="990" y="73" width="207" height="88"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B023DE7D_2242_4a87_8017_204CCE05A2CC" source="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_EC04B8A5_6281_4f14_8017_204CCE05A2CC">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2242_4a87_8017_204CCE05A2CC" text="+adms:identifier" modelElement="EAID_dst04B8A5_6281_4f14_8017_204CCE05A2CC">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2242_4a87_8017_204CCE05A2CC" x="954" y="196" width="66" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2242_4a87_8017_204CCE05A2CC" x="953" y="196" width="66" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2242_4a87_8017_204CCE05A2CC" text="0..1" modelElement="EAID_dst04B8A5_6281_4f14_8017_204CCE05A2CC">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2242_4a87_8017_204CCE05A2CC" x="1010" y="165" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2242_4a87_8017_204CCE05A2CC" x="1009" y="165" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2242_4a87_8017_204CCE05A2CC" x="939" y="320"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2242_4a87_8017_204CCE05A2CC" x="1012" y="161"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2242_4a87_8017_204CCE05A2CC" x="1011" y="161"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B023DE7D_2242_4a87_A1C6_F384FEC304AE" source="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" target="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" modelElement="EAID_AB768772_FAC4_4353_A1C6_F384FEC304AE">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2242_4a87_A1C6_F384FEC304AE" x="502" y="270"/>
@@ -8323,23 +8739,23 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B023DE7D_2242_4a87_95E2_ACDA293AE181" source="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_6F3635F3_387D_467a_95E2_ACDA293AE181">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2242_4a87_95E2_ACDA293AE181" text="+epo:hasInternalIdentifier" modelElement="EAID_dst3635F3_387D_467a_95E2_ACDA293AE181">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2242_4a87_95E2_ACDA293AE181" x="884" y="120" width="105" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2242_4a87_95E2_ACDA293AE181" x="883" y="120" width="105" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2242_4a87_95E2_ACDA293AE181" text="0..*" modelElement="EAID_dst3635F3_387D_467a_95E2_ACDA293AE181">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2242_4a87_95E2_ACDA293AE181" x="972" y="143" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2242_4a87_95E2_ACDA293AE181" x="971" y="143" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2242_4a87_95E2_ACDA293AE181" x="750" y="138"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2242_4a87_95E2_ACDA293AE181" x="991" y="138"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2242_4a87_95E2_ACDA293AE181" x="990" y="138"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B023DE7D_2242_4a87_A0EF_B68899832EE8" source="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_95FB9493_C207_456a_A0EF_B68899832EE8">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2242_4a87_A0EF_B68899832EE8" text="+adms:identifier" modelElement="EAID_dstFB9493_C207_456a_A0EF_B68899832EE8">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2242_4a87_A0EF_B68899832EE8" x="923" y="78" width="66" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2242_4a87_A0EF_B68899832EE8" x="922" y="78" width="66" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2242_4a87_A0EF_B68899832EE8" text="1" modelElement="EAID_dstFB9493_C207_456a_A0EF_B68899832EE8">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2242_4a87_A0EF_B68899832EE8" x="983" y="101" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2242_4a87_A0EF_B68899832EE8" x="982" y="101" width="6" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2242_4a87_A0EF_B68899832EE8" x="750" y="96"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2242_4a87_A0EF_B68899832EE8" x="991" y="96"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2242_4a87_A0EF_B68899832EE8" x="990" y="96"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B023DE7D_2242_4a87_9664_258E887283AF" source="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" target="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" modelElement="EAID_71953D29_84AD_4774_9664_258E887283AF">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2242_4a87_9664_258E887283AF" x="802" y="315"/>
@@ -8378,23 +8794,23 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B023DE7D_2242_4a87_8467_9DDA71E8D534" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_608CC8C6_3A48_4541_8467_9DDA71E8D534">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2242_4a87_8467_9DDA71E8D534" text="+adms:identifier" modelElement="EAID_dst8CC8C6_3A48_4541_8467_9DDA71E8D534">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2242_4a87_8467_9DDA71E8D534" x="1024" y="215" width="66" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2242_4a87_8467_9DDA71E8D534" x="1023" y="215" width="66" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2242_4a87_8467_9DDA71E8D534" text="0..1" modelElement="EAID_dst8CC8C6_3A48_4541_8467_9DDA71E8D534">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2242_4a87_8467_9DDA71E8D534" x="1065" y="166" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2242_4a87_8467_9DDA71E8D534" x="1064" y="166" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2242_4a87_8467_9DDA71E8D534" x="1053" y="302"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2242_4a87_8467_9DDA71E8D534" x="1053" y="161"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2242_4a87_8467_9DDA71E8D534" x="1052" y="296"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2242_4a87_8467_9DDA71E8D534" x="1052" y="161"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B023DE7D_2242_4a87_AEBA_EA277D05F7E8" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_55771AD3_C775_4324_AEBA_EA277D05F7E8">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2242_4a87_AEBA_EA277D05F7E8" text="+epo:hasInternalIdentifier" modelElement="EAID_dst771AD3_C775_4324_AEBA_EA277D05F7E8">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2242_4a87_AEBA_EA277D05F7E8" x="1076" y="185" width="105" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2242_4a87_AEBA_EA277D05F7E8" x="1075" y="185" width="105" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2242_4a87_AEBA_EA277D05F7E8" text="0..*" modelElement="EAID_dst771AD3_C775_4324_AEBA_EA277D05F7E8">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2242_4a87_AEBA_EA277D05F7E8" x="1137" y="166" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2242_4a87_AEBA_EA277D05F7E8" x="1136" y="166" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2242_4a87_AEBA_EA277D05F7E8" x="1125" y="302"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2242_4a87_AEBA_EA277D05F7E8" x="1125" y="161"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2242_4a87_AEBA_EA277D05F7E8" x="1124" y="296"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2242_4a87_AEBA_EA277D05F7E8" x="1124" y="161"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_1F377807_9517_4c3c_A2B6_E0A40232AB6F" isFrame="false" modelElement="EAPK_73E8F652_9D0B_4be2_A5D2_5EC0D734782C">
@@ -8805,6 +9221,17 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_878A_8035A42A43F9" x="428" y="548"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DF_4150_878A_8035A42A43F9" x="428" y="680"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_B3C3_6654ABB348DF" source="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DF_4150_B3C3_6654ABB348DF" text="+epo:refersToLot" modelElement="EAID_dstB9978D_8D66_48ab_B3C3_6654ABB348DF">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DF_4150_B3C3_6654ABB348DF" x="1778" y="389" width="69" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DF_4150_B3C3_6654ABB348DF" text="1..*" modelElement="EAID_dstB9978D_8D66_48ab_B3C3_6654ABB348DF">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DF_4150_B3C3_6654ABB348DF" x="1813" y="413" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_B3C3_6654ABB348DF" x="1032" y="134"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_B3C3_6654ABB348DF" x="1805" y="134"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DF_4150_B3C3_6654ABB348DF" x="1805" y="431"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_8F66_FA023FA190E7" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DF_4150_8F66_FA023FA190E7" text="+epo:hasLotReference" modelElement="EAID_dstCFA3D8_50E1_40f7_8F66_FA023FA190E7">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DF_4150_8F66_FA023FA190E7" x="1625" y="665" width="90" height="14"/>
@@ -8863,16 +9290,15 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_9939_FA613CEB5D22" x="628" y="573"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DF_4150_9939_FA613CEB5D22" x="628" y="687"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_B3C3_6654ABB348DF" source="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DF_4150_B3C3_6654ABB348DF" text="+epo:refersToLot" modelElement="EAID_dstB9978D_8D66_48ab_B3C3_6654ABB348DF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DF_4150_B3C3_6654ABB348DF" x="1778" y="389" width="69" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_8A9A_9A4173CBD283" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_3EC00346_DC8E_4fd4_8A9A_9A4173CBD283">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DF_4150_8A9A_9A4173CBD283" text="+epo:bindsBuyer" modelElement="EAID_dstC00346_DC8E_4fd4_8A9A_9A4173CBD283">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DF_4150_8A9A_9A4173CBD283" x="282" y="797" width="68" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DF_4150_B3C3_6654ABB348DF" text="1..*" modelElement="EAID_dstB9978D_8D66_48ab_B3C3_6654ABB348DF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DF_4150_B3C3_6654ABB348DF" x="1813" y="413" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DF_4150_8A9A_9A4173CBD283" text="0..*" modelElement="EAID_dstC00346_DC8E_4fd4_8A9A_9A4173CBD283">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DF_4150_8A9A_9A4173CBD283" x="334" y="770" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_B3C3_6654ABB348DF" x="1032" y="134"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_B3C3_6654ABB348DF" x="1805" y="134"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DF_4150_B3C3_6654ABB348DF" x="1805" y="431"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_8A9A_9A4173CBD283" x="322" y="836"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_8A9A_9A4173CBD283" x="322" y="765"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_AB2B_CBE8A5D24AC5" source="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" target="EAID_49EC0F16_408C_4b28_B611_0048946DC070" modelElement="EAID_28460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DF_4150_AB2B_CBE8A5D24AC5" text="+epo:isExecutedByProcurementServiceProvider" modelElement="EAID_dst460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
@@ -8943,16 +9369,15 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_A8A7_C0037581B6D3" x="916" y="348"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DF_4150_A8A7_C0037581B6D3" x="1544" y="348"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_94BC_1C90816E0487" source="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_96BA801A_E8C8_4628_94BC_1C90816E0487">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DF_4150_94BC_1C90816E0487" text="+epo:concernsLot" modelElement="EAID_dstBA801A_E8C8_4628_94BC_1C90816E0487">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DF_4150_94BC_1C90816E0487" x="1863" y="429" width="71" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_B087_27A619B6C819" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_FC7073E1_3362_472f_B087_27A619B6C819">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DF_4150_B087_27A619B6C819" text="+epo:specifiesProcurementCriterion" modelElement="EAID_dst7073E1_3362_472f_B087_27A619B6C819">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DF_4150_B087_27A619B6C819" x="2174" y="550" width="142" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DF_4150_94BC_1C90816E0487" text="1" modelElement="EAID_dstBA801A_E8C8_4628_94BC_1C90816E0487">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DF_4150_94BC_1C90816E0487" x="1845" y="453" width="6" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DF_4150_B087_27A619B6C819" text="0..*" modelElement="EAID_dst7073E1_3362_472f_B087_27A619B6C819">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DF_4150_B087_27A619B6C819" x="2235" y="531" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_94BC_1C90816E0487" x="2032" y="384"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_94BC_1C90816E0487" x="2032" y="448"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DF_4150_94BC_1C90816E0487" x="1842" y="448"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_B087_27A619B6C819" x="2223" y="628"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_B087_27A619B6C819" x="2223" y="526"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_AB11_165E12CB38A6" source="EAID_49EC0F16_408C_4b28_B611_0048946DC070" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_4714A192_0DFA_49f4_AB11_165E12CB38A6">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DF_4150_AB11_165E12CB38A6" text="+epo:actsOnBehalfOf" modelElement="EAID_dst14A192_0DFA_49f4_AB11_165E12CB38A6">
@@ -9038,25 +9463,31 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_A5D7_18A876BF10CF" x="463" y="941"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_A5D7_18A876BF10CF" x="2084" y="941"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_B087_27A619B6C819" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_FC7073E1_3362_472f_B087_27A619B6C819">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DF_4150_B087_27A619B6C819" text="+epo:specifiesProcurementCriterion" modelElement="EAID_dst7073E1_3362_472f_B087_27A619B6C819">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DF_4150_B087_27A619B6C819" x="2174" y="550" width="142" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_BFE6_593632EDB11F" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_20732599_332F_4f0e_BFE6_593632EDB11F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DF_4150_BFE6_593632EDB11F" text="+epo:setsGroupingContextForLot" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DF_4150_BFE6_593632EDB11F" x="1868" y="548" width="131" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DF_4150_B087_27A619B6C819" text="0..*" modelElement="EAID_dst7073E1_3362_472f_B087_27A619B6C819">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DF_4150_B087_27A619B6C819" x="2235" y="531" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DF_4150_BFE6_593632EDB11F" text="1..*" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DF_4150_BFE6_593632EDB11F" x="1845" y="569" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_B087_27A619B6C819" x="2223" y="628"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_B087_27A619B6C819" x="2223" y="526"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_BFE6_593632EDB11F" x="2174" y="628"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_BFE6_593632EDB11F" x="2174" y="564"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DF_4150_BFE6_593632EDB11F" x="1842" y="564"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_8A9A_9A4173CBD283" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_3EC00346_DC8E_4fd4_8A9A_9A4173CBD283">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DF_4150_8A9A_9A4173CBD283" text="+epo:bindsBuyer" modelElement="EAID_dstC00346_DC8E_4fd4_8A9A_9A4173CBD283">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DF_4150_8A9A_9A4173CBD283" x="282" y="797" width="68" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_8CA6_9C68826B377B" source="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C" target="EAID_70B4792E_F818_45db_80A4_32F092496FEF" modelElement="EAID_84F5E9DD_96DE_4ca7_8CA6_9C68826B377B">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_8CA6_9C68826B377B" x="514" y="518"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_8CA6_9C68826B377B" x="514" y="548"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_94BC_1C90816E0487" source="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_96BA801A_E8C8_4628_94BC_1C90816E0487">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DF_4150_94BC_1C90816E0487" text="+epo:concernsLot" modelElement="EAID_dstBA801A_E8C8_4628_94BC_1C90816E0487">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DF_4150_94BC_1C90816E0487" x="1863" y="429" width="71" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DF_4150_8A9A_9A4173CBD283" text="0..*" modelElement="EAID_dstC00346_DC8E_4fd4_8A9A_9A4173CBD283">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DF_4150_8A9A_9A4173CBD283" x="334" y="770" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DF_4150_94BC_1C90816E0487" text="1" modelElement="EAID_dstBA801A_E8C8_4628_94BC_1C90816E0487">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DF_4150_94BC_1C90816E0487" x="1845" y="453" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_8A9A_9A4173CBD283" x="322" y="836"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_8A9A_9A4173CBD283" x="322" y="765"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_94BC_1C90816E0487" x="2032" y="384"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_94BC_1C90816E0487" x="2032" y="448"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DF_4150_94BC_1C90816E0487" x="1842" y="448"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_B380_6FDE59360DAF" source="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_34156914_725C_4a26_B380_6FDE59360DAF">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DF_4150_B380_6FDE59360DAF" text="+epo:refersToPreviousProcedureLot" modelElement="EAID_dst156914_725C_4a26_B380_6FDE59360DAF">
@@ -9108,20 +9539,15 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_9190_197D4A4F4C63" x="1641" y="207"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DF_4150_9190_197D4A4F4C63" x="1354" y="207"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_8CA6_9C68826B377B" source="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C" target="EAID_70B4792E_F818_45db_80A4_32F092496FEF" modelElement="EAID_84F5E9DD_96DE_4ca7_8CA6_9C68826B377B">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_8CA6_9C68826B377B" x="514" y="518"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_8CA6_9C68826B377B" x="514" y="548"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_BFE6_593632EDB11F" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_20732599_332F_4f0e_BFE6_593632EDB11F">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DF_4150_BFE6_593632EDB11F" text="+epo:setsGroupingContextForLot" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DF_4150_BFE6_593632EDB11F" x="1868" y="548" width="131" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_A94B_6552B0F5A59A" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_505234FB_4CE0_475f_A94B_6552B0F5A59A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DF_4150_A94B_6552B0F5A59A" text="+epo:isSubjectToLotSpecificTerm" modelElement="EAID_dst5234FB_4CE0_475f_A94B_6552B0F5A59A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DF_4150_A94B_6552B0F5A59A" x="2060" y="717" width="287" height="15"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DF_4150_BFE6_593632EDB11F" text="1..*" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DF_4150_BFE6_593632EDB11F" x="1845" y="569" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DF_4150_A94B_6552B0F5A59A" text="0..*" modelElement="EAID_dst5234FB_4CE0_475f_A94B_6552B0F5A59A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DF_4150_A94B_6552B0F5A59A" x="2060" y="740" width="287" height="15"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_BFE6_593632EDB11F" x="2174" y="628"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_BFE6_593632EDB11F" x="2174" y="564"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DF_4150_BFE6_593632EDB11F" x="1842" y="564"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_A94B_6552B0F5A59A" x="2149" y="697"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_A94B_6552B0F5A59A" x="2057" y="735"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_67528027_031E_41eb_BD84_3064F9C119CE" isFrame="false" modelElement="EAPK_E1382CA6_03C9_4d3d_8C1D_A9BA47C27626">
@@ -9557,7 +9983,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A6162271_FBBA_470d_82ED_0BAA7D433501" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_29678A10_6473_461a_BE84_76269B5BBD68" modelElement="EAID_9F23612C_1865_4c8b_82ED_0BAA7D433501">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_FBBA_470d_82ED_0BAA7D433501" text="+locn:address" modelElement="EAID_dst23612C_1865_4c8b_82ED_0BAA7D433501">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FBBA_470d_82ED_0BAA7D433501" x="405" y="369" width="32" height="27"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FBBA_470d_82ED_0BAA7D433501" x="388" y="369" width="56" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_FBBA_470d_82ED_0BAA7D433501" text="0..*" modelElement="EAID_dst23612C_1865_4c8b_82ED_0BAA7D433501">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FBBA_470d_82ED_0BAA7D433501" x="444" y="392" width="17" height="14"/>
@@ -9660,7 +10086,7 @@
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FBBA_470d_A7B8_F5FEC69BBDA5" x="677" y="102" width="143" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_FBBA_470d_A7B8_F5FEC69BBDA5" text="0..*" modelElement="EAID_dst812517_A9DA_432d_A7B8_F5FEC69BBDA5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FBBA_470d_A7B8_F5FEC69BBDA5" x="665" y="125" width="100" height="10"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FBBA_470d_A7B8_F5FEC69BBDA5" x="665" y="125" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FBBA_470d_A7B8_F5FEC69BBDA5" x="1044" y="120"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FBBA_470d_A7B8_F5FEC69BBDA5" x="662" y="120"/>
@@ -9682,7 +10108,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A6162271_FBBA_470d_BD17_379180274988" source="EAID_33E9269C_0B96_4b38_A129_C30771A9833F" target="EAID_29678A10_6473_461a_BE84_76269B5BBD68" modelElement="EAID_A4228FCF_2B3C_44e6_BD17_379180274988">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_FBBA_470d_BD17_379180274988" text="+locn:address" modelElement="EAID_dst228FCF_2B3C_44e6_BD17_379180274988">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FBBA_470d_BD17_379180274988" x="531" y="273" width="32" height="27"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FBBA_470d_BD17_379180274988" x="534" y="279" width="56" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_FBBA_470d_BD17_379180274988" text="0..1" modelElement="EAID_dst228FCF_2B3C_44e6_BD17_379180274988">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FBBA_470d_BD17_379180274988" x="571" y="293" width="17" height="14"/>
@@ -9959,11 +10385,11 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_CD5F6935_1F48_4857_9491_D5301EE0DDE7" modelElement="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1F48_4857_9491_D5301EE0DDE7" text="epo:Subcontractor"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1F48_4857_9491_D5301EE0DDE7" x="1821" y="1054" width="96" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1F48_4857_9491_D5301EE0DDE7" x="1711" y="1020" width="96" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_CD5F6935_1F48_4857_84A7_67A71EAC64C6" modelElement="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1F48_4857_84A7_67A71EAC64C6" text="epo:CatalogueProvider"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1F48_4857_84A7_67A71EAC64C6" x="1395" y="1088" width="113" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1F48_4857_84A7_67A71EAC64C6" x="1416" y="1055" width="113" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_CD5F6935_1F48_4857_97BB_07EBCE11D45C" modelElement="EAID_A312F200_1050_451d_97BB_07EBCE11D45C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1F48_4857_97BB_07EBCE11D45C" text="epo:Mediator"/>
@@ -9975,7 +10401,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_CD5F6935_1F48_4857_B795_B4D7DEE0BA53" modelElement="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1F48_4857_B795_B4D7DEE0BA53" text="epo:Tenderer"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1F48_4857_B795_B4D7DEE0BA53" x="1715" y="1132" width="96" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1F48_4857_B795_B4D7DEE0BA53" x="1645" y="1088" width="96" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_CD5F6935_1F48_4857_9A5C_0F684174C4AC" modelElement="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1F48_4857_9A5C_0F684174C4AC" text="epo:CentralPurchasingBody"/>
@@ -10039,7 +10465,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_CD5F6935_1F48_4857_80A3_BA1B8B406A51" modelElement="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1F48_4857_80A3_BA1B8B406A51" text="epo:OtherEntity"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1F48_4857_80A3_BA1B8B406A51" x="1858" y="948" width="96" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1F48_4857_80A3_BA1B8B406A51" x="1771" y="948" width="96" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_CD5F6935_1F48_4857_ACEA_C3F05211F0B3" modelElement="EAID_ABEE1795_5EE6_4f51_ACEA_C3F05211F0B3">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1F48_4857_ACEA_C3F05211F0B3" text="epo:LeadBuyer"/>
@@ -10055,7 +10481,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_CD5F6935_1F48_4857_ADAC_88A2D6017C32" modelElement="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1F48_4857_ADAC_88A2D6017C32" text="epo:Candidate"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1F48_4857_ADAC_88A2D6017C32" x="1561" y="1155" width="96" height="32"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1F48_4857_ADAC_88A2D6017C32" x="1529" y="1108" width="96" height="32"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_CD5F6935_1F48_4857_99E7_B387A7B402A1" modelElement="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1F48_4857_99E7_B387A7B402A1" text="epo:Certifier"/>
@@ -10069,17 +10495,13 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_BE6A_D4FA2FE59843" x="1101" y="900"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_BE6A_D4FA2FE59843" x="1139" y="811"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_B8FD_2F0BC50DFCA9" source="EAID_A312F200_1050_451d_97BB_07EBCE11D45C" target="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" modelElement="EAID_2BD2D4BE_B733_42b0_B8FD_2F0BC50DFCA9">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_B8FD_2F0BC50DFCA9" x="918" y="749"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_B8FD_2F0BC50DFCA9" x="737" y="635"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_BC18_F6B8F5B8635B" source="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_0B89904B_56C2_4154_BC18_F6B8F5B8635B">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_BC18_F6B8F5B8635B" x="1448" y="1088"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_BC18_F6B8F5B8635B" x="1520" y="616"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_BC18_F6B8F5B8635B" x="1469" y="1055"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_BC18_F6B8F5B8635B" x="1522" y="616"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_A43E_D33DC6607852" source="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_A27A53B2_A6D1_4fdd_A43E_D33DC6607852">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_A43E_D33DC6607852" x="1851" y="1054"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_A43E_D33DC6607852" x="1560" y="616"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_A43E_D33DC6607852" x="1744" y="1020"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_A43E_D33DC6607852" x="1557" y="616"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_A7EC_23ACD7626ADE" source="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62" target="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" modelElement="EAID_DE55F8F3_DEA7_4350_A7EC_23ACD7626ADE">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_A7EC_23ACD7626ADE" x="883" y="939"/>
@@ -10089,14 +10511,28 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_8C19_876392639DF8" x="1270" y="1020"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_8C19_876392639DF8" x="1236" y="937"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_A34C_23F9AB59E814" source="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_E4D55FF7_2180_4a21_A34C_23F9AB59E814">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_A34C_23F9AB59E814" x="1697" y="672"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_A34C_23F9AB59E814" x="1576" y="607"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_92B0_4EF65D96A0BA" source="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" target="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" modelElement="EAID_4347709B_D87B_4476_92B0_4EF65D96A0BA">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1F48_4857_92B0_4EF65D96A0BA" text="+epo:hasSubcontractor" modelElement="EAID_dst47709B_D87B_4476_92B0_4EF65D96A0BA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1F48_4857_92B0_4EF65D96A0BA" x="1666" y="1002" width="287" height="15"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1F48_4857_92B0_4EF65D96A0BA" text="0..1" modelElement="EAID_dst47709B_D87B_4476_92B0_4EF65D96A0BA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1F48_4857_92B0_4EF65D96A0BA" x="1774" y="1002" width="287" height="15"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_92B0_4EF65D96A0BA" x="1826" y="873"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_92B0_4EF65D96A0BA" x="1766" y="1020"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_9F94_6783892A6027" source="EAID_B4F30642_373D_4195_B1E6_10198F138ED8" target="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" modelElement="EAID_9506F37E_A7C5_4da0_9F94_6783892A6027">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_9F94_6783892A6027" x="812" y="1013"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_9F94_6783892A6027" x="716" y="635"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_A409_64CB2CE61248" source="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_199C3BDF_913A_42e4_A409_64CB2CE61248">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_A409_64CB2CE61248" x="1756" y="1132"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_A409_64CB2CE61248" x="1688" y="1088"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_A409_64CB2CE61248" x="1550" y="616"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_8ACE_0CBB68152882" source="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_F705DF6C_1870_4735_8ACE_0CBB68152882">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_8ACE_0CBB68152882" x="1215" y="902"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_8ACE_0CBB68152882" x="1167" y="811"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_AB83_DA8166C24C14" source="EAID_4E7C30BC_ABE6_4736_8E07_54ED87CB1179" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_7B0A44E0_63E1_4c30_AB83_DA8166C24C14">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_AB83_DA8166C24C14" x="1365" y="948"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_AB83_DA8166C24C14" x="1508" y="616"/>
@@ -10121,24 +10557,30 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_947D_E6C47AAC7527" x="1529" y="546"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_947D_E6C47AAC7527" x="1530" y="363"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_A34C_23F9AB59E814" source="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_E4D55FF7_2180_4a21_A34C_23F9AB59E814">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_A34C_23F9AB59E814" x="1697" y="672"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_A34C_23F9AB59E814" x="1576" y="607"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_88E6_F386741960D6" source="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" target="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" modelElement="EAID_9E5B53CF_762F_4436_88E6_F386741960D6">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1F48_4857_88E6_F386741960D6" text="+epo:foreseesSubcontractor" modelElement="EAID_dst5B53CF_762F_4436_88E6_F386741960D6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1F48_4857_88E6_F386741960D6" x="1646" y="1002" width="287" height="15"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1F48_4857_88E6_F386741960D6" text="0..1" modelElement="EAID_dst5B53CF_762F_4436_88E6_F386741960D6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1F48_4857_88E6_F386741960D6" x="1774" y="1002" width="287" height="15"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_88E6_F386741960D6" x="1826" y="873"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_88E6_F386741960D6" x="1766" y="1020"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_913E_EAEE25BEEAD8" source="EAID_CADD27F3_86EF_483f_A036_7DF4251EE09C" target="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5" modelElement="EAID_0F5296C9_3949_4cbc_913E_EAEE25BEEAD8">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_913E_EAEE25BEEAD8" x="1838" y="741"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_913E_EAEE25BEEAD8" x="1967" y="616"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_9BF3_BDFF0776A54C" source="EAID_C0F5DE45_CA08_46dd_AD44_E7EF577A809D" target="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" modelElement="EAID_800B935D_1C60_427e_9BF3_BDFF0776A54C">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_9BF3_BDFF0776A54C" x="302" y="1154"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_9BF3_BDFF0776A54C" x="685" y="635"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_BF7D_068AAD2C5033" source="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1" target="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5" modelElement="EAID_10602E2D_EE49_4483_BF7D_068AAD2C5033">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_BF7D_068AAD2C5033" x="2251" y="659"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_BF7D_068AAD2C5033" x="2043" y="594"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_AEF4_9EBDE5851B98" source="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_5729A98B_A925_4816_AEF4_9EBDE5851B98">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_AEF4_9EBDE5851B98" x="1884" y="948"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_AEF4_9EBDE5851B98" x="1802" y="948"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_AEF4_9EBDE5851B98" x="1568" y="616"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_B47E_F671B4F00F63" source="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_28774B07_2278_44a1_B47E_F671B4F00F63">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_B47E_F671B4F00F63" x="1600" y="1155"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_B47E_F671B4F00F63" x="1568" y="1108"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_B47E_F671B4F00F63" x="1539" y="616"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_AE88_A4F91623D21B" source="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5" target="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" modelElement="EAID_AE2DB18B_3AF3_4133_AE88_A4F91623D21B">
@@ -10157,22 +10599,22 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_8D62_CB3A9307E408" x="165" y="764"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_8D62_CB3A9307E408" x="664" y="613"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_9F94_6783892A6027" source="EAID_B4F30642_373D_4195_B1E6_10198F138ED8" target="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" modelElement="EAID_9506F37E_A7C5_4da0_9F94_6783892A6027">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_9F94_6783892A6027" x="812" y="1013"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_9F94_6783892A6027" x="716" y="635"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_8C9C_A94EFF7F2822" source="EAID_DCE733E5_38D7_4e94_A8B8_B385E9A6811B" target="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" modelElement="EAID_DE32781C_3C61_477f_8C9C_A94EFF7F2822">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_8C9C_A94EFF7F2822" x="209" y="818"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_8C9C_A94EFF7F2822" x="664" y="619"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_AC39_5B5D4DC0AF5F" source="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896" target="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" modelElement="EAID_40DE5B33_7251_4616_AC39_5B5D4DC0AF5F">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_AC39_5B5D4DC0AF5F" x="704" y="1055"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_AC39_5B5D4DC0AF5F" x="711" y="635"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_B8FD_2F0BC50DFCA9" source="EAID_A312F200_1050_451d_97BB_07EBCE11D45C" target="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" modelElement="EAID_2BD2D4BE_B733_42b0_B8FD_2F0BC50DFCA9">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_B8FD_2F0BC50DFCA9" x="918" y="749"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_B8FD_2F0BC50DFCA9" x="737" y="635"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_913E_EAEE25BEEAD8" source="EAID_CADD27F3_86EF_483f_A036_7DF4251EE09C" target="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5" modelElement="EAID_0F5296C9_3949_4cbc_913E_EAEE25BEEAD8">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_913E_EAEE25BEEAD8" x="1838" y="741"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_913E_EAEE25BEEAD8" x="1967" y="616"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_9877_03C8FEE30681" source="EAID_C52C2B8E_EBBE_4a9a_A48C_B479107AD49E" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_A641D156_C668_4cc3_9877_03C8FEE30681">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_9877_03C8FEE30681" x="1354" y="801"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_9877_03C8FEE30681" x="1502" y="616"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_9BF3_BDFF0776A54C" source="EAID_C0F5DE45_CA08_46dd_AD44_E7EF577A809D" target="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" modelElement="EAID_800B935D_1C60_427e_9BF3_BDFF0776A54C">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_9BF3_BDFF0776A54C" x="302" y="1154"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_9BF3_BDFF0776A54C" x="685" y="635"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_AE64_07B876CC0919" source="EAID_A958E5F1_29FE_4263_AEBA_5D8644A7677A" target="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" modelElement="EAID_CD10FCBC_3AD7_437f_AE64_07B876CC0919">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_AE64_07B876CC0919" x="142" y="726"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_AE64_07B876CC0919" x="664" y="610"/>
@@ -10201,9 +10643,13 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_8C59_831A976F33D2" x="417" y="1170"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_8C59_831A976F33D2" x="693" y="635"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_8C9C_A94EFF7F2822" source="EAID_DCE733E5_38D7_4e94_A8B8_B385E9A6811B" target="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" modelElement="EAID_DE32781C_3C61_477f_8C9C_A94EFF7F2822">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_8C9C_A94EFF7F2822" x="209" y="818"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_8C9C_A94EFF7F2822" x="664" y="619"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_8ACE_0CBB68152882" source="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_F705DF6C_1870_4735_8ACE_0CBB68152882">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_8ACE_0CBB68152882" x="1215" y="902"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_8ACE_0CBB68152882" x="1167" y="811"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_AC39_5B5D4DC0AF5F" source="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896" target="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" modelElement="EAID_40DE5B33_7251_4616_AC39_5B5D4DC0AF5F">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_AC39_5B5D4DC0AF5F" x="704" y="1055"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_AC39_5B5D4DC0AF5F" x="711" y="635"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_6B773B07_0005_44a3_9D34_B2FE839A6B37" isFrame="false" modelElement="EAPK_92A0CFE1_0DAD_4a19_AE6F_360376AC39EC">
@@ -10484,7 +10930,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_DC637555_D382_4357_A12E_00C2BE16F4B6" modelElement="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D382_4357_A12E_00C2BE16F4B6" text="epo:AgentInRole"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D382_4357_A12E_00C2BE16F4B6" x="184" y="134" width="217" height="78"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D382_4357_A12E_00C2BE16F4B6" x="186" y="17" width="217" height="78"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_DC637555_D382_4357_8DD1_1E65B7299BE7" modelElement="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D382_4357_8DD1_1E65B7299BE7" text="epo:Contractor"/>
@@ -10500,7 +10946,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_DC637555_D382_4357_9491_D5301EE0DDE7" modelElement="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D382_4357_9491_D5301EE0DDE7" text="epo:Subcontractor"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D382_4357_9491_D5301EE0DDE7" x="80" y="314" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D382_4357_9491_D5301EE0DDE7" x="426" y="314" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_DC637555_D382_4357_84A7_67A71EAC64C6" modelElement="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D382_4357_84A7_67A71EAC64C6" text="epo:CatalogueProvider"/>
@@ -10516,7 +10962,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_DC637555_D382_4357_B584_D95C2DBBD7A1" modelElement="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D382_4357_B584_D95C2DBBD7A1" text="foaf:Agent"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D382_4357_B584_D95C2DBBD7A1" x="564" y="131" width="217" height="85"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D382_4357_B584_D95C2DBBD7A1" x="566" y="14" width="217" height="85"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_DC637555_D382_4357_B083_E051F46A909D" modelElement="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D382_4357_B083_E051F46A909D" text="epo:OrganisationGroup"/>
@@ -10528,7 +10974,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_DC637555_D382_4357_ADAC_88A2D6017C32" modelElement="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D382_4357_ADAC_88A2D6017C32" text="epo:Candidate"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D382_4357_ADAC_88A2D6017C32" x="426" y="314" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D382_4357_ADAC_88A2D6017C32" x="80" y="314" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_DC637555_D382_4357_A48C_B479107AD49E" modelElement="EAID_C52C2B8E_EBBE_4a9a_A48C_B479107AD49E">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D382_4357_A48C_B479107AD49E" text="epo:OfferIssuer"/>
@@ -10538,9 +10984,15 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D382_4357_A912_95FF3EA9C6FF" text="epo:Offer"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D382_4357_A912_95FF3EA9C6FF" x="426" y="539" width="90" height="70"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DC637555_D382_4357_A43E_D33DC6607852" source="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_A27A53B2_A6D1_4fdd_A43E_D33DC6607852">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D382_4357_A43E_D33DC6607852" x="170" y="349"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D382_4357_A43E_D33DC6607852" x="247" y="349"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DC637555_D382_4357_92B0_4EF65D96A0BA" source="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" target="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" modelElement="EAID_4347709B_D87B_4476_92B0_4EF65D96A0BA">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_D382_4357_92B0_4EF65D96A0BA" text="+epo:hasSubcontractor" modelElement="EAID_dst47709B_D87B_4476_92B0_4EF65D96A0BA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_D382_4357_92B0_4EF65D96A0BA" x="462" y="418" width="93" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_D382_4357_92B0_4EF65D96A0BA" text="0..1" modelElement="EAID_dst47709B_D87B_4476_92B0_4EF65D96A0BA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_D382_4357_92B0_4EF65D96A0BA" x="511" y="389" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D382_4357_92B0_4EF65D96A0BA" x="499" y="438"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D382_4357_92B0_4EF65D96A0BA" x="499" y="384"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DC637555_D382_4357_B370_202D9A0110E0" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_2FF93267_E672_481d_B370_202D9A0110E0">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_D382_4357_B370_202D9A0110E0" text="+org:subOrganizationOf 0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
@@ -10559,13 +11011,13 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DC637555_D382_4357_BCE2_05E832F758D6" source="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" target="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" modelElement="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_D382_4357_BCE2_05E832F758D6" text="+epo:playedBy" modelElement="EAID_dst9200E2_D732_4a5e_BCE2_05E832F758D6">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_D382_4357_BCE2_05E832F758D6" x="497" y="154" width="61" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_D382_4357_BCE2_05E832F758D6" x="499" y="37" width="61" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_D382_4357_BCE2_05E832F758D6" text="1" modelElement="EAID_dst9200E2_D732_4a5e_BCE2_05E832F758D6">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_D382_4357_BCE2_05E832F758D6" x="556" y="178" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_D382_4357_BCE2_05E832F758D6" x="558" y="61" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D382_4357_BCE2_05E832F758D6" x="401" y="173"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D382_4357_BCE2_05E832F758D6" x="564" y="173"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D382_4357_BCE2_05E832F758D6" x="403" y="56"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D382_4357_BCE2_05E832F758D6" x="566" y="56"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DC637555_D382_4357_BC18_F6B8F5B8635B" source="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_0B89904B_56C2_4154_BC18_F6B8F5B8635B">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D382_4357_BC18_F6B8F5B8635B" x="170" y="439"/>
@@ -10573,7 +11025,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DC637555_D382_4357_947D_E6C47AAC7527" source="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" target="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" modelElement="EAID_4657FAEB_1A34_4ef7_947D_E6C47AAC7527">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D382_4357_947D_E6C47AAC7527" x="288" y="314"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D382_4357_947D_E6C47AAC7527" x="288" y="212"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D382_4357_947D_E6C47AAC7527" x="290" y="95"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DC637555_D382_4357_A409_64CB2CE61248" source="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_199C3BDF_913A_42e4_A409_64CB2CE61248">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D382_4357_A409_64CB2CE61248" x="251" y="438"/>
@@ -10583,13 +11035,31 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D382_4357_A34C_23F9AB59E814" x="336" y="438"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D382_4357_A34C_23F9AB59E814" x="309" y="384"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DC637555_D382_4357_A281_70A523440BFB" source="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_910BFAB5_C09F_48c2_A281_70A523440BFB">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D382_4357_A281_70A523440BFB" x="426" y="444"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D382_4357_A281_70A523440BFB" x="337" y="382"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DC637555_D382_4357_A3E1_A997E86942D2" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" modelElement="EAID_19AD8C15_4D9D_48f2_A3E1_A997E86942D2">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D382_4357_A3E1_A997E86942D2" x="672" y="277"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D382_4357_A3E1_A997E86942D2" x="672" y="216"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D382_4357_A3E1_A997E86942D2" x="678" y="277"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D382_4357_A3E1_A997E86942D2" x="678" y="99"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DC637555_D382_4357_88E6_F386741960D6" source="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" target="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" modelElement="EAID_9E5B53CF_762F_4436_88E6_F386741960D6">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_D382_4357_88E6_F386741960D6" text="+epo:foreseesSubcontractor" modelElement="EAID_dst5B53CF_762F_4436_88E6_F386741960D6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_D382_4357_88E6_F386741960D6" x="381" y="402" width="113" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_D382_4357_88E6_F386741960D6" text="0..1" modelElement="EAID_dst5B53CF_762F_4436_88E6_F386741960D6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_D382_4357_88E6_F386741960D6" x="454" y="389" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D382_4357_88E6_F386741960D6" x="442" y="438"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D382_4357_88E6_F386741960D6" x="442" y="384"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DC637555_D382_4357_B47E_F671B4F00F63" source="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_28774B07_2278_44a1_B47E_F671B4F00F63">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D382_4357_B47E_F671B4F00F63" x="426" y="349"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D382_4357_B47E_F671B4F00F63" x="337" y="349"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D382_4357_B47E_F671B4F00F63" x="170" y="349"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D382_4357_B47E_F671B4F00F63" x="247" y="349"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DC637555_D382_4357_A43E_D33DC6607852" source="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_A27A53B2_A6D1_4fdd_A43E_D33DC6607852">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D382_4357_A43E_D33DC6607852" x="426" y="349"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D382_4357_A43E_D33DC6607852" x="337" y="349"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DC637555_D382_4357_A3EE_819F014FE1AC" source="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_A2F10537_FAE7_4ff3_A3EE_819F014FE1AC">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D382_4357_A3EE_819F014FE1AC" x="681" y="438"/>
@@ -10638,10 +11108,6 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D382_4357_9174_C3DEEEA32848" x="337" y="574"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D382_4357_9174_C3DEEEA32848" x="426" y="574"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DC637555_D382_4357_A281_70A523440BFB" source="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_910BFAB5_C09F_48c2_A281_70A523440BFB">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D382_4357_A281_70A523440BFB" x="426" y="441"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D382_4357_A281_70A523440BFB" x="337" y="380"/>
-			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_13EBFDF0_A7E0_461c_AA5D_CC75FADB4DDB" isFrame="false" modelElement="EAPK_B6085AA3_C98C_49fa_8FA0_069B51B180A2">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_13EBFDF0_A7E0_461c_B4CE_1CC777975EF3" modelElement="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3">
@@ -10922,7 +11388,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5E50B73B_B272_4c8d_A94E_A9202738B188" modelElement="EAID_0C735489_15DC_40a7_A94E_A9202738B188">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B272_4c8d_A94E_A9202738B188" text="epo:EvaluationTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B272_4c8d_A94E_A9202738B188" x="812" y="860" width="109" height="28"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B272_4c8d_A94E_A9202738B188" x="780" y="780" width="109" height="28"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5E50B73B_B272_4c8d_AC62_FA4769B4D88C" modelElement="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B272_4c8d_AC62_FA4769B4D88C" text="epo:Lot"/>
@@ -10984,9 +11450,13 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B272_4c8d_95D1_9F9A3F8B34D8" text="epo:ReviewTerm"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B272_4c8d_95D1_9F9A3F8B34D8" x="841" y="466" width="256" height="85"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5E50B73B_B272_4c8d_982A_26607071A85E" source="EAID_44E7963D_28F5_4263_835A_24C87816F40C" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_4E161D86_3C31_466f_982A_26607071A85E">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B272_4c8d_982A_26607071A85E" x="302" y="602"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_982A_26607071A85E" x="600" y="489"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5E50B73B_B272_4c8d_BF42_2A6E50CAF4E6" modelElement="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B272_4c8d_BF42_2A6E50CAF4E6" text="epo:LotGroup"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B272_4c8d_BF42_2A6E50CAF4E6" x="262" y="315" width="179" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5E50B73B_B272_4c8d_8335_7F9768E9C57B" source="EAID_0C735489_15DC_40a7_A94E_A9202738B188" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_A33B86A9_4703_4a67_8335_7F9768E9C57B">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B272_4c8d_8335_7F9768E9C57B" x="825" y="780"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_8335_7F9768E9C57B" x="658" y="489"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5E50B73B_B272_4c8d_BE3B_872E1A0882C0" source="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" target="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" modelElement="EAID_D62CD782_93C6_480f_BE3B_872E1A0882C0">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B272_4c8d_BE3B_872E1A0882C0" x="1549" y="636"/>
@@ -11014,6 +11484,10 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B272_4c8d_8A8A_E03C23ED1BE1" x="1215" y="880"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_8A8A_E03C23ED1BE1" x="1522" y="360"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5E50B73B_B272_4c8d_98F9_263E29761C37" source="EAID_FA070646_D88B_493f_96AB_8417E2069155" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_F9E99464_DED7_437a_98F9_263E29761C37">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B272_4c8d_98F9_263E29761C37" x="1026" y="924"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_98F9_263E29761C37" x="677" y="489"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5E50B73B_B272_4c8d_A39E_E74480CCE1D0" source="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" target="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" modelElement="EAID_F1463DF7_672E_4208_A39E_E74480CCE1D0">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_B272_4c8d_A39E_E74480CCE1D0" text="+epo:foreseesContractSpecificTerm" modelElement="EAID_dst463DF7_672E_4208_A39E_E74480CCE1D0">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B272_4c8d_A39E_E74480CCE1D0" x="1443" y="259" width="142" height="14"/>
@@ -11025,17 +11499,20 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_A39E_E74480CCE1D0" x="1517" y="192"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_B272_4c8d_A39E_E74480CCE1D0" x="1517" y="314"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5E50B73B_B272_4c8d_A104_F62859765981" source="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_8DB5DB8D_4E96_4679_A104_F62859765981">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B272_4c8d_A104_F62859765981" x="925" y="601"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_A104_F62859765981" x="688" y="485"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5E50B73B_B272_4c8d_9472_AFC131D1E7F2" source="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561" target="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" modelElement="EAID_1E3BD6A4_59D5_435a_9472_AFC131D1E7F2">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B272_4c8d_9472_AFC131D1E7F2" x="1709" y="496"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_9472_AFC131D1E7F2" x="1549" y="360"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5E50B73B_B272_4c8d_982A_26607071A85E" source="EAID_44E7963D_28F5_4263_835A_24C87816F40C" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_4E161D86_3C31_466f_982A_26607071A85E">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B272_4c8d_982A_26607071A85E" x="302" y="602"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_982A_26607071A85E" x="600" y="489"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5E50B73B_B272_4c8d_8335_7F9768E9C57B" source="EAID_0C735489_15DC_40a7_A94E_A9202738B188" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_A33B86A9_4703_4a67_8335_7F9768E9C57B">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B272_4c8d_8335_7F9768E9C57B" x="858" y="860"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_8335_7F9768E9C57B" x="657" y="489"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5E50B73B_B272_4c8d_A94B_6552B0F5A59A" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_505234FB_4CE0_475f_A94B_6552B0F5A59A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_B272_4c8d_A94B_6552B0F5A59A" text="+epo:isSubjectToLotSpecificTerm" modelElement="EAID_dst5234FB_4CE0_475f_A94B_6552B0F5A59A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B272_4c8d_A94B_6552B0F5A59A" x="464" y="430" width="132" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_B272_4c8d_A94B_6552B0F5A59A" text="0..*" modelElement="EAID_dst5234FB_4CE0_475f_A94B_6552B0F5A59A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B272_4c8d_A94B_6552B0F5A59A" x="579" y="453" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B272_4c8d_A94B_6552B0F5A59A" x="354" y="385"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_A94B_6552B0F5A59A" x="354" y="448"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_B272_4c8d_A94B_6552B0F5A59A" x="598" y="448"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5E50B73B_B272_4c8d_A633_615CD23835C1" source="EAID_82AA47D1_6939_4328_8108_0018817C75BD" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_85E14E41_3BA7_4783_A633_615CD23835C1">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B272_4c8d_A633_615CD23835C1" x="387" y="923"/>
@@ -11061,9 +11538,23 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B272_4c8d_B3BF_0CA7ADD341E4" x="298" y="719"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_B3BF_0CA7ADD341E4" x="614" y="489"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5E50B73B_B272_4c8d_98F9_263E29761C37" source="EAID_FA070646_D88B_493f_96AB_8417E2069155" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_F9E99464_DED7_437a_98F9_263E29761C37">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B272_4c8d_98F9_263E29761C37" x="1026" y="924"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_98F9_263E29761C37" x="677" y="489"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5E50B73B_B272_4c8d_9472_AFC131D1E7F2" source="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561" target="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" modelElement="EAID_1E3BD6A4_59D5_435a_9472_AFC131D1E7F2">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B272_4c8d_9472_AFC131D1E7F2" x="1709" y="496"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_9472_AFC131D1E7F2" x="1549" y="360"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5E50B73B_B272_4c8d_BFE6_593632EDB11F" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_20732599_332F_4f0e_BFE6_593632EDB11F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_B272_4c8d_BFE6_593632EDB11F" text="+epo:setsGroupingContextForLot" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B272_4c8d_BFE6_593632EDB11F" x="448" y="331" width="131" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_B272_4c8d_BFE6_593632EDB11F" text="1..*" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B272_4c8d_BFE6_593632EDB11F" x="562" y="354" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B272_4c8d_BFE6_593632EDB11F" x="441" y="349"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_BFE6_593632EDB11F" x="581" y="349"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5E50B73B_B272_4c8d_A104_F62859765981" source="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_8DB5DB8D_4E96_4679_A104_F62859765981">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B272_4c8d_A104_F62859765981" x="925" y="601"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_A104_F62859765981" x="688" y="485"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_E7B9DC27_DFB5_40f5_AFF2_F34912D5FC0D" isFrame="false" modelElement="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B">
@@ -12351,9 +12842,9 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_9939_FA613CEB5D22" x="483" y="219"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_A50D_BE4367D5EE4E" source="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" target="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5" modelElement="EAID_9B46D9F5_E71D_40fc_A50D_BE4367D5EE4E">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9AA0_45fa_A50D_BE4367D5EE4E" x="690" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_A50D_BE4367D5EE4E" x="690" y="278"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9AA0_45fa_A50D_BE4367D5EE4E" x="857" y="278"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9AA0_45fa_A50D_BE4367D5EE4E" x="696" y="334"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_A50D_BE4367D5EE4E" x="696" y="273"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9AA0_45fa_A50D_BE4367D5EE4E" x="857" y="273"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_80BE_9C778A0BA2A5" source="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_7DEB98FB_35C4_4015_80BE_9C778A0BA2A5">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9AA0_45fa_80BE_9C778A0BA2A5" text="+epo:isSubjectToLotSpecificTerm" modelElement="EAID_dstEB98FB_35C4_4015_80BE_9C778A0BA2A5">
@@ -12993,7 +13484,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_54EAF048_1D0D_46d6_BF42_2A6E50CAF4E6" modelElement="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1D0D_46d6_BF42_2A6E50CAF4E6" text="epo:LotGroup"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1D0D_46d6_BF42_2A6E50CAF4E6" x="1076" y="480" width="171" height="62"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1D0D_46d6_BF42_2A6E50CAF4E6" x="1076" y="480" width="179" height="75"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_54EAF048_1D0D_46d6_AF25_AB05D2C71CC1" modelElement="EAID_21477DFB_067C_4dd2_AF25_AB05D2C71CC1">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_1D0D_46d6_AF25_AB05D2C71CC1" text="enumeration"/>
@@ -13115,10 +13606,23 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1D0D_46d6_80B0_0C345D6703F4" text="epo:Procedure"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1D0D_46d6_80B0_0C345D6703F4" x="1273" y="618" width="278" height="111"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_B447_89D7A813874C" source="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_E006DB35_535D_4444_B447_89D7A813874C">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_B447_89D7A813874C" x="318" y="599"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_B447_89D7A813874C" x="318" y="531"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1D0D_46d6_B447_89D7A813874C" x="588" y="531"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_8D25_C40F0E038224" source="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90" target="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD" modelElement="EAID_B158E1D7_3CC5_4e64_8D25_C40F0E038224">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_8D25_C40F0E038224" x="702" y="711"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_8D25_C40F0E038224" x="702" y="661"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_87D7_D2C5E8C7FFF8" source="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" target="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90" modelElement="EAID_3EE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1D0D_46d6_87D7_D2C5E8C7FFF8" text="+epo:substantiatesExclusionGround" modelElement="EAID_dstE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1D0D_46d6_87D7_D2C5E8C7FFF8" x="637" y="790" width="142" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1D0D_46d6_87D7_D2C5E8C7FFF8" text="0..1" modelElement="EAID_dstE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1D0D_46d6_87D7_D2C5E8C7FFF8" x="712" y="777" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_87D7_D2C5E8C7FFF8" x="702" y="824"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_87D7_D2C5E8C7FFF8" x="702" y="770"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_9596_5EC3247529A2" source="EAID_30DD6891_71FE_4f87_832B_477790550BBC" target="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" modelElement="EAID_6492D4E3_9631_45d4_9596_5EC3247529A2">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_9596_5EC3247529A2" x="873" y="311"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_9596_5EC3247529A2" x="873" y="235"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_8817_DBE9EF9EC21B" source="EAID_A83127C7_BC27_4269_962F_2ACF2FABD599" target="EAID_6876A19C_66D7_48bd_AB58_21E5FB903810" modelElement="EAID_116B9777_31D7_4d5f_8817_DBE9EF9EC21B">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_8817_DBE9EF9EC21B" x="1083" y="337"/>
@@ -13155,27 +13659,14 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_A80D_69ACBFA6147C" x="631" y="431"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1D0D_46d6_A80D_69ACBFA6147C" x="530" y="431"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_8EA7_36C327FE63FE" source="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" target="EAID_FAC84DE8_1A2E_4a6f_9F36_38EB360ACD58" modelElement="EAID_849B9DC8_4F7D_4023_8EA7_36C327FE63FE">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_8EA7_36C327FE63FE" x="588" y="492"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_8EA7_36C327FE63FE" x="371" y="492"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_87D7_D2C5E8C7FFF8" source="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" target="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90" modelElement="EAID_3EE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1D0D_46d6_87D7_D2C5E8C7FFF8" text="+epo:substantiatesExclusionGround" modelElement="EAID_dstE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1D0D_46d6_87D7_D2C5E8C7FFF8" x="637" y="790" width="142" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1D0D_46d6_87D7_D2C5E8C7FFF8" text="0..1" modelElement="EAID_dstE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1D0D_46d6_87D7_D2C5E8C7FFF8" x="712" y="777" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_87D7_D2C5E8C7FFF8" x="702" y="824"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_87D7_D2C5E8C7FFF8" x="702" y="770"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_8D25_C40F0E038224" source="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90" target="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD" modelElement="EAID_B158E1D7_3CC5_4e64_8D25_C40F0E038224">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_8D25_C40F0E038224" x="702" y="711"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_8D25_C40F0E038224" x="702" y="661"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_B735_322F9131A442" source="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" target="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D" modelElement="EAID_ACA750D2_84FF_4e07_B735_322F9131A442">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_B735_322F9131A442" x="693" y="473"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_B735_322F9131A442" x="693" y="371"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_8B84_0C6E8B387AD5" source="EAID_432BFDAD_99CD_40ab_A159_824F0F6571E2" target="EAID_B81F2C0E_31F9_4ec0_AC1E_A0960D618FE6" modelElement="EAID_76DEFDDE_AF78_4e23_8B84_0C6E8B387AD5">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_8B84_0C6E8B387AD5" x="525" y="650"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_8B84_0C6E8B387AD5" x="525" y="710"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_B447_89D7A813874C" source="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_E006DB35_535D_4444_B447_89D7A813874C">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_B447_89D7A813874C" x="318" y="599"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_B447_89D7A813874C" x="318" y="531"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1D0D_46d6_B447_89D7A813874C" x="588" y="531"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_BFCB_B139EAFC4E19" source="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2" target="EAID_0E6B28F7_3701_4b88_A833_0CAE48C1A9B8" modelElement="EAID_F088C989_3EAB_4eb9_BFCB_B139EAFC4E19">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_BFCB_B139EAFC4E19" x="251" y="658"/>
@@ -13187,23 +13678,23 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_AEBA_EA277D05F7E8" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_55771AD3_C775_4324_AEBA_EA277D05F7E8">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1D0D_46d6_AEBA_EA277D05F7E8" text="+epo:hasInternalIdentifier" modelElement="EAID_dst771AD3_C775_4324_AEBA_EA277D05F7E8">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1D0D_46d6_AEBA_EA277D05F7E8" x="1307" y="494" width="105" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1D0D_46d6_AEBA_EA277D05F7E8" x="1307" y="500" width="105" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1D0D_46d6_AEBA_EA277D05F7E8" text="0..*" modelElement="EAID_dst771AD3_C775_4324_AEBA_EA277D05F7E8">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1D0D_46d6_AEBA_EA277D05F7E8" x="1395" y="517" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1D0D_46d6_AEBA_EA277D05F7E8" x="1395" y="523" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_AEBA_EA277D05F7E8" x="1247" y="512"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_AEBA_EA277D05F7E8" x="1414" y="512"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_AEBA_EA277D05F7E8" x="1255" y="518"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_AEBA_EA277D05F7E8" x="1414" y="518"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_B087_27A619B6C819" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_FC7073E1_3362_472f_B087_27A619B6C819">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1D0D_46d6_B087_27A619B6C819" text="+epo:specifiesProcurementCriterion" modelElement="EAID_dst7073E1_3362_472f_B087_27A619B6C819">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1D0D_46d6_B087_27A619B6C819" x="843" y="488" width="142" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1D0D_46d6_B087_27A619B6C819" x="843" y="493" width="142" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1D0D_46d6_B087_27A619B6C819" text="0..*" modelElement="EAID_dst7073E1_3362_472f_B087_27A619B6C819">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1D0D_46d6_B087_27A619B6C819" x="823" y="516" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1D0D_46d6_B087_27A619B6C819" x="823" y="521" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_B087_27A619B6C819" x="1076" y="511"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_B087_27A619B6C819" x="820" y="511"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_B087_27A619B6C819" x="1076" y="516"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_B087_27A619B6C819" x="820" y="516"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_A7F5_548146C45BC4" source="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1D0D_46d6_A7F5_548146C45BC4" text="+epo:specifiesProcurementCriterion" modelElement="EAID_dst1AA305_6E1E_4123_A7F5_548146C45BC4">
@@ -13216,13 +13707,23 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_A7F5_548146C45BC4" x="951" y="546"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1D0D_46d6_A7F5_548146C45BC4" x="820" y="546"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_B735_322F9131A442" source="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" target="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D" modelElement="EAID_ACA750D2_84FF_4e07_B735_322F9131A442">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_B735_322F9131A442" x="693" y="473"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_B735_322F9131A442" x="693" y="371"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_8EA7_36C327FE63FE" source="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" target="EAID_FAC84DE8_1A2E_4a6f_9F36_38EB360ACD58" modelElement="EAID_849B9DC8_4F7D_4023_8EA7_36C327FE63FE">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_8EA7_36C327FE63FE" x="588" y="492"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_8EA7_36C327FE63FE" x="371" y="492"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_AF48_1EE54018D9E5" source="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" target="EAID_02014F61_A766_467e_BD3D_7F41689C651B" modelElement="EAID_91E24989_0AB1_44de_AF48_1EE54018D9E5">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_AF48_1EE54018D9E5" x="1210" y="384"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_AF48_1EE54018D9E5" x="1210" y="303"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_BFBB_56453EA7473F" source="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" target="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" modelElement="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1D0D_46d6_BFBB_56453EA7473F" text="+cccev:hasRequirement 0..*" modelElement="EAID_dst59B897_AEE0_4ae9_BFBB_56453EA7473F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1D0D_46d6_BFBB_56453EA7473F" x="906" y="245" width="114" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1D0D_46d6_BFBB_56453EA7473F" text="0..*" modelElement="EAID_dst59B897_AEE0_4ae9_BFBB_56453EA7473F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1D0D_46d6_BFBB_56453EA7473F" x="1038" y="240" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_BFBB_56453EA7473F" x="924" y="235"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_BFBB_56453EA7473F" x="924" y="235"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1D0D_46d6_BFBB_56453EA7473F" x="924" y="266"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_1D0D_46d6_BFBB_56453EA7473F" x="1026" y="266"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_1D0D_46d6_BFBB_56453EA7473F" x="1026" y="235"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_1D0D_46d6_BFBB_56453EA7473F" x="1026" y="235"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_8DCE_04D577B2D3F0" source="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD" target="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD" modelElement="EAID_A04862A6_080C_43b0_8DCE_04D577B2D3F0">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1D0D_46d6_8DCE_04D577B2D3F0" text="+epo:includesNationalCriterion 0..*" modelElement="EAID_dst4862A6_080C_43b0_8DCE_04D577B2D3F0">
@@ -13291,19 +13792,10 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_94C4_FD1CAF5CCC27" x="975" y="411"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_94C4_FD1CAF5CCC27" x="975" y="266"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_9596_5EC3247529A2" source="EAID_30DD6891_71FE_4f87_832B_477790550BBC" target="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" modelElement="EAID_6492D4E3_9631_45d4_9596_5EC3247529A2">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_9596_5EC3247529A2" x="873" y="311"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_9596_5EC3247529A2" x="873" y="235"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_8A68_8655E9F9B47E" source="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" target="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" modelElement="EAID_85CFCF08_3F48_4102_8A68_8655E9F9B47E">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1D0D_46d6_8A68_8655E9F9B47E" text="+cccev:constrains" modelElement="EAID_dstCFCF08_3F48_4102_8A68_8655E9F9B47E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1D0D_46d6_8A68_8655E9F9B47E" x="1362" y="390" width="71" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1D0D_46d6_8A68_8655E9F9B47E" text="0..*" modelElement="EAID_dstCFCF08_3F48_4102_8A68_8655E9F9B47E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1D0D_46d6_8A68_8655E9F9B47E" x="1416" y="413" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_8A68_8655E9F9B47E" x="1274" y="408"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_8A68_8655E9F9B47E" x="1435" y="408"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_BCBE_35DFB0CE066A" source="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" target="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" modelElement="EAID_FAC59FEE_3DE7_4de1_BCBE_35DFB0CE066A">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_BCBE_35DFB0CE066A" x="1124" y="384"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_BCBE_35DFB0CE066A" x="1124" y="231"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1D0D_46d6_BCBE_35DFB0CE066A" x="1074" y="231"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_BC30_54B777A7B4B8" source="EAID_30DD6891_71FE_4f87_832B_477790550BBC" target="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" modelElement="EAID_5879D937_81BB_4b88_BC30_54B777A7B4B8">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1D0D_46d6_BC30_54B777A7B4B8" text="+epo:hasConstraint" modelElement="EAID_dst79D937_81BB_4b88_BC30_54B777A7B4B8">
@@ -13316,19 +13808,13 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_BC30_54B777A7B4B8" x="1093" y="337"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1D0D_46d6_BC30_54B777A7B4B8" x="1093" y="384"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_BFBB_56453EA7473F" source="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" target="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" modelElement="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1D0D_46d6_BFBB_56453EA7473F" text="+cccev:hasRequirement 0..*" modelElement="EAID_dst59B897_AEE0_4ae9_BFBB_56453EA7473F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1D0D_46d6_BFBB_56453EA7473F" x="906" y="245" width="114" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1D0D_46d6_BFBB_56453EA7473F" text="0..*" modelElement="EAID_dst59B897_AEE0_4ae9_BFBB_56453EA7473F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1D0D_46d6_BFBB_56453EA7473F" x="1038" y="240" width="100" height="10"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_BFBB_56453EA7473F" x="924" y="235"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_BFBB_56453EA7473F" x="924" y="235"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1D0D_46d6_BFBB_56453EA7473F" x="924" y="266"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_1D0D_46d6_BFBB_56453EA7473F" x="1026" y="266"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_1D0D_46d6_BFBB_56453EA7473F" x="1026" y="235"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_1D0D_46d6_BFBB_56453EA7473F" x="1026" y="235"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_AF48_1EE54018D9E5" source="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" target="EAID_02014F61_A766_467e_BD3D_7F41689C651B" modelElement="EAID_91E24989_0AB1_44de_AF48_1EE54018D9E5">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_AF48_1EE54018D9E5" x="1210" y="384"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_AF48_1EE54018D9E5" x="1210" y="303"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_8D8D_679E9486EE84" source="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_03FC1FD2_BDF5_4ae5_8D8D_679E9486EE84">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_8D8D_679E9486EE84" x="700" y="627"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_8D8D_679E9486EE84" x="700" y="563"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_BB1B_A5C475115AB1" source="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" target="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" modelElement="EAID_4CC3B6CA_493A_4ff6_BB1B_A5C475115AB1">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1D0D_46d6_BB1B_A5C475115AB1" text="+cccev:hasConcept" modelElement="EAID_dstC3B6CA_493A_4ff6_BB1B_A5C475115AB1">
@@ -13376,14 +13862,19 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_BFBF_00E3B99864B4" x="525" y="545"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1D0D_46d6_BFBF_00E3B99864B4" x="588" y="545"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_8D8D_679E9486EE84" source="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_03FC1FD2_BDF5_4ae5_8D8D_679E9486EE84">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_8D8D_679E9486EE84" x="700" y="627"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_8D8D_679E9486EE84" x="700" y="563"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_8B84_0C6E8B387AD5" source="EAID_432BFDAD_99CD_40ab_A159_824F0F6571E2" target="EAID_B81F2C0E_31F9_4ec0_AC1E_A0960D618FE6" modelElement="EAID_76DEFDDE_AF78_4e23_8B84_0C6E8B387AD5">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_8B84_0C6E8B387AD5" x="525" y="650"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_8B84_0C6E8B387AD5" x="525" y="710"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_BCBE_35DFB0CE066A" source="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" target="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" modelElement="EAID_FAC59FEE_3DE7_4de1_BCBE_35DFB0CE066A">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_BCBE_35DFB0CE066A" x="1124" y="384"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_BCBE_35DFB0CE066A" x="1124" y="231"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1D0D_46d6_BCBE_35DFB0CE066A" x="1074" y="231"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_8A68_8655E9F9B47E" source="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" target="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" modelElement="EAID_85CFCF08_3F48_4102_8A68_8655E9F9B47E">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1D0D_46d6_8A68_8655E9F9B47E" text="+cccev:constrains" modelElement="EAID_dstCFCF08_3F48_4102_8A68_8655E9F9B47E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1D0D_46d6_8A68_8655E9F9B47E" x="1362" y="390" width="71" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1D0D_46d6_8A68_8655E9F9B47E" text="0..*" modelElement="EAID_dstCFCF08_3F48_4102_8A68_8655E9F9B47E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1D0D_46d6_8A68_8655E9F9B47E" x="1416" y="413" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_8A68_8655E9F9B47E" x="1274" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_8A68_8655E9F9B47E" x="1435" y="408"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_663B1240_A872_4795_A9D6_7CAF8E182298" isFrame="false" modelElement="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334">
@@ -13483,7 +13974,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_663B1240_A872_4795_8AA0_0ABAC3D0F2BD" modelElement="EAID_FB996CB7_0FB9_4a30_8AA0_0ABAC3D0F2BD">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_A872_4795_8AA0_0ABAC3D0F2BD" text="epo:TechnicalAbilitySummary"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A872_4795_8AA0_0ABAC3D0F2BD" x="806" y="926" width="110" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A872_4795_8AA0_0ABAC3D0F2BD" x="809" y="926" width="110" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_663B1240_A872_4795_8FF3_8D3665D95B89" modelElement="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_A872_4795_8FF3_8D3665D95B89" text="epo:QualificationCriteriaSummary"/>
@@ -13495,7 +13986,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_663B1240_A872_4795_807A_C15FA10B40F7" modelElement="EAID_38BC5625_EAC0_4eb0_807A_C15FA10B40F7">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_A872_4795_807A_C15FA10B40F7" text="epo:AwardCriteriaSummary"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A872_4795_807A_C15FA10B40F7" x="167" y="612" width="105" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A872_4795_807A_C15FA10B40F7" x="167" y="612" width="133" height="34"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_663B1240_A872_4795_A8A7_C0037581B6D3" source="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" target="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" modelElement="EAID_B8BA8A30_8A22_4475_A8A7_C0037581B6D3">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A872_4795_A8A7_C0037581B6D3" x="498" y="274"/>
@@ -13567,8 +14058,8 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_A872_4795_BF39_B673852D3F9A" x="629" y="597"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_663B1240_A872_4795_B307_2638D65D637C" source="EAID_38BC5625_EAC0_4eb0_807A_C15FA10B40F7" target="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D" modelElement="EAID_30D2C78D_A7B9_4e68_B307_2638D65D637C">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A872_4795_B307_2638D65D637C" x="220" y="612"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A872_4795_B307_2638D65D637C" x="220" y="511"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A872_4795_B307_2638D65D637C" x="230" y="612"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A872_4795_B307_2638D65D637C" x="230" y="511"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_A872_4795_B307_2638D65D637C" x="340" y="511"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_663B1240_A872_4795_9195_C96F98BD3349" source="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349">
@@ -13650,8 +14141,8 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A872_4795_898F_14269D31CF88" x="716" y="858"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_663B1240_A872_4795_AA55_2065496F072C" source="EAID_FB996CB7_0FB9_4a30_8AA0_0ABAC3D0F2BD" target="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB" modelElement="EAID_829CE86D_DCFB_48b2_AA55_2065496F072C">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A872_4795_AA55_2065496F072C" x="823" y="926"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A872_4795_AA55_2065496F072C" x="751" y="858"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A872_4795_AA55_2065496F072C" x="826" y="926"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A872_4795_AA55_2065496F072C" x="752" y="858"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_663B1240_A872_4795_995B_59C79DE365BD" source="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89" target="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D" modelElement="EAID_48B39F0F_A79C_4ac8_995B_59C79DE365BD">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A872_4795_995B_59C79DE365BD" x="499" y="562"/>
@@ -13833,123 +14324,137 @@
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_D7F91EFA_588B_4ede_B41F_FFC57647CF02" isFrame="false" modelElement="EAPK_FE3FEF05_DD69_4fca_A8A4_6F0FCF36A9C1">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D7F91EFA_588B_4ede_BABD_E3BB2D5283C4" modelElement="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_588B_4ede_BABD_E3BB2D5283C4" text="epo:GreenProcurement"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_BABD_E3BB2D5283C4" x="384" y="264" width="226" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_BABD_E3BB2D5283C4" x="386" y="379" width="226" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D7F91EFA_588B_4ede_AAD2_04A3726B2332" modelElement="EAID_EC3D2F66_1FC6_4b4c_AAD2_04A3726B2332">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_588B_4ede_AAD2_04A3726B2332" text="epo:InnovativeProcurement"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_AAD2_04A3726B2332" x="651" y="264" width="138" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_AAD2_04A3726B2332" x="653" y="379" width="138" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D7F91EFA_588B_4ede_908F_EAB3689291DE" modelElement="EAID_2DF96E3A_E135_465d_908F_EAB3689291DE">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_588B_4ede_908F_EAB3689291DE" text="epo:SocialProcurement"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_908F_EAB3689291DE" x="829" y="264" width="133" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_908F_EAB3689291DE" x="831" y="379" width="133" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D7F91EFA_588B_4ede_98A6_28E358A11BEA" modelElement="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_588B_4ede_98A6_28E358A11BEA" text="epo:StrategicProcurement"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_98A6_28E358A11BEA" x="576" y="103" width="288" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_98A6_28E358A11BEA" x="578" y="218" width="288" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D7F91EFA_588B_4ede_972F_AB425AA26120" modelElement="EAID_6C0716CF_8E33_4ea7_972F_AB425AA26120">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_588B_4ede_972F_AB425AA26120" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_588B_4ede_972F_AB425AA26120" text="at-voc:innovative-acquisition"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_972F_AB425AA26120" x="675" y="422" width="90" height="75"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_972F_AB425AA26120" x="677" y="537" width="90" height="75"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D7F91EFA_588B_4ede_8CA7_9D132E537955" modelElement="EAID_53AB9EFA_0DDD_4512_8CA7_9D132E537955">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_588B_4ede_8CA7_9D132E537955" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_588B_4ede_8CA7_9D132E537955" text="at-voc:social-objective"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_8CA7_9D132E537955" x="850" y="422" width="90" height="75"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_8CA7_9D132E537955" x="852" y="537" width="90" height="75"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D7F91EFA_588B_4ede_8B45_5AD2427938E3" modelElement="EAID_BF1B4E2A_7D4A_4247_8B45_5AD2427938E3">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_588B_4ede_8B45_5AD2427938E3" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_588B_4ede_8B45_5AD2427938E3" text="at-voc:environmental-impact"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_8B45_5AD2427938E3" x="384" y="421" width="90" height="75"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_8B45_5AD2427938E3" x="386" y="536" width="90" height="75"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D7F91EFA_588B_4ede_8468_6429D56A1496" modelElement="EAID_DFCCF9E6_D161_4a4e_8468_6429D56A1496">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_588B_4ede_8468_6429D56A1496" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_588B_4ede_8468_6429D56A1496" text="at-voc:accessibility"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_8468_6429D56A1496" x="1005" y="113" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_8468_6429D56A1496" x="1007" y="223" width="90" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D7F91EFA_588B_4ede_BAA8_68D1BF528FF5" modelElement="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_588B_4ede_BAA8_68D1BF528FF5" text="epo:ProcurementObject"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_BAA8_68D1BF528FF5" x="178" y="74" width="232" height="137"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_BAA8_68D1BF528FF5" x="195" y="184" width="232" height="137"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D7F91EFA_588B_4ede_A0DA_EA1E43E5C728" modelElement="EAID_B81500F4_C78F_4431_A0DA_EA1E43E5C728">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_588B_4ede_A0DA_EA1E43E5C728" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_588B_4ede_A0DA_EA1E43E5C728" text="at-voc:green-public-procurement-criteria"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_A0DA_EA1E43E5C728" x="520" y="421" width="90" height="75"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_A0DA_EA1E43E5C728" x="522" y="536" width="90" height="75"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D7F91EFA_588B_4ede_87DA_3F3808C4744F" modelElement="EAID_63483BB6_C796_4631_87DA_3F3808C4744F">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_588B_4ede_87DA_3F3808C4744F" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_588B_4ede_87DA_3F3808C4744F" text="at-voc:cvd-contract-type"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_87DA_3F3808C4744F" x="234" y="429" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_87DA_3F3808C4744F" x="236" y="544" width="90" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D7F91EFA_588B_4ede_82F9_EE632CBBD88D" modelElement="EAID_F565346A_74A1_4bf9_82F9_EE632CBBD88D">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_588B_4ede_82F9_EE632CBBD88D" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_588B_4ede_82F9_EE632CBBD88D" text="at-voc:vehicle-category"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_82F9_EE632CBBD88D" x="42" y="429" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_82F9_EE632CBBD88D" x="44" y="544" width="90" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D7F91EFA_588B_4ede_B6A9_172F178688C0" modelElement="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_588B_4ede_B6A9_172F178688C0" text="epo:VehicleInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_B6A9_172F178688C0" x="24" y="264" width="218" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_B6A9_172F178688C0" x="25" y="379" width="218" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D7F91EFA_588B_4ede_A416_3E77939F9B7A" modelElement="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_588B_4ede_A416_3E77939F9B7A" text="epo:LotAwardOutcome"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_A416_3E77939F9B7A" x="591" y="93" width="262" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D7F91EFA_588B_4ede_934F_BBF695929296" source="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" target="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA" modelElement="EAID_32F239DB_02BC_456a_934F_BBF695929296">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_588B_4ede_934F_BBF695929296" text="+epo:fulfillsStrategicProcurement" modelElement="EAID_dstF239DB_02BC_456a_934F_BBF695929296">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_588B_4ede_934F_BBF695929296" x="654" y="177" width="133" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_588B_4ede_934F_BBF695929296" text="0..*" modelElement="EAID_dstF239DB_02BC_456a_934F_BBF695929296">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_588B_4ede_934F_BBF695929296" x="730" y="200" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_934F_BBF695929296" x="722" y="163"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_934F_BBF695929296" x="722" y="218"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D7F91EFA_588B_4ede_AA32_D22B32C1DF1F" source="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA" target="EAID_DFCCF9E6_D161_4a4e_8468_6429D56A1496" modelElement="EAID_1BB31111_F63D_4464_AA32_D22B32C1DF1F">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_AA32_D22B32C1DF1F" x="864" y="146"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_AA32_D22B32C1DF1F" x="1005" y="146"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_AA32_D22B32C1DF1F" x="866" y="257"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_AA32_D22B32C1DF1F" x="1007" y="257"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D7F91EFA_588B_4ede_8718_882951247DF8" source="EAID_2DF96E3A_E135_465d_908F_EAB3689291DE" target="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA" modelElement="EAID_857D08F9_84F2_4d98_8718_882951247DF8">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_8718_882951247DF8" x="856" y="264"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_8718_882951247DF8" x="758" y="173"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_8718_882951247DF8" x="858" y="379"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_8718_882951247DF8" x="760" y="288"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D7F91EFA_588B_4ede_994C_2F6853BD9DA7" source="EAID_2DF96E3A_E135_465d_908F_EAB3689291DE" target="EAID_53AB9EFA_0DDD_4512_8CA7_9D132E537955" modelElement="EAID_5C87BC92_AF78_4f16_994C_2F6853BD9DA7">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_994C_2F6853BD9DA7" x="895" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_994C_2F6853BD9DA7" x="895" y="422"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_994C_2F6853BD9DA7" x="897" y="449"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_994C_2F6853BD9DA7" x="897" y="537"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D7F91EFA_588B_4ede_97A2_B2C5B93B0F80" source="EAID_EC3D2F66_1FC6_4b4c_AAD2_04A3726B2332" target="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA" modelElement="EAID_ADB72D59_DC72_465e_97A2_B2C5B93B0F80">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_97A2_B2C5B93B0F80" x="720" y="264"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_97A2_B2C5B93B0F80" x="720" y="173"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_97A2_B2C5B93B0F80" x="722" y="379"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_97A2_B2C5B93B0F80" x="722" y="288"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D7F91EFA_588B_4ede_AC9E_9CBFCA6E5549" source="EAID_EC3D2F66_1FC6_4b4c_AAD2_04A3726B2332" target="EAID_6C0716CF_8E33_4ea7_972F_AB425AA26120" modelElement="EAID_F362F8D3_4A45_4dc9_AC9E_9CBFCA6E5549">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_AC9E_9CBFCA6E5549" x="720" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_AC9E_9CBFCA6E5549" x="720" y="422"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_AC9E_9CBFCA6E5549" x="722" y="449"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_AC9E_9CBFCA6E5549" x="722" y="537"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D7F91EFA_588B_4ede_976E_204541847F5F" source="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4" target="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA" modelElement="EAID_C15E132C_206B_4dd4_976E_204541847F5F">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_976E_204541847F5F" x="545" y="264"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_976E_204541847F5F" x="671" y="173"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_976E_204541847F5F" x="547" y="379"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_976E_204541847F5F" x="673" y="288"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D7F91EFA_588B_4ede_971F_0407E27D9413" source="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4" target="EAID_BF1B4E2A_7D4A_4247_8B45_5AD2427938E3" modelElement="EAID_9E45040E_9573_4ec2_971F_0407E27D9413">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_971F_0407E27D9413" x="432" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_971F_0407E27D9413" x="432" y="421"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_971F_0407E27D9413" x="434" y="449"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_971F_0407E27D9413" x="434" y="536"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D7F91EFA_588B_4ede_A409_4F5F708BC856" source="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4" target="EAID_B81500F4_C78F_4431_A0DA_EA1E43E5C728" modelElement="EAID_6AA28D6E_E3E3_40d8_A409_4F5F708BC856">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_A409_4F5F708BC856" x="565" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_A409_4F5F708BC856" x="565" y="421"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_A409_4F5F708BC856" x="567" y="449"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_A409_4F5F708BC856" x="567" y="536"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D7F91EFA_588B_4ede_87F3_C0ACAEAF591C" source="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0" target="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4" modelElement="EAID_0BE43E48_CB11_4fae_87F3_C0ACAEAF591C">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_588B_4ede_87F3_C0ACAEAF591C" text="+epo:concernsGreenProcurement" modelElement="EAID_dstE43E48_CB11_4fae_87F3_C0ACAEAF591C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_588B_4ede_87F3_C0ACAEAF591C" x="246" y="278" width="134" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_588B_4ede_87F3_C0ACAEAF591C" x="248" y="393" width="134" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_588B_4ede_87F3_C0ACAEAF591C" text="1" modelElement="EAID_dstE43E48_CB11_4fae_87F3_C0ACAEAF591C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_588B_4ede_87F3_C0ACAEAF591C" x="376" y="298" width="6" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_588B_4ede_87F3_C0ACAEAF591C" text="0..1" modelElement="EAID_dstE43E48_CB11_4fae_87F3_C0ACAEAF591C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_588B_4ede_87F3_C0ACAEAF591C" x="367" y="413" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_87F3_C0ACAEAF591C" x="242" y="293"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_87F3_C0ACAEAF591C" x="384" y="293"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_87F3_C0ACAEAF591C" x="243" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_87F3_C0ACAEAF591C" x="386" y="408"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D7F91EFA_588B_4ede_8CAF_4B1C7067546E" source="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0" target="EAID_F565346A_74A1_4bf9_82F9_EE632CBBD88D" modelElement="EAID_78ABF07D_FFDF_40a2_8CAF_4B1C7067546E">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_8CAF_4B1C7067546E" x="87" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_8CAF_4B1C7067546E" x="87" y="429"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_8CAF_4B1C7067546E" x="89" y="449"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_8CAF_4B1C7067546E" x="89" y="544"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D7F91EFA_588B_4ede_B368_6604C3E040EC" source="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0" target="EAID_63483BB6_C796_4631_87DA_3F3808C4744F" modelElement="EAID_8F9F898E_D644_43bd_B368_6604C3E040EC">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_B368_6604C3E040EC" x="242" y="321"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_B368_6604C3E040EC" x="281" y="321"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_588B_4ede_B368_6604C3E040EC" x="281" y="429"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_B368_6604C3E040EC" x="243" y="436"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_B368_6604C3E040EC" x="283" y="436"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_588B_4ede_B368_6604C3E040EC" x="283" y="544"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D7F91EFA_588B_4ede_826E_974C4A3AEF87" source="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" target="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA" modelElement="EAID_81D470D5_433B_4242_826E_974C4A3AEF87">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_588B_4ede_826E_974C4A3AEF87" text="+epo:fulfillsStrategicProcurement" modelElement="EAID_dstD470D5_433B_4242_826E_974C4A3AEF87">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_588B_4ede_826E_974C4A3AEF87" x="438" y="122" width="133" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_588B_4ede_826E_974C4A3AEF87" x="440" y="233" width="133" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_588B_4ede_826E_974C4A3AEF87" text="0..*" modelElement="EAID_dstD470D5_433B_4242_826E_974C4A3AEF87">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_588B_4ede_826E_974C4A3AEF87" x="557" y="149" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_588B_4ede_826E_974C4A3AEF87" x="559" y="260" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_826E_974C4A3AEF87" x="410" y="144"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_826E_974C4A3AEF87" x="576" y="144"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_826E_974C4A3AEF87" x="427" y="255"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_826E_974C4A3AEF87" x="578" y="255"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_C2438E0D_81F3_4cd2_814E_C771177226C0" isFrame="false" modelElement="EAPK_FE3FEF05_DD69_4fca_A8A4_6F0FCF36A9C1">
@@ -14826,12 +15331,12 @@
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BA4823EC_F40E_4a51_AB88_882E3568B3F0" modelElement="EAID_B63C4BE8_86E2_494f_AB88_882E3568B3F0">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_F40E_4a51_AB88_882E3568B3F0" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_F40E_4a51_AB88_882E3568B3F0" text="at-voc:winner-selection-status"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F40E_4a51_AB88_882E3568B3F0" x="127" y="265" width="156" height="46"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F40E_4a51_AB88_882E3568B3F0" x="136" y="266" width="156" height="46"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BA4823EC_F40E_4a51_8627_A594E6819D78" modelElement="EAID_D46376EC_6B98_4926_8627_A594E6819D78">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_F40E_4a51_8627_A594E6819D78" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_F40E_4a51_8627_A594E6819D78" text="at-voc:non-award-justification"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F40E_4a51_8627_A594E6819D78" x="127" y="218" width="156" height="40"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F40E_4a51_8627_A594E6819D78" x="136" y="218" width="156" height="40"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BA4823EC_F40E_4a51_B4D4_D8AE4F96B00B" modelElement="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_F40E_4a51_B4D4_D8AE4F96B00B" text="epo:TenderAwardOutcome"/>
@@ -14843,7 +15348,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BA4823EC_F40E_4a51_8C56_63A3A737F49A" modelElement="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_F40E_4a51_8C56_63A3A737F49A" text="epo:SubmissionStatisticalInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F40E_4a51_8C56_63A3A737F49A" x="136" y="393" width="315" height="280"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F40E_4a51_8C56_63A3A737F49A" x="136" y="397" width="315" height="280"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BA4823EC_F40E_4a51_9B44_2FCDD6AB5C9D" modelElement="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_F40E_4a51_9B44_2FCDD6AB5C9D" text="epo:MonetaryValue"/>
@@ -14860,7 +15365,7 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F40E_4a51_AB89_9342AF882E95" text="1" modelElement="EAID_dstBE64C7_3F6B_4881_AB89_9342AF882E95">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F40E_4a51_AB89_9342AF882E95" x="545" y="330" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_AB89_9342AF882E95" x="284" y="393"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_AB89_9342AF882E95" x="284" y="397"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_AB89_9342AF882E95" x="284" y="325"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_F40E_4a51_AB89_9342AF882E95" x="553" y="325"/>
 			</ownedElement>
@@ -14871,7 +15376,7 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F40E_4a51_86E7_B4E433F87208" text="0..1" modelElement="EAID_dst27E296_9886_44bc_86E7_B4E433F87208">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F40E_4a51_86E7_B4E433F87208" x="465" y="763" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_86E7_B4E433F87208" x="213" y="673"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_86E7_B4E433F87208" x="213" y="677"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_86E7_B4E433F87208" x="213" y="758"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_F40E_4a51_86E7_B4E433F87208" x="484" y="758"/>
 			</ownedElement>
@@ -14882,7 +15387,7 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F40E_4a51_94D7_26E6E451AF0C" text="0..1" modelElement="EAID_dstD513D4_9622_4217_94D7_26E6E451AF0C">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F40E_4a51_94D7_26E6E451AF0C" x="465" y="729" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_94D7_26E6E451AF0C" x="242" y="673"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_94D7_26E6E451AF0C" x="242" y="677"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_94D7_26E6E451AF0C" x="242" y="724"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_F40E_4a51_94D7_26E6E451AF0C" x="484" y="724"/>
 			</ownedElement>
@@ -14936,8 +15441,8 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_F40E_4a51_9BBA_3C0E1D4E25A8" x="755" y="336"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BA4823EC_F40E_4a51_B489_096BF3AE570A" source="EAID_E7437025_771F_4143_BE33_620A29646687" target="EAID_D46376EC_6B98_4926_8627_A594E6819D78" modelElement="EAID_C9140D6A_9EC6_4bc0_B489_096BF3AE570A">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_B489_096BF3AE570A" x="553" y="243"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_B489_096BF3AE570A" x="283" y="243"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_B489_096BF3AE570A" x="553" y="242"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_B489_096BF3AE570A" x="292" y="242"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BA4823EC_F40E_4a51_82EA_14ABA20458B6" source="EAID_E7437025_771F_4143_BE33_620A29646687" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_547A511C_F377_4405_82EA_14ABA20458B6">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F40E_4a51_82EA_14ABA20458B6" text="+epo:hasAwardedValue" modelElement="EAID_dst7A511C_F377_4405_82EA_14ABA20458B6">
@@ -14974,8 +15479,8 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_F40E_4a51_BB1A_167306D6B16C" x="751" y="726"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BA4823EC_F40E_4a51_BCAE_F8C1CC7880E0" source="EAID_E7437025_771F_4143_BE33_620A29646687" target="EAID_B63C4BE8_86E2_494f_AB88_882E3568B3F0" modelElement="EAID_50DC56C3_14A4_46c6_BCAE_F8C1CC7880E0">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_BCAE_F8C1CC7880E0" x="553" y="284"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_BCAE_F8C1CC7880E0" x="283" y="284"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_BCAE_F8C1CC7880E0" x="553" y="285"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_BCAE_F8C1CC7880E0" x="292" y="285"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_5C2AE103_DF65_4cef_9BB7_4551850E9016" isFrame="false" modelElement="EAPK_A1BB437B_AD73_4f28_B11F_4B624C467CDA">
@@ -15326,149 +15831,157 @@
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_9733D0B6_5004_4cc0_BF32_0BF92C0A41A3" isFrame="false" modelElement="EAPK_A1BB437B_AD73_4f28_B11F_4B624C467CDA">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9733D0B6_5004_4cc0_B51B_9E700090C968" modelElement="EAID_1062E1ED_D094_425e_B51B_9E700090C968">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5004_4cc0_B51B_9E700090C968" text="epo:ProcurementProcessInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_B51B_9E700090C968" x="1185" y="346" width="222" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_B51B_9E700090C968" x="1300" y="340" width="222" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9733D0B6_5004_4cc0_9D1A_0FFBB894F5CC" modelElement="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5004_4cc0_9D1A_0FFBB894F5CC" text="epo:ChangeInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_9D1A_0FFBB894F5CC" x="1221" y="204" width="283" height="101"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_9D1A_0FFBB894F5CC" x="1386" y="219" width="283" height="101"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9733D0B6_5004_4cc0_94AC_B4EC57A6B248" modelElement="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5004_4cc0_94AC_B4EC57A6B248" text="epo:NoticeAwardInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_94AC_B4EC57A6B248" x="834" y="369" width="144" height="46"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_94AC_B4EC57A6B248" x="999" y="384" width="144" height="46"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9733D0B6_5004_4cc0_828D_74E22D192897" modelElement="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5004_4cc0_828D_74E22D192897" text="epo:Estimate"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_828D_74E22D192897" x="222" y="119" width="90" height="40"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_828D_74E22D192897" x="294" y="133" width="90" height="40"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9733D0B6_5004_4cc0_AFCB_7D5D95D51A5A" modelElement="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5004_4cc0_AFCB_7D5D95D51A5A" text="epo:ReviewIrregularitySummary"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_AFCB_7D5D95D51A5A" x="620" y="267" width="204" height="59"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_AFCB_7D5D95D51A5A" x="785" y="282" width="204" height="59"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9733D0B6_5004_4cc0_B2BD_3FD3B49365EE" modelElement="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5004_4cc0_B2BD_3FD3B49365EE" text="epo:ContractLotCompletionInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_B2BD_3FD3B49365EE" x="942" y="438" width="298" height="46"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_B2BD_3FD3B49365EE" x="1203" y="457" width="298" height="46"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9733D0B6_5004_4cc0_A416_3E77939F9B7A" modelElement="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5004_4cc0_A416_3E77939F9B7A" text="epo:LotAwardOutcome"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_A416_3E77939F9B7A" x="1741" y="277" width="258" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_A416_3E77939F9B7A" x="1906" y="292" width="258" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9733D0B6_5004_4cc0_B152_611B940C8A5E" modelElement="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5004_4cc0_B152_611B940C8A5E" text="epo:SubcontractingEstimate"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_B152_611B940C8A5E" x="270" y="212" width="220" height="85"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_B152_611B940C8A5E" x="324" y="219" width="268" height="101"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9733D0B6_5004_4cc0_BAEA_9843D331872F" modelElement="EAID_4F81C811_16F5_4332_BAEA_9843D331872F">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5004_4cc0_BAEA_9843D331872F" text="epo:StatisticalInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_BAEA_9843D331872F" x="656" y="157" width="132" height="55"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_BAEA_9843D331872F" x="821" y="172" width="132" height="55"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9733D0B6_5004_4cc0_B4D4_D8AE4F96B00B" modelElement="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5004_4cc0_B4D4_D8AE4F96B00B" text="epo:TenderAwardOutcome"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_B4D4_D8AE4F96B00B" x="1954" y="175" width="178" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_B4D4_D8AE4F96B00B" x="2119" y="190" width="178" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9733D0B6_5004_4cc0_8C71_E7FB3B4F88F0" modelElement="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5004_4cc0_8C71_E7FB3B4F88F0" text="epo:ContextDescription"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_8C71_E7FB3B4F88F0" x="825" y="11" width="176" height="44"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_8C71_E7FB3B4F88F0" x="990" y="26" width="176" height="44"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9733D0B6_5004_4cc0_A531_93ABFC476500" modelElement="EAID_92AE6E92_3A20_4642_A531_93ABFC476500">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5004_4cc0_A531_93ABFC476500" text="epo:ReviewRequestSummary"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_A531_93ABFC476500" x="537" y="345" width="248" height="59"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_A531_93ABFC476500" x="702" y="360" width="248" height="59"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9733D0B6_5004_4cc0_8C56_63A3A737F49A" modelElement="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5004_4cc0_8C56_63A3A737F49A" text="epo:SubmissionStatisticalInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_8C56_63A3A737F49A" x="210" y="345" width="315" height="270"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_8C56_63A3A737F49A" x="375" y="360" width="315" height="270"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9733D0B6_5004_4cc0_A2E2_DE976E538481" modelElement="EAID_B2165393_B24C_4dd7_A2E2_DE976E538481">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5004_4cc0_A2E2_DE976E538481" text="epo:ContextualProjection"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_A2E2_DE976E538481" x="1779" y="11" width="167" height="44"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_A2E2_DE976E538481" x="1944" y="26" width="167" height="44"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9733D0B6_5004_4cc0_80CC_7E68CBDEDED2" modelElement="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5004_4cc0_80CC_7E68CBDEDED2" text="epo:LotGroupAwardInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_80CC_7E68CBDEDED2" x="726" y="431" width="151" height="32"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_80CC_7E68CBDEDED2" x="891" y="446" width="151" height="32"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9733D0B6_5004_4cc0_BE33_620A29646687" modelElement="EAID_E7437025_771F_4143_BE33_620A29646687">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5004_4cc0_BE33_620A29646687" text="epo:AwardOutcome"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_BE33_620A29646687" x="1672" y="175" width="120" height="40"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_BE33_620A29646687" x="1837" y="190" width="120" height="40"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9733D0B6_5004_4cc0_AD48_245A5F11A4D5" modelElement="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5004_4cc0_AD48_245A5F11A4D5" text="epo:MiniCompetitionAwardOutcome"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_AD48_245A5F11A4D5" x="1530" y="277" width="176" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_AD48_245A5F11A4D5" x="1695" y="292" width="176" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9733D0B6_5004_4cc0_B727_BC88B30CF43C" modelElement="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5004_4cc0_B727_BC88B30CF43C" text="epo:ConcessionEstimate"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_B727_BC88B30CF43C" x="23" y="220" width="220" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_B727_BC88B30CF43C" x="54" y="235" width="220" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9733D0B6_5004_4cc0_8914_2046342E8F96" modelElement="EAID_3E3C6304_E823_43a1_8914_2046342E8F96">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5004_4cc0_8914_2046342E8F96" text="epo:NonPublishedInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_8914_2046342E8F96" x="1239" y="104" width="248" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_8914_2046342E8F96" x="1404" y="119" width="248" height="70"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9733D0B6_5004_4cc0_B3E4_2E8899DEDCE9" source="EAID_E7437025_771F_4143_BE33_620A29646687" target="EAID_B2165393_B24C_4dd7_A2E2_DE976E538481" modelElement="EAID_C3A36A4B_DBA9_4b46_B3E4_2E8899DEDCE9">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_B3E4_2E8899DEDCE9" x="1748" y="175"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_B3E4_2E8899DEDCE9" x="1844" y="55"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9733D0B6_5004_4cc0_9F7F_F93BA82536E7" modelElement="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5004_4cc0_9F7F_F93BA82536E7" text="epo-con:ContractModificationInformation"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_9F7F_F93BA82536E7" x="1032" y="532" width="268" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9733D0B6_5004_4cc0_9BBA_3C0E1D4E25A8" source="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" target="EAID_E7437025_771F_4143_BE33_620A29646687" modelElement="EAID_36C907D3_6701_4489_9BBA_3C0E1D4E25A8">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_9BBA_3C0E1D4E25A8" x="1813" y="292"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_9BBA_3C0E1D4E25A8" x="1876" y="230"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9733D0B6_5004_4cc0_8B13_015B01092BC2" source="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" target="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0" modelElement="EAID_5ACD6A3D_7AA3_4504_8B13_015B01092BC2">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_8B13_015B01092BC2" x="805" y="431"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_8B13_015B01092BC2" x="907" y="55"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_8B13_015B01092BC2" x="970" y="446"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_8B13_015B01092BC2" x="1072" y="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9733D0B6_5004_4cc0_ADDD_37AEDF27D9E0" source="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" target="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0" modelElement="EAID_5C3A7045_BE74_49aa_ADDD_37AEDF27D9E0">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_ADDD_37AEDF27D9E0" x="909" y="369"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_ADDD_37AEDF27D9E0" x="921" y="55"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_ADDD_37AEDF27D9E0" x="1074" y="384"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_ADDD_37AEDF27D9E0" x="1086" y="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9733D0B6_5004_4cc0_AF6E_5DFBB174C5FA" source="EAID_92AE6E92_3A20_4642_A531_93ABFC476500" target="EAID_4F81C811_16F5_4332_BAEA_9843D331872F" modelElement="EAID_3777662E_A9D8_4d59_AF6E_5DFBB174C5FA">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_AF6E_5DFBB174C5FA" x="585" y="345"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_AF6E_5DFBB174C5FA" x="585" y="208"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5004_4cc0_AF6E_5DFBB174C5FA" x="656" y="208"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_AF6E_5DFBB174C5FA" x="750" y="360"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_AF6E_5DFBB174C5FA" x="750" y="223"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5004_4cc0_AF6E_5DFBB174C5FA" x="821" y="223"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9733D0B6_5004_4cc0_AB2C_BEEC4E3BED13" source="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E" target="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897" modelElement="EAID_D24BB7D7_DC9F_43ad_AB2C_BEEC4E3BED13">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_AB2C_BEEC4E3BED13" x="338" y="212"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_AB2C_BEEC4E3BED13" x="286" y="159"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_AB2C_BEEC4E3BED13" x="406" y="219"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_AB2C_BEEC4E3BED13" x="359" y="173"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9733D0B6_5004_4cc0_B440_E1E735697188" source="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A" target="EAID_4F81C811_16F5_4332_BAEA_9843D331872F" modelElement="EAID_484BA28E_0C28_4b4b_B440_E1E735697188">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_B440_E1E735697188" x="719" y="267"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_B440_E1E735697188" x="719" y="212"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_B440_E1E735697188" x="884" y="282"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_B440_E1E735697188" x="884" y="227"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9733D0B6_5004_4cc0_8EBE_A60BD8ED070A" source="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" target="EAID_E7437025_771F_4143_BE33_620A29646687" modelElement="EAID_F241B2E1_47C3_4512_8EBE_A60BD8ED070A">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_8EBE_A60BD8ED070A" x="1998" y="292"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_8EBE_A60BD8ED070A" x="1921" y="230"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9733D0B6_5004_4cc0_AF5F_9D6CCD87E6A1" source="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" target="EAID_4F81C811_16F5_4332_BAEA_9843D331872F" modelElement="EAID_31D3A42A_B28E_449d_AF5F_9D6CCD87E6A1">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_AF5F_9D6CCD87E6A1" x="503" y="345"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_AF5F_9D6CCD87E6A1" x="503" y="173"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5004_4cc0_AF5F_9D6CCD87E6A1" x="656" y="173"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_AF5F_9D6CCD87E6A1" x="637" y="360"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_AF5F_9D6CCD87E6A1" x="637" y="189"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5004_4cc0_AF5F_9D6CCD87E6A1" x="821" y="189"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9733D0B6_5004_4cc0_9EE2_203242F5A4D8" source="EAID_1062E1ED_D094_425e_B51B_9E700090C968" target="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0" modelElement="EAID_450148E7_98E2_4642_9EE2_203242F5A4D8">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_9EE2_203242F5A4D8" x="1189" y="346"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_9EE2_203242F5A4D8" x="966" y="55"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9733D0B6_5004_4cc0_B3E4_2E8899DEDCE9" source="EAID_E7437025_771F_4143_BE33_620A29646687" target="EAID_B2165393_B24C_4dd7_A2E2_DE976E538481" modelElement="EAID_C3A36A4B_DBA9_4b46_B3E4_2E8899DEDCE9">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_B3E4_2E8899DEDCE9" x="1913" y="190"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_B3E4_2E8899DEDCE9" x="2009" y="70"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9733D0B6_5004_4cc0_9BBA_3C0E1D4E25A8" source="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" target="EAID_E7437025_771F_4143_BE33_620A29646687" modelElement="EAID_36C907D3_6701_4489_9BBA_3C0E1D4E25A8">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_9BBA_3C0E1D4E25A8" x="1648" y="277"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_9BBA_3C0E1D4E25A8" x="1711" y="215"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9733D0B6_5004_4cc0_9EE2_203242F5A4D8" source="EAID_1062E1ED_D094_425e_B51B_9E700090C968" target="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0" modelElement="EAID_450148E7_98E2_4642_9EE2_203242F5A4D8">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_9EE2_203242F5A4D8" x="1378" y="340"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_9EE2_203242F5A4D8" x="1131" y="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9733D0B6_5004_4cc0_A2A4_E3D451902197" source="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" target="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897" modelElement="EAID_F08185C3_E8E6_4c0c_A2A4_E3D451902197">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_A2A4_E3D451902197" x="173" y="220"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_A2A4_E3D451902197" x="243" y="159"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_A2A4_E3D451902197" x="216" y="235"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_A2A4_E3D451902197" x="309" y="173"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9733D0B6_5004_4cc0_B76D_8B1B3FFE038A" source="EAID_3E3C6304_E823_43a1_8914_2046342E8F96" target="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0" modelElement="EAID_7D7F08FC_F309_4a60_B76D_8B1B3FFE038A">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_B76D_8B1B3FFE038A" x="1239" y="109"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_B76D_8B1B3FFE038A" x="1001" y="53"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_B76D_8B1B3FFE038A" x="1404" y="124"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_B76D_8B1B3FFE038A" x="1166" y="68"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9733D0B6_5004_4cc0_AD13_CFEBA70F68FD" source="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7" target="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0" modelElement="EAID_D144C8C1_24F9_4de5_AD13_CFEBA70F68FD">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_AD13_CFEBA70F68FD" x="1175" y="532"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_AD13_CFEBA70F68FD" x="1099" y="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9733D0B6_5004_4cc0_A132_FC5F510A59ED" source="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" target="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0" modelElement="EAID_1DAFA4D2_EE54_4246_A132_FC5F510A59ED">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_A132_FC5F510A59ED" x="1221" y="255"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_A132_FC5F510A59ED" x="981" y="55"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_A132_FC5F510A59ED" x="1386" y="270"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_A132_FC5F510A59ED" x="1146" y="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9733D0B6_5004_4cc0_9685_286F5A33ED5A" source="EAID_4F81C811_16F5_4332_BAEA_9843D331872F" target="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0" modelElement="EAID_356035E1_7546_4bda_9685_286F5A33ED5A">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_9685_286F5A33ED5A" x="756" y="157"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_9685_286F5A33ED5A" x="885" y="55"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_9685_286F5A33ED5A" x="921" y="172"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_9685_286F5A33ED5A" x="1050" y="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9733D0B6_5004_4cc0_938A_6ECEC8F64316" source="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897" target="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0" modelElement="EAID_C1CAAF14_976F_4d28_938A_6ECEC8F64316">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_938A_6ECEC8F64316" x="312" y="146"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_938A_6ECEC8F64316" x="844" y="55"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_938A_6ECEC8F64316" x="384" y="160"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_938A_6ECEC8F64316" x="1009" y="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9733D0B6_5004_4cc0_BBB2_994F422EB5DD" source="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B" target="EAID_B2165393_B24C_4dd7_A2E2_DE976E538481" modelElement="EAID_C3A99946_EA61_4bb4_BBB2_994F422EB5DD">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_BBB2_994F422EB5DD" x="2021" y="175"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_BBB2_994F422EB5DD" x="1898" y="55"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_BBB2_994F422EB5DD" x="2186" y="190"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_BBB2_994F422EB5DD" x="2063" y="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9733D0B6_5004_4cc0_83CF_1BD4AAE5F1B9" source="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" target="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0" modelElement="EAID_CAF4D83B_854B_440e_83CF_1BD4AAE5F1B9">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_83CF_1BD4AAE5F1B9" x="1055" y="438"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_83CF_1BD4AAE5F1B9" x="951" y="55"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9733D0B6_5004_4cc0_8EBE_A60BD8ED070A" source="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" target="EAID_E7437025_771F_4143_BE33_620A29646687" modelElement="EAID_F241B2E1_47C3_4512_8EBE_A60BD8ED070A">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_8EBE_A60BD8ED070A" x="1833" y="277"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_8EBE_A60BD8ED070A" x="1756" y="215"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5004_4cc0_83CF_1BD4AAE5F1B9" x="1312" y="457"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5004_4cc0_83CF_1BD4AAE5F1B9" x="1116" y="70"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_F9A67D0E_2ACB_45b8_833F_A797EB7E372E" isFrame="false" modelElement="EAPK_A1BB437B_AD73_4f28_B11F_4B624C467CDA">
@@ -15757,7 +16270,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_86147DF4_1EF7_40c5_AD7B_7484B8FDA398" modelElement="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1EF7_40c5_AD7B_7484B8FDA398" text="adms:Identifier"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1EF7_40c5_AD7B_7484B8FDA398" x="1257" y="226" width="216" height="86"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1EF7_40c5_AD7B_7484B8FDA398" x="1194" y="181" width="216" height="86"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_86147DF4_1EF7_40c5_9787_B6F389BACA6B" modelElement="EAID_F72FB743_EDB9_4511_9787_B6F389BACA6B">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1EF7_40c5_9787_B6F389BACA6B" text="epo:RequestForParticipation"/>
@@ -15777,7 +16290,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_86147DF4_1EF7_40c5_A758_C201E2EDE124" modelElement="EAID_4AE23ED9_1639_41e0_A758_C201E2EDE124">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1EF7_40c5_A758_C201E2EDE124" text="epo:ElectronicSignature"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1EF7_40c5_A758_C201E2EDE124" x="732" y="31" width="184" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1EF7_40c5_A758_C201E2EDE124" x="732" y="56" width="184" height="45"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_86147DF4_1EF7_40c5_AB49_BF3DDBFF4E66" modelElement="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_1EF7_40c5_AB49_BF3DDBFF4E66" text="enumeration"/>
@@ -15802,7 +16315,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_86147DF4_1EF7_40c5_8372_75A07B6AB066" modelElement="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1EF7_40c5_8372_75A07B6AB066" text="epo:Contract"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1EF7_40c5_8372_75A07B6AB066" x="1257" y="330" width="216" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1EF7_40c5_8372_75A07B6AB066" x="1181" y="291" width="216" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_86147DF4_1EF7_40c5_9BAC_28A7FEB05838" modelElement="EAID_23E9784F_4AEE_4484_9BAC_28A7FEB05838">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1EF7_40c5_9BAC_28A7FEB05838" text="epo:OriginatorRequest"/>
@@ -15813,9 +16326,19 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1EF7_40c5_A2CC_FA90C006C282" text="at-voc:notice-type"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1EF7_40c5_A2CC_FA90C006C282" x="91" y="382" width="90" height="60"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_86147DF4_1EF7_40c5_84A8_24E86C3ED8AF" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90" modelElement="EAID_6A9FC4EC_D843_4ffe_84A8_24E86C3ED8AF">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_84A8_24E86C3ED8AF" x="693" y="322"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_84A8_24E86C3ED8AF" x="560" y="322"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_86147DF4_1EF7_40c5_8018_10297955785C" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_39F3583F_0D40_4e9f_8018_10297955785C">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1EF7_40c5_8018_10297955785C" text="+epo:associatedWith 0..*" modelElement="EAID_dstF3583F_0D40_4e9f_8018_10297955785C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1EF7_40c5_8018_10297955785C" x="587" y="198" width="103" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1EF7_40c5_8018_10297955785C" text="0..*" modelElement="EAID_dstF3583F_0D40_4e9f_8018_10297955785C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1EF7_40c5_8018_10297955785C" x="690" y="248" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_8018_10297955785C" x="693" y="194"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_8018_10297955785C" x="693" y="194"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1EF7_40c5_8018_10297955785C" x="649" y="194"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_1EF7_40c5_8018_10297955785C" x="649" y="243"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_1EF7_40c5_8018_10297955785C" x="693" y="243"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_1EF7_40c5_8018_10297955785C" x="693" y="243"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_86147DF4_1EF7_40c5_A3F4_443665C43EB4" source="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_B0961C3B_3C3E_4c2a_A3F4_443665C43EB4">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_A3F4_443665C43EB4" x="670" y="658"/>
@@ -15830,8 +16353,8 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_B74D_B5F732EECD28" x="867" y="386"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_86147DF4_1EF7_40c5_B308_C0F08C743DCF" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_97C17D51_4DF6_4979_B308_C0F08C743DCF">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_B308_C0F08C743DCF" x="1257" y="358"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_B308_C0F08C743DCF" x="955" y="312"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_B308_C0F08C743DCF" x="1181" y="325"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_B308_C0F08C743DCF" x="955" y="304"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_86147DF4_1EF7_40c5_BE12_0A7FCD4C34D2" source="EAID_23E9784F_4AEE_4484_9BAC_28A7FEB05838" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_8521EFF6_74EA_47a5_BE12_0A7FCD4C34D2">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_BE12_0A7FCD4C34D2" x="1130" y="381"/>
@@ -15843,23 +16366,23 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_86147DF4_1EF7_40c5_99CE_63F041A42F06" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_3AA2C83C_532C_460c_99CE_63F041A42F06">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1EF7_40c5_99CE_63F041A42F06" text="+adms:identifier" modelElement="EAID_dstA2C83C_532C_460c_99CE_63F041A42F06">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1EF7_40c5_99CE_63F041A42F06" x="1165" y="225" width="66" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1EF7_40c5_99CE_63F041A42F06" x="1102" y="185" width="66" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1EF7_40c5_99CE_63F041A42F06" text="0..*" modelElement="EAID_dstA2C83C_532C_460c_99CE_63F041A42F06">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1EF7_40c5_99CE_63F041A42F06" x="1238" y="247" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1EF7_40c5_99CE_63F041A42F06" x="1175" y="207" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_99CE_63F041A42F06" x="955" y="242"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_99CE_63F041A42F06" x="1257" y="242"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_99CE_63F041A42F06" x="955" y="202"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_99CE_63F041A42F06" x="1194" y="202"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_86147DF4_1EF7_40c5_B93C_EED975A6974F" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_1BEBAC59_19C6_4908_B93C_EED975A6974F">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1EF7_40c5_B93C_EED975A6974F" text="+epo:hasUUID" modelElement="EAID_dstEBAC59_19C6_4908_B93C_EED975A6974F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1EF7_40c5_B93C_EED975A6974F" x="1175" y="272" width="59" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1EF7_40c5_B93C_EED975A6974F" x="1112" y="231" width="59" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1EF7_40c5_B93C_EED975A6974F" text="0..1" modelElement="EAID_dstEBAC59_19C6_4908_B93C_EED975A6974F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1EF7_40c5_B93C_EED975A6974F" x="1238" y="295" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1EF7_40c5_B93C_EED975A6974F" x="1175" y="254" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_B93C_EED975A6974F" x="955" y="290"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_B93C_EED975A6974F" x="1257" y="290"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_B93C_EED975A6974F" x="955" y="249"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_B93C_EED975A6974F" x="1194" y="249"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_86147DF4_1EF7_40c5_BCF0_75001B7FF4D0" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_4AE23ED9_1639_41e0_A758_C201E2EDE124" modelElement="EAID_B1894735_8A0D_4eae_BCF0_75001B7FF4D0">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1EF7_40c5_BCF0_75001B7FF4D0" text="+epo:hasElectronicSignature" modelElement="EAID_dst894735_8A0D_4eae_BCF0_75001B7FF4D0">
@@ -15871,32 +16394,32 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_BCF0_75001B7FF4D0" x="824" y="181"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_BCF0_75001B7FF4D0" x="824" y="101"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_86147DF4_1EF7_40c5_B8FF_34E21440DAD9" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1EF7_40c5_B8FF_34E21440DAD9" text="+epo:refersToPrevious 0..*" modelElement="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1EF7_40c5_B8FF_34E21440DAD9" x="645" y="126" width="109" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1EF7_40c5_B8FF_34E21440DAD9" text="0..*" modelElement="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1EF7_40c5_B8FF_34E21440DAD9" x="715" y="176" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_B8FF_34E21440DAD9" x="760" y="181"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_B8FF_34E21440DAD9" x="760" y="181"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1EF7_40c5_B8FF_34E21440DAD9" x="760" y="147"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_1EF7_40c5_B8FF_34E21440DAD9" x="707" y="147"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_1EF7_40c5_B8FF_34E21440DAD9" x="707" y="181"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_1EF7_40c5_B8FF_34E21440DAD9" x="707" y="181"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_86147DF4_1EF7_40c5_B845_A73F67127C06" source="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_43A3B220_8C42_4627_B845_A73F67127C06">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_B845_A73F67127C06" x="705" y="466"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_B845_A73F67127C06" x="763" y="386"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_86147DF4_1EF7_40c5_BA0E_2B284F62AB15" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90" modelElement="EAID_AF2EA1D0_30FA_474c_BA0E_2B284F62AB15">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_BA0E_2B284F62AB15" x="693" y="283"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_BA0E_2B284F62AB15" x="560" y="283"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_86147DF4_1EF7_40c5_84A8_24E86C3ED8AF" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90" modelElement="EAID_6A9FC4EC_D843_4ffe_84A8_24E86C3ED8AF">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_84A8_24E86C3ED8AF" x="693" y="322"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_84A8_24E86C3ED8AF" x="560" y="322"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_86147DF4_1EF7_40c5_94A0_32241C0F50CE" source="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_A6577BAD_B1CB_4608_94A0_32241C0F50CE">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_94A0_32241C0F50CE" x="554" y="492"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_94A0_32241C0F50CE" x="693" y="369"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_86147DF4_1EF7_40c5_8018_10297955785C" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_39F3583F_0D40_4e9f_8018_10297955785C">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1EF7_40c5_8018_10297955785C" text="+epo:associatedWith 0..*" modelElement="EAID_dstF3583F_0D40_4e9f_8018_10297955785C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1EF7_40c5_8018_10297955785C" x="587" y="198" width="103" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1EF7_40c5_8018_10297955785C" text="0..*" modelElement="EAID_dstF3583F_0D40_4e9f_8018_10297955785C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1EF7_40c5_8018_10297955785C" x="690" y="248" width="100" height="10"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_8018_10297955785C" x="693" y="194"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_8018_10297955785C" x="693" y="194"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1EF7_40c5_8018_10297955785C" x="649" y="194"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_1EF7_40c5_8018_10297955785C" x="649" y="243"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_1EF7_40c5_8018_10297955785C" x="693" y="243"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_1EF7_40c5_8018_10297955785C" x="693" y="243"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_86147DF4_1EF7_40c5_B72E_BC6C99FF3009" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1EF7_40c5_B72E_BC6C99FF3009" text="+epo:hasElectronicDigest 0..*" modelElement="EAID_dstE6AD20_DD67_4f31_B72E_BC6C99FF3009">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1EF7_40c5_B72E_BC6C99FF3009" x="884" y="135" width="119" height="14"/>
@@ -15940,7 +16463,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_86147DF4_1EF7_40c5_BE52_91F3F7270840" source="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_7EE70932_F57C_4861_BE52_91F3F7270840">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1EF7_40c5_BE52_91F3F7270840" text="+epo:refersToNotice 0..1" modelElement="EAID_dstE70932_F57C_4861_BE52_91F3F7270840">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1EF7_40c5_BE52_91F3F7270840" x="409" y="441" width="100" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1EF7_40c5_BE52_91F3F7270840" x="410" y="461" width="100" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1EF7_40c5_BE52_91F3F7270840" text="0..1" modelElement="EAID_dstE70932_F57C_4861_BE52_91F3F7270840">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1EF7_40c5_BE52_91F3F7270840" x="430" y="487" width="100" height="10"/>
@@ -15970,25 +16493,15 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_BD98_F885B35FD24B" x="398" y="697"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1EF7_40c5_BD98_F885B35FD24B" x="181" y="697"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_86147DF4_1EF7_40c5_B8FF_34E21440DAD9" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1EF7_40c5_B8FF_34E21440DAD9" text="+epo:refersToPrevious 0..*" modelElement="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1EF7_40c5_B8FF_34E21440DAD9" x="645" y="126" width="109" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1EF7_40c5_B8FF_34E21440DAD9" text="0..*" modelElement="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1EF7_40c5_B8FF_34E21440DAD9" x="715" y="176" width="100" height="10"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_B8FF_34E21440DAD9" x="760" y="181"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_B8FF_34E21440DAD9" x="760" y="181"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1EF7_40c5_B8FF_34E21440DAD9" x="760" y="147"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_1EF7_40c5_B8FF_34E21440DAD9" x="707" y="147"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_1EF7_40c5_B8FF_34E21440DAD9" x="707" y="181"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_1EF7_40c5_B8FF_34E21440DAD9" x="707" y="181"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_86147DF4_1EF7_40c5_BA0E_2B284F62AB15" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90" modelElement="EAID_AF2EA1D0_30FA_474c_BA0E_2B284F62AB15">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_BA0E_2B284F62AB15" x="693" y="283"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_BA0E_2B284F62AB15" x="560" y="283"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_E7ED5A9A_0713_4b4f_9DED_4C911545B779" isFrame="false" modelElement="EAPK_94194397_D26C_4972_AE3E_34F5B925DA64">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_E7ED5A9A_0713_4b4f_943D_6D37C8C9B3F8" modelElement="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0713_4b4f_943D_6D37C8C9B3F8" text="epo:PurchaseContract"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0713_4b4f_943D_6D37C8C9B3F8" x="238" y="712" width="231" height="49"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0713_4b4f_943D_6D37C8C9B3F8" x="238" y="727" width="231" height="30"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_E7ED5A9A_0713_4b4f_8663_0B6367844B1B" modelElement="EAID_20289A3C_51F0_43b4_8663_0B6367844B1B">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0713_4b4f_8663_0B6367844B1B" text="epo:ConcessionContract"/>
@@ -16012,7 +16525,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_E7ED5A9A_0713_4b4f_8815_FCBD5BE7E029" modelElement="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0713_4b4f_8815_FCBD5BE7E029" text="epo:FrameworkAgreement"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0713_4b4f_8815_FCBD5BE7E029" x="337" y="622" width="132" height="36"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0713_4b4f_8815_FCBD5BE7E029" x="337" y="639" width="132" height="36"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_E7ED5A9A_0713_4b4f_8372_75A07B6AB066" modelElement="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0713_4b4f_8372_75A07B6AB066" text="epo:Contract"/>
@@ -16045,7 +16558,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_E7ED5A9A_0713_4b4f_B217_37E957B3B448" modelElement="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0713_4b4f_B217_37E957B3B448" text="epo:Document"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0713_4b4f_B217_37E957B3B448" x="643" y="303" width="184" height="140"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0713_4b4f_B217_37E957B3B448" x="643" y="303" width="195" height="140"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_E7ED5A9A_0713_4b4f_B311_4F37313BAEF6" modelElement="EAID_E55F2451_5826_4907_B311_4F37313BAEF6">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_0713_4b4f_B311_4F37313BAEF6" text="enumeration"/>
@@ -16080,7 +16593,7 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0713_4b4f_99CE_63F041A42F06" text="0..*" modelElement="EAID_dstA2C83C_532C_460c_99CE_63F041A42F06">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0713_4b4f_99CE_63F041A42F06" x="1057" y="349" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0713_4b4f_99CE_63F041A42F06" x="827" y="344"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0713_4b4f_99CE_63F041A42F06" x="838" y="344"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0713_4b4f_99CE_63F041A42F06" x="1076" y="344"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7ED5A9A_0713_4b4f_ABF2_BA01D9E3FEE4" source="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07" target="EAID_E55F2451_5826_4907_B311_4F37313BAEF6" modelElement="EAID_95D11AFD_5F07_4159_ABF2_BA01D9E3FEE4">
@@ -16126,8 +16639,8 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0713_4b4f_B72E_BC6C99FF3009" text="0..*" modelElement="EAID_dstE6AD20_DD67_4f31_B72E_BC6C99FF3009">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0713_4b4f_B72E_BC6C99FF3009" x="820" y="298" width="100" height="10"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0713_4b4f_B72E_BC6C99FF3009" x="827" y="322"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0713_4b4f_B72E_BC6C99FF3009" x="827" y="322"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0713_4b4f_B72E_BC6C99FF3009" x="838" y="322"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0713_4b4f_B72E_BC6C99FF3009" x="838" y="322"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0713_4b4f_B72E_BC6C99FF3009" x="848" y="322"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_0713_4b4f_B72E_BC6C99FF3009" x="848" y="284"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_0713_4b4f_B72E_BC6C99FF3009" x="812" y="284"/>
@@ -16167,7 +16680,7 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0713_4b4f_B93C_EED975A6974F" text="0..1" modelElement="EAID_dstEBAC59_19C6_4908_B93C_EED975A6974F">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0713_4b4f_B93C_EED975A6974F" x="1057" y="392" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0713_4b4f_B93C_EED975A6974F" x="827" y="387"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0713_4b4f_B93C_EED975A6974F" x="838" y="387"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0713_4b4f_B93C_EED975A6974F" x="1076" y="387"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7ED5A9A_0713_4b4f_A5D7_18A876BF10CF" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" modelElement="EAID_EEE75552_13BB_48c2_A5D7_18A876BF10CF">
@@ -16233,8 +16746,9 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_0713_4b4f_B8FF_34E21440DAD9" x="701" y="303"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7ED5A9A_0713_4b4f_8447_5E708FAB9D5A" source="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029" target="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" modelElement="EAID_AAE5061F_F0FE_4ca1_8447_5E708FAB9D5A">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0713_4b4f_8447_5E708FAB9D5A" x="460" y="622"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0713_4b4f_8447_5E708FAB9D5A" x="460" y="547"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0713_4b4f_8447_5E708FAB9D5A" x="393" y="639"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0713_4b4f_8447_5E708FAB9D5A" x="393" y="535"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0713_4b4f_8447_5E708FAB9D5A" x="448" y="535"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7ED5A9A_0713_4b4f_8F21_8256FE25DBAC" source="EAID_3B0D0A49_89AC_495b_B909_CD8CC73898DE" target="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" modelElement="EAID_57BA1AAE_EBFD_419c_8F21_8256FE25DBAC">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0713_4b4f_8F21_8256FE25DBAC" text="+epo:resultsFromLotAwardOutcome" modelElement="EAID_dstBA1AAE_EBFD_419c_8F21_8256FE25DBAC">
@@ -16286,7 +16800,7 @@
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7ED5A9A_0713_4b4f_A3F4_443665C43EB4" source="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_B0961C3B_3C3E_4c2a_A3F4_443665C43EB4">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0713_4b4f_A3F4_443665C43EB4" x="901" y="462"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0713_4b4f_A3F4_443665C43EB4" x="901" y="406"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0713_4b4f_A3F4_443665C43EB4" x="827" y="406"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0713_4b4f_A3F4_443665C43EB4" x="838" y="406"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7ED5A9A_0713_4b4f_A730_696A39D2224E" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" modelElement="EAID_C741BADB_0CAC_40d5_A730_696A39D2224E">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0713_4b4f_A730_696A39D2224E" text="+epo:hasEstimatedDuration" modelElement="EAID_dst41BADB_0CAC_40d5_A730_696A39D2224E">
@@ -16299,8 +16813,8 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0713_4b4f_A730_696A39D2224E" x="318" y="502"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7ED5A9A_0713_4b4f_9458_83E0C40CEC9A" source="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8" target="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" modelElement="EAID_3675E499_10A4_457e_9458_83E0C40CEC9A">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0713_4b4f_9458_83E0C40CEC9A" x="469" y="731"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0713_4b4f_9458_83E0C40CEC9A" x="490" y="731"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0713_4b4f_9458_83E0C40CEC9A" x="469" y="744"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0713_4b4f_9458_83E0C40CEC9A" x="490" y="744"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0713_4b4f_9458_83E0C40CEC9A" x="490" y="547"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7ED5A9A_0713_4b4f_8C14_7C6DA83E8A46" source="EAID_3B0D0A49_89AC_495b_B909_CD8CC73898DE" target="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" modelElement="EAID_7F8C9069_9D3F_4494_8C14_7C6DA83E8A46">
@@ -16309,14 +16823,14 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7ED5A9A_0713_4b4f_B7E7_D176E6996280" source="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029" target="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" modelElement="EAID_A96B5FDE_85B9_4435_B7E7_D176E6996280">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0713_4b4f_B7E7_D176E6996280" text="+epo:resultsFromLotAwardOutcome" modelElement="EAID_dst6B5FDE_85B9_4435_B7E7_D176E6996280">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0713_4b4f_B7E7_D176E6996280" x="710" y="709" width="146" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0713_4b4f_B7E7_D176E6996280" x="708" y="709" width="146" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0713_4b4f_B7E7_D176E6996280" text="0..*" modelElement="EAID_dst6B5FDE_85B9_4435_B7E7_D176E6996280">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0713_4b4f_B7E7_D176E6996280" x="806" y="724" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0713_4b4f_B7E7_D176E6996280" x="804" y="724" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0713_4b4f_B7E7_D176E6996280" x="469" y="651"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0713_4b4f_B7E7_D176E6996280" x="798" y="651"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0713_4b4f_B7E7_D176E6996280" x="798" y="742"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0713_4b4f_B7E7_D176E6996280" x="469" y="660"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0713_4b4f_B7E7_D176E6996280" x="796" y="660"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0713_4b4f_B7E7_D176E6996280" x="796" y="742"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7ED5A9A_0713_4b4f_B308_C0F08C743DCF" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_97C17D51_4DF6_4979_B308_C0F08C743DCF">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0713_4b4f_B308_C0F08C743DCF" x="616" y="457"/>
@@ -16369,13 +16883,13 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7ED5A9A_0713_4b4f_95EB_23D106ED6921" source="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8" target="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029" modelElement="EAID_D68065CA_2D18_479d_95EB_23D106ED6921">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0713_4b4f_95EB_23D106ED6921" text="+epo:followsRulesSetBy" modelElement="EAID_dst8065CA_2D18_479d_95EB_23D106ED6921">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0713_4b4f_95EB_23D106ED6921" x="328" y="686" width="96" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0713_4b4f_95EB_23D106ED6921" x="336" y="695" width="96" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0713_4b4f_95EB_23D106ED6921" text="0..1" modelElement="EAID_dst8065CA_2D18_479d_95EB_23D106ED6921">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0713_4b4f_95EB_23D106ED6921" x="340" y="662" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0713_4b4f_95EB_23D106ED6921" x="358" y="679" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0713_4b4f_95EB_23D106ED6921" x="369" y="712"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0713_4b4f_95EB_23D106ED6921" x="369" y="658"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0713_4b4f_95EB_23D106ED6921" x="387" y="727"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0713_4b4f_95EB_23D106ED6921" x="387" y="675"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_E8D8E631_9B19_4a2a_9B19_8A269D46151F" isFrame="false" modelElement="EAPK_94194397_D26C_4972_AE3E_34F5B925DA64">
@@ -16974,15 +17488,15 @@
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B0C416E7_3825_4a43_ACD1_13C3E1A4B7F9" modelElement="EAID_EDCD6F3A_F86A_46ca_ACD1_13C3E1A4B7F9">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_3825_4a43_ACD1_13C3E1A4B7F9" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3825_4a43_ACD1_13C3E1A4B7F9" text="time:TemporalUnit"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3825_4a43_ACD1_13C3E1A4B7F9" x="990" y="468" width="104" height="52"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3825_4a43_ACD1_13C3E1A4B7F9" x="990" y="445" width="104" height="52"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B0C416E7_3825_4a43_8EA9_58FC31BC055C" modelElement="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3825_4a43_8EA9_58FC31BC055C" text="epo:SpecificDuration"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3825_4a43_8EA9_58FC31BC055C" x="959" y="353" width="166" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3825_4a43_8EA9_58FC31BC055C" x="959" y="353" width="166" height="49"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B0C416E7_3825_4a43_8134_2500CE9AB392" modelElement="EAID_7D0E71D7_D624_4144_8134_2500CE9AB392">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3825_4a43_8134_2500CE9AB392" text="epo:IndefiniteDuration"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3825_4a43_8134_2500CE9AB392" x="1252" y="353" width="130" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3825_4a43_8134_2500CE9AB392" x="1230" y="353" width="130" height="49"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B0C416E7_3825_4a43_B318_F20F23FBF81F" modelElement="EAID_5A01D361_6509_447f_B318_F20F23FBF81F">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_3825_4a43_B318_F20F23FBF81F" text="enumeration"/>
@@ -16993,6 +17507,9 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3825_4a43_93B9_E57CE8023BE9" text="time:Duration"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3825_4a43_93B9_E57CE8023BE9" x="1128" y="157" width="90" height="45"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_B0C416E7_3825_4a43_B916_E199FA70A0DC" modelElement="EAID_AFD1E4C5_9D57_4c0a_B916_E199FA70A0DC">
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3825_4a43_B916_E199FA70A0DC" x="1360" y="271" width="142" height="66"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B0C416E7_3825_4a43_B8D7_2BC14F331BE5" source="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" target="EAID_5A01D361_6509_447f_B318_F20F23FBF81F" modelElement="EAID_007A256B_E0B5_4a62_B8D7_2BC14F331BE5">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3825_4a43_B8D7_2BC14F331BE5" x="863" y="295"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3825_4a43_B8D7_2BC14F331BE5" x="863" y="357"/>
@@ -17010,16 +17527,20 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3825_4a43_8FE6_3B40BD241A4B" x="356" y="158"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B0C416E7_3825_4a43_AFC8_89D40A9529FD" source="EAID_7D0E71D7_D624_4144_8134_2500CE9AB392" target="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" modelElement="EAID_F8285143_A232_43ae_AFC8_89D40A9529FD">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3825_4a43_AFC8_89D40A9529FD" x="1270" y="353"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3825_4a43_AFC8_89D40A9529FD" x="1212" y="309"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3825_4a43_AFC8_89D40A9529FD" x="1259" y="353"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3825_4a43_AFC8_89D40A9529FD" x="1204" y="309"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B0C416E7_3825_4a43_AA82_ECF06C845021" source="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C" target="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" modelElement="EAID_FE0B0FB5_E0B6_41e2_AA82_ECF06C845021">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3825_4a43_AA82_ECF06C845021" x="1084" y="353"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3825_4a43_AA82_ECF06C845021" x="1136" y="309"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3825_4a43_AA82_ECF06C845021" x="1074" y="353"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3825_4a43_AA82_ECF06C845021" x="1132" y="309"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B0C416E7_3825_4a43_8076_1ECB982268EE" source="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C" target="EAID_EDCD6F3A_F86A_46ca_ACD1_13C3E1A4B7F9" modelElement="EAID_90566F74_64BC_49c8_8076_1ECB982268EE">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3825_4a43_8076_1ECB982268EE" x="1042" y="423"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3825_4a43_8076_1ECB982268EE" x="1042" y="468"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3825_4a43_8076_1ECB982268EE" x="1042" y="402"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3825_4a43_8076_1ECB982268EE" x="1042" y="445"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B0C416E7_3825_4a43_A4A4_D1B45AFE4BED" source="EAID_AFD1E4C5_9D57_4c0a_B916_E199FA70A0DC" target="EAID_7D0E71D7_D624_4144_8134_2500CE9AB392" modelElement="EAID_5259FE9C_CECB_4b18_A4A4_D1B45AFE4BED">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3825_4a43_A4A4_D1B45AFE4BED" x="1369" y="337"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3825_4a43_A4A4_D1B45AFE4BED" x="1339" y="353"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_BF8A1F85_C659_4436_8487_5E44862C2DC7" isFrame="false" modelElement="EAPK_352BAC9B_7F50_4450_B942_C2EA10533C7F">
@@ -17078,419 +17599,419 @@
 				<times created="2018-02-02 12:19:21" modified="2020-12-16 13:12:14" lastloaddate="2018-03-21 18:01:02" lastsavedate="2018-02-02 12:19:21"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" batchsave="0" batchload="0" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
 			</element>
+			<element xmi:idref="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" xmi:type="uml:Package" name="diagrams" scope="public">
+				<model package2="EAID_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="1" ea_localid="121" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-02-01 10:49:24" modified="2022-05-13 14:38:09" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="eProcurementOntology"/>
+				<packageproperties version="1.0" tpos="1"/>
+				<paths/>
+				<times created="2022-02-01 10:49:24" modified="2022-05-13 14:38:09"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+			</element>
 			<element xmi:idref="EAID_03490E2B_19F2_47c3_BE70_0ED3FC280AF1" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1873" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="1873" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="terms relations" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2022-05-17 12:55:19" modified="2022-05-17 13:42:33" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-21;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={67105115-BDF7-4b51-A78E-29DD6CA09ADF}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={03490E2B-19F2-47c3-BE70-0ED3FC280AF1}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={6E875DAE-E456-4d6b-9D81-CFECE6EE5232}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={03490E2B-19F2-47c3-BE70-0ED3FC280AF1}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_E7B9DC27_DFB5_40f5_AFF2_F34912D5FC0D"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_E7B9DC27_DFB5_40f5_AFF2_F34912D5FC0D"/>
 			</element>
 			<element xmi:idref="EAID_03EE3ECF_9EFF_4bf9_A068_667A0CDFBA55" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1875" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="1875" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="lot terms hierarchy" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2022-05-17 13:01:53" modified="2022-05-17 13:42:33" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-21;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={45BAEA65-0F13-45ed-B0F3-2AC2DC38DFC2}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={03EE3ECF-9EFF-4bf9-A068-667A0CDFBA55}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={7443523B-AFBB-4f0f-BDAF-832F280FF634}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={03EE3ECF-9EFF-4bf9-A068-667A0CDFBA55}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_5E50B73B_B272_4c8d_9BDE_F34B9AB58EBE"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_5E50B73B_B272_4c8d_9BDE_F34B9AB58EBE"/>
 			</element>
 			<element xmi:idref="EAID_155C7FA7_6962_4810_AED6_D94302F09660" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1850" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="1850" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="award" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2022-05-17 10:52:55" modified="2022-05-16 14:54:04" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-1;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={B894DD88-8E6A-420c-B294-9DE1E52BC9F1}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={155C7FA7-6962-4810-AED6-D94302F09660}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={82C5B23A-D002-44f6-8BB1-E97480C242F1}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={155C7FA7-6962-4810-AED6-D94302F09660}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_0717D631_676D_41e7_B708_35BFDDC475A8"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_0717D631_676D_41e7_B708_35BFDDC475A8"/>
 			</element>
 			<element xmi:idref="EAID_20C55572_E53F_4e04_A828_75F42C4318A2" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="3179" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="3179" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="contract" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2023-09-12 14:24:42" modified="2023-09-12 14:24:42" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-33;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={B089392F-58BE-40e8-A861-91274A2F50E1}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={20C55572-E53F-4e04-A828-75F42C4318A2}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={E30FD375-E4CB-41d9-BC2F-328F686F8FFB}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={20C55572-E53F-4e04-A828-75F42C4318A2}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_E7ED5A9A_0713_4b4f_9DED_4C911545B779"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_E7ED5A9A_0713_4b4f_9DED_4C911545B779"/>
 			</element>
 			<element xmi:idref="EAID_24A53112_91DE_40c0_B978_81AE2B81BF17" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1852" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="1852" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="completion" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2022-05-17 10:52:56" modified="2022-05-16 15:10:24" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-1;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={15A493A4-433F-42fc-9AC5-9ED04E8E51DC}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={24A53112-91DE-40c0-B978-81AE2B81BF17}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={BE71927C-F5F9-405c-8E5F-F3D4A11C1636}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={24A53112-91DE-40c0-B978-81AE2B81BF17}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_C31DC6F6_AFC8_4f2d_A78D_1C226568295B"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_C31DC6F6_AFC8_4f2d_A78D_1C226568295B"/>
 			</element>
 			<element xmi:idref="EAID_24F90E61_753D_4cf6_8358_F904A686244F" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1874" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="1874" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="procedure terms hierarchy" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2022-05-17 13:01:39" modified="2022-05-17 13:42:33" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-21;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={3F9E74B2-F8DB-49cc-8CA3-293CE178AF9B}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={24F90E61-753D-4cf6-8358-F904A686244F}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={BD77F64F-CFA4-4df9-BC7F-BF61CADF51AE}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={24F90E61-753D-4cf6-8358-F904A686244F}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_D15C967A_82A2_41fa_B64B_40399AE94FF0"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_D15C967A_82A2_41fa_B64B_40399AE94FF0"/>
 			</element>
 			<element xmi:idref="EAID_28150437_F427_4fd1_A8F1_E76DB6160274" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="3170" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="3170" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="communication means" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2023-09-12 14:12:09" modified="2023-09-12 14:12:09" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-31;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={EEF38D79-3D77-4708-B012-2F85C9C08500}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={28150437-F427-4fd1-A8F1-E76DB6160274}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={94B62085-6A89-49f4-A750-58D1B88CBABF}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={28150437-F427-4fd1-A8F1-E76DB6160274}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_A6162271_FBBA_470d_BA75_B97BDB91DC8E"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_A6162271_FBBA_470d_BA75_B97BDB91DC8E"/>
 			</element>
 			<element xmi:idref="EAID_2F3555E6_B9A6_4208_9A19_747532DBC93F" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1872" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="1872" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="terms full hierarchy" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2022-05-17 12:54:20" modified="2022-05-17 13:42:33" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-21;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={E7FDDDE8-A23B-41d2-8E5B-BFA59579C90A}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={2F3555E6-B9A6-4208-9A19-747532DBC93F}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={F975084A-6432-47bc-8D1F-245887573EA1}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={2F3555E6-B9A6-4208-9A19-747532DBC93F}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_EED57D8A_C481_4411_A6B7_122C23812ACA"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_EED57D8A_C481_4411_A6B7_122C23812ACA"/>
 			</element>
 			<element xmi:idref="EAID_34185A69_499F_47f1_8C0E_32D2FDF93E0A" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1888" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="1888" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="datatype" scope="public" stereotype="NavigationCell"/>
 				<project author="lps" version="1.0" phase="1.0" created="2022-05-17 13:56:22" modified="2022-05-17 13:56:22" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-6;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={130E43A4-8928-4175-9B95-E30010972607}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={34185A69-499F-47f1-8C0E-32D2FDF93E0A}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={BEC509FE-89A3-416a-A050-AA1923BBA5EF}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={34185A69-499F-47f1-8C0E-32D2FDF93E0A}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_BF8A1F85_C659_4436_8487_5E44862C2DC7"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_BF8A1F85_C659_4436_8487_5E44862C2DC7"/>
 			</element>
 			<element xmi:idref="EAID_40B3A0DE_5AC9_467f_A6C8_9365E51D44B5" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="3173" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="3173" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="certification" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2023-09-12 14:15:24" modified="2023-09-12 14:15:24" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-4;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={BA34A101-168C-45bc-9B9D-23A72474859E}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={40B3A0DE-5AC9-467f-A6C8-9365E51D44B5}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={6A4E01D3-A3E3-4ae7-A4B3-6956719BC082}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={40B3A0DE-5AC9-467f-A6C8-9365E51D44B5}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_275A3D5B_4FDD_464a_96B4_853DDB16EA89"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_275A3D5B_4FDD_464a_96B4_853DDB16EA89"/>
 			</element>
 			<element xmi:idref="EAID_46C02EA3_5EA6_48ea_9F81_DB71EAB73C34" xmi:type="uml:Text" name="monetary value - completion" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1856" ea_eleType="element" name="monetary value - completion"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="1856" ea_eleType="element" name="monetary value - completion"/>
 				<properties documentation="monetary value - completion" isSpecification="false" sType="Text" nType="82" alias="monetary value - completion" scope="public" stereotype="NavigationCell"/>
 				<project author="lps" version="1.0" phase="1.0" created="2022-05-17 10:58:09" modified="2022-05-17 13:42:33" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-35;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={59F06BC4-6879-4f0e-BA97-B1B1BCB76EFC}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={46C02EA3-5EA6-48ea-9F81-DB71EAB73C34}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={8EB6A3E7-1B2A-4627-A5BA-06312BC290DD}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={46C02EA3-5EA6-48ea-9F81-DB71EAB73C34}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_A2669D8B_ED55_4aef_B387_F43B34E94682"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_A2669D8B_ED55_4aef_B387_F43B34E94682"/>
 			</element>
 			<element xmi:idref="EAID_4C442DBD_D8E5_4d12_A2A1_A7DEA1E5A1B0" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1867" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="1867" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="role playing on the seller side" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2022-05-17 12:48:53" modified="2022-05-17 13:42:33" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-29;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={954E6274-69A0-4173-9B14-2B87720C69A7}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={4C442DBD-D8E5-4d12-A2A1-A7DEA1E5A1B0}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={F30F4A2F-8823-4d46-A249-BA8CAD5D79F1}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={4C442DBD-D8E5-4d12-A2A1-A7DEA1E5A1B0}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_DC637555_D382_4357_B324_6181AAA46DCE"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_DC637555_D382_4357_B324_6181AAA46DCE"/>
 			</element>
 			<element xmi:idref="EAID_5774D0B1_FD6B_4941_9166_7C66D155CDF2" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="3174" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="3174" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="award decision" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2023-09-12 14:21:38" modified="2023-09-12 14:21:39" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-20;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={D1786485-AADC-4555-8AAD-A5679D36C09C}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={5774D0B1-FD6B-4941-9166-7C66D155CDF2}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={82BD0155-1A7F-4dd8-A632-80737DAB66E2}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={5774D0B1-FD6B-4941-9166-7C66D155CDF2}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_BA4823EC_F40E_4a51_9CF7_44FE733FB842"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_BA4823EC_F40E_4a51_9CF7_44FE733FB842"/>
 			</element>
 			<element xmi:idref="EAID_68D5E5EA_FC7A_4339_81EA_0B04F7E45A43" xmi:type="uml:Text" name="role relations" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1862" ea_eleType="element" name="role relations"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="1862" ea_eleType="element" name="role relations"/>
 				<properties documentation="role relations" isSpecification="false" sType="Text" nType="82" alias="role relations" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2022-05-17 12:46:11" modified="2023-09-12 14:12:39" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-29;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={6FE47FA2-9F1C-4508-A08D-DDD00AE9D424}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={68D5E5EA-FC7A-4339-81EA-0B04F7E45A43}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={DCD403B6-5ED5-47ec-9C7D-0722BAA00B9A}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={68D5E5EA-FC7A-4339-81EA-0B04F7E45A43}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_F4E49053_6DAE_4623_8769_61637C57A452"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_F4E49053_6DAE_4623_8769_61637C57A452"/>
 			</element>
 			<element xmi:idref="EAID_6D0F1BE0_EAAB_45e5_A5E4_27CEF50C4AEE" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="3168" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="3168" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="terms top hierarchy" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2023-09-12 14:10:36" modified="2023-09-12 14:10:36" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-21;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={CF3B5261-59F7-4b23-82CE-126CC7D766FE}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={6D0F1BE0-EAAB-45e5-A5E4-27CEF50C4AEE}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={8985BEFD-7E90-4df2-AAFD-CBE5411775AF}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={6D0F1BE0-EAAB-45e5-A5E4-27CEF50C4AEE}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_93DECF1F_F76C_4644_8A56_143EE13FBA49"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_93DECF1F_F76C_4644_8A56_143EE13FBA49"/>
 			</element>
 			<element xmi:idref="EAID_8A4B2A45_E204_4d18_923B_C062EFED7F92" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="3172" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="3172" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="procurement criterion" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2023-09-12 14:14:14" modified="2023-09-12 14:14:14" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-4;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={DEEB5745-714C-4115-A958-D5A476D4497F}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={8A4B2A45-E204-4d18-923B-C062EFED7F92}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={D6226A1B-40CC-4fe6-95BB-848DEB0B90C9}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={8A4B2A45-E204-4d18-923B-C062EFED7F92}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_54EAF048_1D0D_46d6_BEFD_4B2213CD4887"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_54EAF048_1D0D_46d6_BEFD_4B2213CD4887"/>
 			</element>
 			<element xmi:idref="EAID_954E4827_D178_4ebc_9EE2_A6F61F870DB6" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1870" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="1870" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="strategic procurement relations" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2022-05-17 12:52:00" modified="2022-05-17 12:52:00" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-4;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={59E7FE06-1F37-4e6f-918A-2360D0CB2E7C}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={954E4827-D178-4ebc-9EE2-A6F61F870DB6}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={59C6EDDE-603D-4eb1-B099-86AC88BF17FF}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={954E4827-D178-4ebc-9EE2-A6F61F870DB6}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_D7F91EFA_588B_4ede_B41F_FFC57647CF02"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_D7F91EFA_588B_4ede_B41F_FFC57647CF02"/>
 			</element>
 			<element xmi:idref="EAID_9AC5B7BC_A46F_4781_BEC6_8F4C43A57375" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1880" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="1880" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="contextual information" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2022-05-17 13:12:51" modified="2022-05-17 13:52:01" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-93;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={1289CCDD-38D5-4f9e-B743-EAC0B9C84AB3}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={9AC5B7BC-A46F-4781-BEC6-8F4C43A57375}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={D0661235-13D0-4b6d-8E8F-3BBAFE724CB8}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={9AC5B7BC-A46F-4781-BEC6-8F4C43A57375}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_5C2AE103_DF65_4cef_9BB7_4551850E9016"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_5C2AE103_DF65_4cef_9BB7_4551850E9016"/>
 			</element>
 			<element xmi:idref="EAID_9E4FA39A_DB0C_4c05_BA06_515432E59702" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1839" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="1839" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="main objects over time" scope="public" stereotype="NavigationCell"/>
 				<project author="lps" version="1.0" phase="1.0" created="2022-05-13 20:08:58" modified="2022-05-13 20:08:58" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-37;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={77860D4C-4146-4d40-9A81-A241C84F1DA8}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={9E4FA39A-DB0C-4c05-BA06-515432E59702}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={18E2A8C9-5716-42c6-B324-F6C12949EC13}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={9E4FA39A-DB0C-4c05-BA06-515432E59702}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_BE36C015_6DEA_4e64_88D7_DCA46A2951B5"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_BE36C015_6DEA_4e64_88D7_DCA46A2951B5"/>
 			</element>
 			<element xmi:idref="EAID_A07ACD80_0370_46e1_9700_9AB5F7313EA7" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="3176" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="3176" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="dynamic purchasing system" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2023-09-12 14:22:03" modified="2023-09-12 14:22:03" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-20;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={143A1698-3CDF-42c0-80F2-4B9EE90861DF}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={A07ACD80-0370-46e1-9700-9AB5F7313EA7}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={BF03F368-923E-4cc6-8E8E-0CC8EB97BE79}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={A07ACD80-0370-46e1-9700-9AB5F7313EA7}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_6C96B347_4D8D_4680_93BF_AB428ACDC4C3"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_6C96B347_4D8D_4680_93BF_AB428ACDC4C3"/>
 			</element>
 			<element xmi:idref="EAID_A3FE9B4C_382E_40dc_958E_D9BF99277B20" xmi:type="uml:Text" name="agent relations" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1860" ea_eleType="element" name="agent relations"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="1860" ea_eleType="element" name="agent relations"/>
 				<properties documentation="agent relations" isSpecification="false" sType="Text" nType="82" alias="agent relations" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2022-05-17 12:33:17" modified="2023-09-12 14:10:53" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-79;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={E56EC423-0D44-40bb-AA93-FD50028B07F6}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={A3FE9B4C-382E-40dc-958E-D9BF99277B20}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={1740A46A-118B-49a2-8EF9-C8D8E437FE1C}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={A3FE9B4C-382E-40dc-958E-D9BF99277B20}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_C3BE0EED_5148_49f7_A0F0_EAE9D586743F"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_C3BE0EED_5148_49f7_A0F0_EAE9D586743F"/>
 			</element>
 			<element xmi:idref="EAID_B4C14031_6888_4fe3_A7BA_FCC3A6DFD2D4" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1883" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="1883" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="empirical types" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2022-05-17 13:27:44" modified="2022-05-17 13:42:33" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-6;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={B9BFB847-9722-4be6-A7A7-4B2CB4804A3A}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={B4C14031-6888-4fe3-A7BA-FCC3A6DFD2D4}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={DB21A782-D30D-44ad-9C91-71988F57C08B}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={B4C14031-6888-4fe3-A7BA-FCC3A6DFD2D4}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_B0C416E7_3825_4a43_99E0_659306E74E22"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_B0C416E7_3825_4a43_99E0_659306E74E22"/>
 			</element>
 			<element xmi:idref="EAID_B4D0C52E_CCFA_47ce_BC07_A09D9044B69E" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1878" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="1878" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="documents relations" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2022-05-17 13:03:41" modified="2022-05-17 13:42:33" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-33;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={E5F7053D-27B0-4a64-B9A1-6F8C0F8D8DD0}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={B4D0C52E-CCFA-47ce-BC07-A09D9044B69E}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={9B4F564A-6205-465c-86F0-9714F90413F5}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={B4D0C52E-CCFA-47ce-BC07-A09D9044B69E}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_86147DF4_1EF7_40c5_9C93_8A5889DDC756"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_86147DF4_1EF7_40c5_9C93_8A5889DDC756"/>
 			</element>
 			<element xmi:idref="EAID_BC642D11_1E40_47fb_B461_D8E61394AC5F" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="3167" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="3167" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="procedure and lot relations" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2023-09-12 14:09:36" modified="2023-09-12 14:09:36" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-48;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={41BA818B-628D-441e-90E1-535384D91D12}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={BC642D11-1E40-47fb-B461-D8E61394AC5F}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={E99D5601-06CE-4026-8E3A-A6867D8BC950}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={BC642D11-1E40-47fb-B461-D8E61394AC5F}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_AB634BF8_27DF_4150_83AB_3091E780E74A"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_AB634BF8_27DF_4150_83AB_3091E780E74A"/>
 			</element>
 			<element xmi:idref="EAID_BF31E977_E54E_4706_9C28_3C22B15A8113" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1861" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="1861" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="location" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2022-05-17 12:45:20" modified="2022-05-17 13:52:01" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-32;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={70A11B16-04E8-4cb9-A143-BB091FF709BE}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={BF31E977-E54E-4706-9C28-3C22B15A8113}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={5998C5A5-ECFC-462d-80EE-E08BAA87E006}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={BF31E977-E54E-4706-9C28-3C22B15A8113}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_347C0768_29F9_4a87_9AF3_4E11E314BE26"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_347C0768_29F9_4a87_9AF3_4E11E314BE26"/>
 			</element>
 			<element xmi:idref="EAID_C0FA4596_11C5_4b97_AB06_08AA082CD52B" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1855" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="1855" ea_eleType="element"/>
 				<properties documentation="monetary value - award" isSpecification="false" sType="Text" nType="82" alias="monetary value - award" scope="public" stereotype="NavigationCell"/>
 				<project author="lps" version="1.0" phase="1.0" created="2022-05-17 10:57:59" modified="2023-09-12 13:05:45" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-35;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={1F989508-0713-4b30-A639-0D707D344090}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={C0FA4596-11C5-4b97-AB06-08AA082CD52B}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={13DC517D-1128-4a4e-A1FA-55D84A3C73F9}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={C0FA4596-11C5-4b97-AB06-08AA082CD52B}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_147ECFF1_21DD_4c94_B672_811B0C917F55"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_147ECFF1_21DD_4c94_B672_811B0C917F55"/>
 			</element>
 			<element xmi:idref="EAID_C8769750_6B24_4bcb_A1CC_44703211E656" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="3178" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="3178" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="procurement process information" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2023-09-12 14:23:37" modified="2023-09-12 14:23:37" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-93;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={DCD1BFF9-70A3-4181-934C-09276B0AE30A}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={C8769750-6B24-4bcb-A1CC-44703211E656}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={80C94958-EF49-4f16-838B-58EE1AFB260A}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={C8769750-6B24-4bcb-A1CC-44703211E656}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_F9A67D0E_2ACB_45b8_833F_A797EB7E372E"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_F9A67D0E_2ACB_45b8_833F_A797EB7E372E"/>
 			</element>
 			<element xmi:idref="EAID_D4B88387_1DF7_47e8_A57F_3E11F136E2A8" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="3182" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="3182" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="change specification relations" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2023-09-12 14:26:47" modified="2023-09-12 14:26:47" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-34;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={97B58905-C4FD-4bb6-BB0A-E3216C281DC4}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={D4B88387-1DF7-47e8-A57F-3E11F136E2A8}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={AC182EC0-821D-4221-B984-98DCA40AF115}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={D4B88387-1DF7-47e8-A57F-3E11F136E2A8}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_44A1640B_919A_4ad4_8024_B556ACED19B4"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_44A1640B_919A_4ad4_8024_B556ACED19B4"/>
 			</element>
 			<element xmi:idref="EAID_D6C95713_EB11_4af7_8A46_9B20895C7AD2" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1848" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="1848" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="competition" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2022-05-17 10:52:55" modified="2022-05-16 13:16:12" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-1;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={CAE95E1E-D4DA-434b-9E66-2B0C1A2930AB}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={D6C95713-EB11-4af7-8A46-9B20895C7AD2}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={D9EF7B46-B13E-4a3c-95C6-A2B7B695831C}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={D6C95713-EB11-4af7-8A46-9B20895C7AD2}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_4FF9AAC8_5E59_49bd_A037_CBB07F6B2BA8"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_4FF9AAC8_5E59_49bd_A037_CBB07F6B2BA8"/>
 			</element>
 			<element xmi:idref="EAID_D964D718_09AD_453d_9261_B680435DC8F5" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1849" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="1849" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="submission" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2022-05-17 10:52:55" modified="2022-05-16 14:00:51" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-1;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={C67BF8E9-BCF8-43d0-A128-CA5DD5891012}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={D964D718-09AD-453d-9261-B680435DC8F5}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={AF0CFCAF-7600-472c-BD51-A03490619D76}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={D964D718-09AD-453d-9261-B680435DC8F5}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_47122B38_736F_476f_9668_E7EFAD723B51"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_47122B38_736F_476f_9668_E7EFAD723B51"/>
 			</element>
 			<element xmi:idref="EAID_DA25DD8C_13A3_468b_9508_6BD01DF20BAF" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="3181" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="3181" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="nonpublished specification relations" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2023-09-12 14:26:19" modified="2023-09-12 14:26:19" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-34;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={B645B89C-8A22-4008-8A52-88A5EDD57428}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={DA25DD8C-13A3-468b-9508-6BD01DF20BAF}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={458411EA-B7EB-4f8a-80D4-B73790A4209A}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={DA25DD8C-13A3-468b-9508-6BD01DF20BAF}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_20D8EECD_FA88_4280_8420_27FB07AFC138"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_20D8EECD_FA88_4280_8420_27FB07AFC138"/>
 			</element>
 			<element xmi:idref="EAID_DD64E73D_237E_4f7a_9F41_C132E65F5A8C" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="3171" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="3171" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="procurement criteria summary" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2023-09-12 14:14:03" modified="2023-09-12 14:14:03" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-4;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={2776ADD3-3C39-4710-A4B8-584E994EB5F1}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={DD64E73D-237E-4f7a-9F41-C132E65F5A8C}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={8CB30C55-DCEE-4fc3-97DD-0F7B2AAFE4E7}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={DD64E73D-237E-4f7a-9F41-C132E65F5A8C}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_663B1240_A872_4795_A9D6_7CAF8E182298"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_663B1240_A872_4795_A9D6_7CAF8E182298"/>
 			</element>
 			<element xmi:idref="EAID_DE4D587C_087C_40fa_B63D_56DEA2854500" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1866" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="1866" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="role playing on buyer side" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2022-05-17 12:48:22" modified="2022-05-17 13:42:33" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-29;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={D8971322-6E33-4b61-829C-3A3E10811A25}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={DE4D587C-087C-40fa-B63D-56DEA2854500}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={A78CB5D5-758C-484d-8050-B94DF41B7121}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={DE4D587C-087C-40fa-B63D-56DEA2854500}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_6B773B07_0005_44a3_9D34_B2FE839A6B37"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_6B773B07_0005_44a3_9D34_B2FE839A6B37"/>
 			</element>
 			<element xmi:idref="EAID_DF46765F_128C_4cd8_8E8A_A6EC221BAB4F" xmi:type="uml:Text" name="technique" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1871" ea_eleType="element" name="technique"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="1871" ea_eleType="element" name="technique"/>
 				<properties documentation="technique" isSpecification="false" sType="Text" nType="82" alias="technique" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2022-05-17 12:52:28" modified="2023-09-12 14:20:39" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-4;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={C20CDC91-361B-4ac1-8AA7-04A8FAAF268D}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={DF46765F-128C-4cd8-8E8A-A6EC221BAB4F}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={56822F78-7F84-47f6-AFCB-BFCE3785EFCC}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={DF46765F-128C-4cd8-8E8A-A6EC221BAB4F}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_E9EC4942_6F24_444e_9FC3_C548C7C40CC8"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_E9EC4942_6F24_444e_9FC3_C548C7C40CC8"/>
 			</element>
 			<element xmi:idref="EAID_EABD8F02_7B1E_48f0_A20E_C4A2122FB1CD" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="3175" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="3175" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="award decision outcome relations" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2023-09-12 14:21:51" modified="2023-09-12 14:21:51" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-20;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={6CF6D4AD-199A-43d7-AFF6-D6AB409FB793}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={EABD8F02-7B1E-48f0-A20E-C4A2122FB1CD}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={64C3440A-221B-4da0-94BA-528F3591BADF}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={EABD8F02-7B1E-48f0-A20E-C4A2122FB1CD}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_0D0E2B87_BAA4_4874_983F_BAD4C23D16EC"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_0D0E2B87_BAA4_4874_983F_BAD4C23D16EC"/>
 			</element>
 			<element xmi:idref="EAID_EED92360_39E2_48e3_93F3_A9FAE5CE18B1" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1854" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="1854" ea_eleType="element"/>
 				<properties documentation="monetary value - competition" isSpecification="false" sType="Text" nType="82" alias="monetary value - competition" scope="public" stereotype="NavigationCell"/>
 				<project author="lps" version="1.0" phase="1.0" created="2022-05-17 10:57:50" modified="2023-09-12 13:05:19" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-35;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={C95E7F61-860A-4336-9B8C-8C055FB242DF}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={EED92360-39E2-48e3-93F3-A9FAE5CE18B1}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={4D0B1A6D-0060-44c0-82AB-70D76DDF1320}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={EED92360-39E2-48e3-93F3-A9FAE5CE18B1}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_4BA59459_2BE8_4a2a_9BD6_72CB34B74A87"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_4BA59459_2BE8_4a2a_9BD6_72CB34B74A87"/>
 			</element>
 			<element xmi:idref="EAID_F889D07C_8647_44f2_9C6E_449B3E20BCF2" xmi:type="uml:Text" name="procurement object relations" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1858" ea_eleType="element" name="procurement object relations"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="1858" ea_eleType="element" name="procurement object relations"/>
 				<properties documentation="procurement object relations" isSpecification="false" sType="Text" nType="82" alias="procurement objects relations" scope="public" stereotype="NavigationCell"/>
 				<project author="lps" version="1.0" phase="1.0" created="2022-05-17 11:00:20" modified="2022-05-17 13:52:01" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-48;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={447EA1CF-41EB-4c3f-80FE-172915CC5555}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={F889D07C-8647-44f2-9C6E-449B3E20BCF2}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={8F5C6D3B-A2EC-47fa-9A0F-AFD2E447766B}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={F889D07C-8647-44f2-9C6E-449B3E20BCF2}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_1F377807_9517_4c3c_A2B6_E0A40232AB6F"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_1F377807_9517_4c3c_A2B6_E0A40232AB6F"/>
 			</element>
 			<element xmi:idref="EAID_F990707E_C758_4479_B2F5_BD41CC5DDBC9" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1847" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="1847" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="planning" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2022-05-17 10:52:55" modified="2022-05-16 13:15:58" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-1;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={9294282A-97B6-4c19-A05D-2F7DA109A503}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={F990707E-C758-4479-B2F5-BD41CC5DDBC9}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={70072BC3-5ACF-4a08-A83B-05268788DB3E}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={F990707E-C758-4479-B2F5-BD41CC5DDBC9}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_605C4B64_024F_408a_995E_857FCDBE5F93"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_605C4B64_024F_408a_995E_857FCDBE5F93"/>
 			</element>
 			<element xmi:idref="EAID_FBCD0D5C_5298_43ea_8182_0CD2C2717FB5" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="3180" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="3180" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="review" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2023-09-12 14:24:57" modified="2023-09-12 14:24:57" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-33;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={2F443B62-3F6C-4759-A966-C6C462A4D8FE}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={FBCD0D5C-5298-43ea-8182-0CD2C2717FB5}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={C12ABD14-30C9-421d-9439-E31A52708DD1}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={FBCD0D5C-5298-43ea-8182-0CD2C2717FB5}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_983E6F05_E404_4a6c_B0E6_81483A8EE863"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_983E6F05_E404_4a6c_B0E6_81483A8EE863"/>
 			</element>
 			<element xmi:idref="EAID_FBF5331A_BB9B_4776_8349_0AFFD331805A" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="3177" ea_eleType="element"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="3177" ea_eleType="element"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="framework agreement" scope="public" stereotype="NavigationCell"/>
 				<project author="andreea" version="1.0" phase="1.0" created="2023-09-12 14:22:15" modified="2023-09-12 14:22:15" complexity="1" status="Proposed"/>
 				<code gentype="&lt;none&gt;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="NID=2-20;"/>
 				<tags/>
 				<xrefs value="$XREFPROP=$XID={C9DC9376-5962-44f6-83BA-3035FB6A27E2}$XID;$NAM=Stereotypes$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=NavigationCell;GUID={DD05E9A7-F4FA-41a5-8F90-C354EA71A26A};@ENDSTEREO;$DES;$CLT={FBF5331A-BB9B-4776-8349-0AFFD331805A}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={A6417F87-6474-4578-B8B7-66E772D595A0}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@PROP=@NAME=DiagLinkType@ENDNAME;@TYPE=string@ENDTYPE;@VALU=Structural@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={FBF5331A-BB9B-4776-8349-0AFFD331805A}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_CB9AE4FA_A6CB_4260_A662_9286DF2785D7"/>
-			</element>
-			<element xmi:idref="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" xmi:type="uml:Package" name="diagrams" scope="public">
-				<model package2="EAID_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="1" ea_localid="121" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-02-01 10:49:24" modified="2022-05-13 14:38:09" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
-				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
-				<tags/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology"/>
-				<packageproperties version="1.0" tpos="1"/>
-				<paths/>
-				<times created="2022-02-01 10:49:24" modified="2022-05-13 14:38:09"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+				<extendedProperties tagged="0" package_name="diagrams" diagram="EAID_CB9AE4FA_A6CB_4260_A662_9286DF2785D7"/>
 			</element>
 			<element xmi:idref="EAPK_B734BB7B_9769_4212_99E0_41BB15EB13D0" xmi:type="uml:Package" name="monetary value" scope="public">
 				<model package2="EAID_B734BB7B_9769_4212_99E0_41BB15EB13D0" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="153" ea_eleType="package"/>
@@ -17531,43 +18052,43 @@
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAPK_73E8F652_9D0B_4be2_A5D2_5EC0D734782C" xmi:type="uml:Package" name="procurement object" scope="public">
-				<model package2="EAID_73E8F652_9D0B_4be2_A5D2_5EC0D734782C" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="3" ea_localid="114" ea_eleType="package"/>
+				<model package2="EAID_73E8F652_9D0B_4be2_A5D2_5EC0D734782C" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="2" ea_localid="114" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-01-18 11:49:45" modified="2024-03-18 12:26:33" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-01-18 11:49:45" modified="2024-07-23 13:18:42" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
-				<packageproperties version="1.0" tpos="3"/>
+				<packageproperties version="1.0" tpos="2"/>
 				<paths/>
 				<times created="2022-01-18 11:49:45" modified="2022-04-22 22:18:38"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAPK_E1382CA6_03C9_4d3d_8C1D_A9BA47C27626" xmi:type="uml:Package" name="agent" scope="public">
-				<model package2="EAID_E1382CA6_03C9_4d3d_8C1D_A9BA47C27626" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="4" ea_localid="91" ea_eleType="package"/>
+				<model package2="EAID_E1382CA6_03C9_4d3d_8C1D_A9BA47C27626" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="3" ea_localid="91" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 16:16:31" modified="2024-03-18 12:27:42" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 16:16:31" modified="2024-07-23 13:18:42" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
-				<packageproperties version="1.0" tpos="4"/>
+				<packageproperties version="1.0" tpos="3"/>
 				<paths/>
 				<times created="2021-12-21 16:16:31" modified="2022-04-29 16:46:06"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" xmi:type="uml:Package" name="role" scope="public">
-				<model package2="EAID_D5932E9C_1D48_4086_9A70_026ECCA134EF" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="5" ea_localid="88" ea_eleType="package"/>
+				<model package2="EAID_D5932E9C_1D48_4086_9A70_026ECCA134EF" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="4" ea_localid="88" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 12:15:44" modified="2024-03-18 12:27:42" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 12:15:44" modified="2024-07-23 13:18:42" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
-				<packageproperties version="1.0" tpos="5"/>
+				<packageproperties version="1.0" tpos="4"/>
 				<paths/>
 				<times created="2021-12-21 12:15:44" modified="2022-04-29 16:46:05"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
@@ -17601,29 +18122,29 @@
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAPK_833D84AE_B33B_4d47_8747_E1E072866B29" xmi:type="uml:Package" name="location" scope="public">
-				<model package2="EAID_833D84AE_B33B_4d47_8747_E1E072866B29" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="6" ea_localid="112" ea_eleType="package"/>
+				<model package2="EAID_833D84AE_B33B_4d47_8747_E1E072866B29" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="5" ea_localid="112" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-01-18 11:37:50" modified="2024-03-18 12:27:42" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-01-18 11:37:50" modified="2024-07-23 13:18:42" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
-				<packageproperties version="1.0" tpos="6"/>
+				<packageproperties version="1.0" tpos="5"/>
 				<paths/>
 				<times created="2022-01-18 11:37:50" modified="2022-01-18 11:37:50"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" xmi:type="uml:Package" name="term" scope="public">
-				<model package2="EAID_2846C82F_2923_4ef1_82D2_D1A24252A14B" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="7" ea_localid="90" ea_eleType="package"/>
+				<model package2="EAID_2846C82F_2923_4ef1_82D2_D1A24252A14B" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="6" ea_localid="90" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 15:30:55" modified="2024-03-18 12:49:03" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 15:30:55" modified="2024-07-23 13:18:42" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
-				<packageproperties version="1.0" tpos="7"/>
+				<packageproperties version="1.0" tpos="6"/>
 				<paths/>
 				<times created="2021-12-21 15:30:55" modified="2022-04-29 16:46:07"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
@@ -17779,85 +18300,85 @@
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" xmi:type="uml:Package" name="criterion" scope="public">
-				<model package2="EAID_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="8" ea_localid="93" ea_eleType="package"/>
+				<model package2="EAID_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="7" ea_localid="93" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2021-12-23 15:28:54" modified="2024-03-18 12:49:30" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2021-12-23 15:28:54" modified="2024-07-23 13:19:49" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
-				<packageproperties version="1.0" tpos="8"/>
+				<packageproperties version="1.0" tpos="7"/>
 				<paths/>
 				<times created="2021-12-23 15:28:54" modified="2022-06-04 10:40:52"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAPK_FE3FEF05_DD69_4fca_A8A4_6F0FCF36A9C1" xmi:type="uml:Package" name="strategic procurement" scope="public">
-				<model package2="EAID_FE3FEF05_DD69_4fca_A8A4_6F0FCF36A9C1" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="9" ea_localid="117" ea_eleType="package"/>
+				<model package2="EAID_FE3FEF05_DD69_4fca_A8A4_6F0FCF36A9C1" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="8" ea_localid="117" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-01-18 14:06:55" modified="2024-03-18 12:51:44" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-01-18 14:06:55" modified="2024-07-23 13:19:49" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
-				<packageproperties version="1.0" tpos="9"/>
+				<packageproperties version="1.0" tpos="8"/>
 				<paths/>
 				<times created="2022-01-18 14:06:55" modified="2022-01-18 14:06:55"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAPK_CE51803B_0AE8_49b5_9890_19298C39BFB5" xmi:type="uml:Package" name="technique" scope="public">
-				<model package2="EAID_CE51803B_0AE8_49b5_9890_19298C39BFB5" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="10" ea_localid="116" ea_eleType="package"/>
+				<model package2="EAID_CE51803B_0AE8_49b5_9890_19298C39BFB5" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="9" ea_localid="116" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-01-18 13:40:26" modified="2024-03-18 12:51:54" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-01-18 13:40:26" modified="2024-07-23 13:19:49" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
-				<packageproperties version="1.0" tpos="10"/>
+				<packageproperties version="1.0" tpos="9"/>
 				<paths/>
 				<times created="2022-01-18 13:40:26" modified="2022-04-29 16:46:14"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAPK_8E7CCB8A_70DE_4968_ADF7_A3665D04BE4C" xmi:type="uml:Package" name="award" scope="public">
-				<model package2="EAID_8E7CCB8A_70DE_4968_ADF7_A3665D04BE4C" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="11" ea_localid="203" ea_eleType="package"/>
+				<model package2="EAID_8E7CCB8A_70DE_4968_ADF7_A3665D04BE4C" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="10" ea_localid="203" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-05-24 13:24:58" modified="2024-03-18 12:54:31" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-05-24 13:24:58" modified="2024-07-23 13:19:49" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
-				<packageproperties version="1.0" tpos="11"/>
+				<packageproperties version="1.0" tpos="10"/>
 				<paths/>
 				<times created="2023-05-24 13:24:58" modified="2023-07-13 07:45:57"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAPK_A1BB437B_AD73_4f28_B11F_4B624C467CDA" xmi:type="uml:Package" name="contextual description" scope="public">
-				<model package2="EAID_A1BB437B_AD73_4f28_B11F_4B624C467CDA" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="12" ea_localid="123" ea_eleType="package"/>
+				<model package2="EAID_A1BB437B_AD73_4f28_B11F_4B624C467CDA" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="11" ea_localid="123" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-02-04 11:55:37" modified="2024-03-18 12:54:31" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-02-04 11:55:37" modified="2024-07-23 13:19:49" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
-				<packageproperties version="1.0" tpos="12"/>
+				<packageproperties version="1.0" tpos="11"/>
 				<paths/>
 				<times created="2022-02-04 11:55:37" modified="2022-04-22 17:34:12"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAPK_E19AEFF3_60AD_4531_8112_3046FA0BBC58" xmi:type="uml:Package" name="document" scope="public">
-				<model package2="EAID_E19AEFF3_60AD_4531_8112_3046FA0BBC58" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="13" ea_localid="92" ea_eleType="package"/>
+				<model package2="EAID_E19AEFF3_60AD_4531_8112_3046FA0BBC58" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="12" ea_localid="92" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2021-12-23 14:39:20" modified="2024-03-18 12:54:42" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2021-12-23 14:39:20" modified="2024-07-23 13:20:40" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
-				<packageproperties version="1.0" tpos="13"/>
+				<packageproperties version="1.0" tpos="12"/>
 				<paths/>
 				<times created="2021-12-23 14:39:20" modified="2022-03-31 11:09:57"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
@@ -17891,15 +18412,15 @@
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAPK_9E50A3E6_B9A2_4bb3_A39F_154425D8333D" xmi:type="uml:Package" name="notice description" scope="public">
-				<model package2="EAID_9E50A3E6_B9A2_4bb3_A39F_154425D8333D" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="14" ea_localid="147" ea_eleType="package"/>
+				<model package2="EAID_9E50A3E6_B9A2_4bb3_A39F_154425D8333D" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="13" ea_localid="147" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-04-28 21:55:25" modified="2024-03-18 12:54:55" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-28 21:55:25" modified="2024-07-23 13:20:52" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="diagrams"/>
-				<packageproperties version="1.0" tpos="14"/>
+				<packageproperties version="1.0" tpos="13"/>
 				<paths/>
 				<times created="2022-04-28 21:55:25" modified="2022-04-28 23:34:02"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
@@ -17917,10 +18438,37 @@
 					<NoteLink xmi:id="EAID_3C3D734E_D8F1_460f_934C_F1F1D556AA5A" start="EAID_98639C30_5207_4cc7_B47E_50C11AD87033" end="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC"/>
 				</links>
 			</element>
-			<element xmi:idref="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" xmi:type="uml:Package" name="classes" scope="public">
-				<model package2="EAID_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="2" ea_localid="236" ea_eleType="package"/>
+			<element xmi:idref="EAPK_715C5E37_AD21_40eb_91D0_A082D4C6829E" xmi:type="uml:Package" name="empirical types" scope="public">
+				<model package2="EAID_715C5E37_AD21_40eb_91D0_A082D4C6829E" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="14" ea_localid="141" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-01 16:49:14" modified="2024-07-23 13:20:58" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="diagrams"/>
+				<packageproperties version="1.0" tpos="14"/>
+				<paths/>
+				<times created="2022-04-01 16:49:14" modified="2022-05-13 11:10:08"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+			</element>
+			<element xmi:idref="EAID_AFD1E4C5_9D57_4c0a_B916_E199FA70A0DC" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_715C5E37_AD21_40eb_91D0_A082D4C6829E" tpos="0" ea_localid="3570" ea_eleType="element"/>
+				<properties documentation="it cannot be a specialization of the Duration. proposal to be deprecated in 5.0.0; needs further investigation." isSpecification="false" sType="Note" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-03-19 17:32:53" modified="2024-03-19 17:35:01" complexity="1" status="Proposed"/>
+				<code gentype="&lt;none&gt;"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="empirical types"/>
+				<links>
+					<NoteLink xmi:id="EAID_5259FE9C_CECB_4b18_A4A4_D1B45AFE4BED" start="EAID_AFD1E4C5_9D57_4c0a_B916_E199FA70A0DC" end="EAID_7D0E71D7_D624_4144_8134_2500CE9AB392"/>
+				</links>
+			</element>
+			<element xmi:idref="EAPK_B583795A_4207_48be_8D99_A257C58911C6" xmi:type="uml:Package" name="classes" scope="public">
+				<model package2="EAID_B583795A_4207_48be_8D99_A257C58911C6" package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="2" ea_localid="271" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 12:26:12" modified="2024-03-18 12:26:12" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:54:41" modified="2024-07-23 11:54:41" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -17928,13 +18476,146 @@
 				<extendedProperties tagged="0" package_name="eProcurementOntology"/>
 				<packageproperties version="1.0" tpos="2"/>
 				<paths/>
-				<times created="2024-03-18 12:26:12" modified="2024-03-18 12:26:12"/>
+				<times created="2024-07-23 11:54:40" modified="2024-07-23 11:54:40"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
+			<element xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" xmi:type="uml:Class" name="adms:Identifier" scope="public">
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1020" ea_eleType="element"/>
+				<properties documentation="A character string to identify and distinguish uniquely, one instance of an object in an identification scheme from all other objects in the same scheme together with relevant supplementary information." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="mfontsan" version="1.0" phase="1.0" created="2018-10-22 10:56:42" modified="2024-07-23 13:21:12" complexity="1" status="Proposed"/>
+				<code product_name="Java" gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<attributes>
+					<attribute xmi:idref="EAID_DD21A105_2536_4ae0_A606_3868B9A27714" name="skos:notation" scope="Public">
+						<initial/>
+						<documentation value="The literal identifying an entity, like a person or an object."/>
+						<model ea_localid="1907" ea_guid="{DD21A105-2536-4ae0-A606-3868B9A27714}"/>
+						<properties type="rdf:PlainLiteral" derived="0" precision="0" collection="false" length="0" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="0"/>
+						<stereotype/>
+						<bounds lower="1" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_EC13F7E5_C9A2_45ce_A2E4_3AFC67778C5B" name="adms:schemaAgency" scope="Public">
+						<initial/>
+						<documentation value="The name of the agency that issued the identifier."/>
+						<model ea_localid="1909" ea_guid="{EC13F7E5-C9A2-45ce-A2E4-3AFC67778C5B}"/>
+						<properties type="rdf:PlainLiteral" derived="0" precision="0" collection="false" length="0" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="2"/>
+						<stereotype/>
+						<bounds lower="0" upper="*"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_291D3917_532F_4950_B4BF_22835EC1F3E6" name="epo:hasScheme" scope="Public">
+						<initial/>
+						<documentation value="The name of the identification scheme."/>
+						<model ea_localid="1912" ea_guid="{291D3917-532F-4950-B4BF-22835EC1F3E6}"/>
+						<properties type="rdf:PlainLiteral" derived="0" precision="0" collection="false" length="0" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="5"/>
+						<stereotype/>
+						<bounds lower="0" upper="*"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_34EA5DFD_574A_4a69_9F19_59FCED4CCEFC" name="epo:hasSchemeVersion" scope="Public">
+						<initial/>
+						<documentation value="The version of the identification scheme."/>
+						<model ea_localid="1914" ea_guid="{34EA5DFD-574A-4a69-9F19-59FCED4CCEFC}"/>
+						<properties type="rdf:PlainLiteral" derived="0" precision="0" collection="false" length="0" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="7"/>
+						<stereotype/>
+						<bounds lower="0" upper="*"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
+				<links>
+					<Association xmi:id="EAID_016185BE_FF6A_41c6_A77B_474BD1F071E0" start="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_0BDB5E69_CB31_4e1e_B095_115C894CFE58" start="EAID_A8D775E4_EEB9_4502_B8A1_C1DD5D555864" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_11702782_CA5B_4035_84B7_1E5035469B29" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_12549564_CE07_4367_8550_00BC16191558" start="EAID_025C0172_297F_4458_9268_2B10478B6736" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_15464872_BFB6_40bb_84F1_8A3969FE662E" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_1BEBAC59_19C6_4908_B93C_EED975A6974F" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_20A26F01_4C0B_48e1_A688_6DFFDE0D20A5" start="EAID_905EBE80_E994_48ec_B0A6_4F3CEC5EEDC0" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_23CC2B92_731F_4428_B333_8582A36D1244" start="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_27A758A5_D658_4005_919F_992C4207B974" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_319F106B_6066_4ba7_B084_12D7110FE9E0" start="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_31D80540_9E04_44d6_B0B4_339ED74111CC" start="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_36284C1D_C098_4082_BE39_99AFCAAF2C1F" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_3AA2C83C_532C_460c_99CE_63F041A42F06" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_4A4FE890_B03B_430a_A719_E1852BEECBEE" start="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_4DC15699_2F72_40f6_B574_D054957B5730" start="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_51A6863A_1079_4af7_AE53_091E3E0514AF" start="EAID_C215EC75_82FD_45d3_832A_B3989A897692" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_527F57B4_08F1_4183_A0A9_C1CCAB84A53A" start="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_52CB7369_B0C2_4acc_A513_76150076F808" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_55771AD3_C775_4324_AEBA_EA277D05F7E8" start="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_5A707B7A_A266_46a0_9CA9_EBF5B2C9D483" start="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_605B2EA3_201D_47cb_BCF7_9C5A5DD40C4B" start="EAID_3E3C6304_E823_43a1_8914_2046342E8F96" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_608CC8C6_3A48_4541_8467_9DDA71E8D534" start="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_63091EE9_B21F_4dae_99AF_66217D43BDA9" start="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_67F11C76_D909_4610_841A_BB8035525574" start="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_6F3635F3_387D_467a_95E2_ACDA293AE181" start="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_774EE008_B895_41f1_B319_1174DD83D564" start="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_77553B39_DB4D_4388_9D1B_8C8E24EB522C" start="EAID_9E80131F_7D1C_452d_98B2_308983569ECB" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_7DD90B0C_4D89_4d64_AC1D_F32A308572D4" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_7F56C70D_D0B9_4ad4_9CB4_9A6821D5E3E1" start="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_84490705_94B3_445f_ACA6_A903591C3651" start="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_95FB9493_C207_456a_A0EF_B68899832EE8" start="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_96C5B633_908F_48e5_82F6_C10FBDBF1DE3" start="EAID_3C8EEF69_1346_4dbe_B505_7C2D920B97B9" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_9843F34E_C9D3_471a_9622_B002A7A25EA7" start="EAID_8374872A_B283_4698_9E00_72FD255BAFCB" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_9F290187_06CC_4af8_83C9_F475091E0C14" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_A489FF3B_9E63_4b65_9418_542A437B67E4" start="EAID_9E80131F_7D1C_452d_98B2_308983569ECB" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_AA0E8762_9556_4ad9_8F4A_5A66B59C8A95" start="EAID_3124967E_D23F_4c3b_9B72_E02C23A08D68" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_ABF2C561_D263_44c6_A9E0_140763A1B061" start="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_ACCA405B_7FF7_41ad_9ACB_A1015C643C97" start="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_BBC722BA_3236_4fcb_B51A_14A66F3D627C" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_C6F7D14A_11BF_430e_ABED_4C9AC22FFF2A" start="EAID_29678A10_6473_461a_BE84_76269B5BBD68" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_C7C433B7_9297_4921_9069_80DF68AD408A" start="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_CEDC5261_E7FF_4ca6_8255_6B2812DC1B0C" start="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044" start="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_D42B1380_78A6_4579_B0FD_C3609EBD8AFD" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_D56DDC19_B837_4e3f_B996_A8D529DA32A2" start="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_D9C75333_AC70_477b_AA0D_15C3CB11CC0C" start="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_DA6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D" start="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_E507D198_1A41_4b43_873A_F9E88411186D" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_E6E5075B_3605_44e1_9693_42DB89B5FE8A" start="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_EBE8AC56_41A8_45f2_AE75_CB65D4939C94" start="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_EC04B8A5_6281_4f14_8017_204CCE05A2CC" start="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_ECEFDC69_19B4_47d7_A201_D8391B5C67DF" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_ED25B2CF_BC4D_44e9_957C_60FF1C08941F" start="EAID_495BBB92_468A_4f08_9330_A0C75730B97A" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_F0951C5B_94E2_4a5f_BF21_25D103CB3656" start="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_F3CD32F8_8180_4939_A987_53BA66264912" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_F9E4B0C6_6B39_4211_B8F3_83FC71C1725E" start="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+				</links>
+			</element>
 			<element xmi:idref="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" xmi:type="uml:Class" name="cccev:Constraint" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1899" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1899" ea_eleType="element"/>
 				<properties documentation="Limitation applied to an Information Concept.&#xA;&#xA;Additional Information:&#xA;Constraints are Requirements in themselves, since they impose prerequisites which influence the definition, use and/or Fulfilment of the Requirement. They represent hard conditions such as minimum or maximum expressions which can be used to evaluate pieces of information, the required age, income, involvement in activities, etc. An example from the eProcurement domain is a threshold as the minimum turnover required by the buying Organisation to select the Candidates. Note that CCCEV does not provide any specific guidance on when which kind of Requirement should be used. Users of this vocabulary should make decisions on this topic in their specific context." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-05-24 16:29:10" modified="2024-03-18 12:49:26" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-05-24 16:29:10" modified="2024-07-23 13:18:49" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -17966,9 +18647,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D" xmi:type="uml:Class" name="cccev:Criterion" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1796" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1796" ea_eleType="element"/>
 				<properties documentation="Condition for evaluation or assessment.&#xA;&#xA;Additional Information:&#xA;In general, Criteria are used for comparison, filtering or Selection purposes. Criteria usually set minimum conditions (e.g. limits, intervals, thresholds, etc.) that need to be met in order to pass the Requirements or to fulfil them to a certain degree or quality. The concept of Criteria is broader than the concept of Constraint since it covers more usages. The evaluation of the fulfilment is usually supported by the provision of Evidence. For example in the eProcurement domain, the eProcurement Ontology defines different subclasses of Criterion such as Exclusion Grounds, Selection Criteria or Award Criteria. A concrete example of a Criterion is 'participation in a criminal organisation' which could also be considered as an Exclusion Ground Criterion in the procurement domain or for requiring a public service." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-04-26 17:20:03" modified="2024-03-18 12:49:26" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-26 17:20:03" modified="2024-07-23 13:18:49" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -18028,9 +18709,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" xmi:type="uml:Class" name="cccev:Evidence" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1966" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1966" ea_eleType="element"/>
 				<properties documentation="Proof that a Requirement is met.&#xA;&#xA;Additional Information:&#xA;The class Evidence provides the means to support responses to Criteria or to a concrete Information Requirement or to an Information Concept inside an Information Requirement. The proof described by an Evidence can [1] verify a claim (i.e. is it true that John is 25, yes/no), [2] prove a condition (i.e. is John 18+, yes/no), or [3] simply provide data (i.e. the age of a person, namely 25). The proof can be given through documents or extracts of base registries, independently from its structure, format or medium used to exchange it: a pdf document, a video, a recording, etc.&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-07-19 15:16:09" modified="2024-03-18 12:49:26" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-07-19 15:16:09" modified="2024-07-23 13:18:49" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -18083,9 +18764,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" xmi:type="uml:Class" name="cccev:InformationConcept" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1968" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1968" ea_eleType="element"/>
 				<properties documentation="Piece of information that the Evidence provides or the Requirement needs.&#xA;&#xA;Additional Information:&#xA;&#xA;The Information Concept class offers the ability to describe conceptually the Requirements and provided facts in Evidences. In complementarity with the Supported Value class, this is a (first) step towards facilitating the assessment of the requirements in an automated way based on the Evidence provided." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-07-19 15:16:49" modified="2024-03-18 12:49:26" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-07-19 15:16:49" modified="2024-07-23 13:18:49" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -18133,24 +18814,27 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_30DD6891_71FE_4f87_832B_477790550BBC" xmi:type="uml:Class" name="cccev:InformationRequirement" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="3185" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="3185" ea_eleType="element"/>
 				<properties documentation="Requested data that is to be proven by Evidence.&#xA;&#xA;Additional Information:&#xA;&#xA;Information Requirements are the most neutral kind of Requirements. They aim to request information in any form, e.g. a person's date of birth or a company's turnover. They represent requests for data that prove one or more facts of the real world in a formal manner, or that leads to the source of such a proof. They can be understood as 'requests for Evidences'. The response to an Information Requirement is an Evidence when the issuer of the response is an authoritative source (e.g. a Civil Registry providing data about a natural person for the provision of public service through the Single Digital Gateway). In other cases, the responses might not be issued by an authoritative source, but the issuer supports the responses with Evidences (or commits to support them timely, e.g. a self-declaration or a declaration of oath). The Information Requirement can require structured data or documents of any form. For structured data, the Requirement can use 'Concepts' to specify the structure and type of the data expected in the response. For both structured and unstructured data, the Information Requirement can indicate the expected Type of Evidence, its format, source, and other properties related to the Evidence." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-09-26 08:15:10" modified="2024-03-18 12:49:27" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-09-26 08:15:10" modified="2024-07-23 13:18:49" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="classes"/>
 				<links>
+					<Association xmi:id="EAID_110A81E5_E1CC_45be_BCFD_56F87C51B05A" start="EAID_30DD6891_71FE_4f87_832B_477790550BBC" end="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
 					<Association xmi:id="EAID_5879D937_81BB_4b88_BC30_54B777A7B4B8" start="EAID_30DD6891_71FE_4f87_832B_477790550BBC" end="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1"/>
 					<Generalization xmi:id="EAID_6492D4E3_9631_45d4_9596_5EC3247529A2" start="EAID_30DD6891_71FE_4f87_832B_477790550BBC" end="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
+					<Association xmi:id="EAID_6AE31D37_FF1B_42a0_838A_8319D03108B2" start="EAID_30DD6891_71FE_4f87_832B_477790550BBC" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
+					<Association xmi:id="EAID_9FA89CC9_D9FD_4f2e_9237_C215D347E620" start="EAID_30DD6891_71FE_4f87_832B_477790550BBC" end="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
 					<Association xmi:id="EAID_5715AB6B_F88D_4b3e_857E_2AD843DEF3DE" start="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" end="EAID_30DD6891_71FE_4f87_832B_477790550BBC"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" xmi:type="uml:Class" name="cccev:Requirement" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1896" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1896" ea_eleType="element"/>
 				<properties documentation="Condition or prerequisite that is to be proven by Evidence.&#xA;&#xA;Additional Information:&#xA;Requirement is a generic class representing any type of prerequisite that may be desired, needed or imposed as an obligation. CCCEV recommends to not use the Requirement class directly, but rather a more semantically-enriched subclass such as Criterion, Information Requirement or Constraint. Also note that the Requirement class is specified at a more abstract level and is not to be used as the instantiation of a Requirement for a specific Agent.&#xA;To illustrate the notion: the European Directive on services in the internal market defines requirement as any obligation, prohibition, condition or limit provided for in the laws, regulations or administrative provisions of the Member States or in consequence of case-law, administrative practice, the rules of professional bodies, or the collective rules of professional associations or other professional Organisations, adopted in the exercise of their legal autonomy.&#xA;To stay consistent to how identification is realised in the eProcurement ontology, we switch to using `adms:identifier` instead of `dct:identifier` as per CCCEV specification." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-05-24 15:52:55" modified="2024-03-18 12:49:27" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-05-24 15:52:55" modified="2024-07-23 13:18:49" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -18203,9 +18887,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_33E9269C_0B96_4b38_A129_C30771A9833F" xmi:type="uml:Class" name="cpov:ContactPoint" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="866" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="866" ea_eleType="element"/>
 				<properties documentation="Information (e.g. e-mail address, telephone number) of a Person or department through which the user can get in touch with.&#xA;&#xA;Additional information: &#xA;This class represents the contact information for a Public Service, Channel, Public Organisation, etc.&#xA;The Contact Point could be a role, email address, telephone number, etc.&#xA;&#xA;WG approval 5/11/2019" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2020-02-14 18:42:21" modified="2024-03-18 12:27:32" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2020-02-14 18:42:21" modified="2024-07-23 13:17:45" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -18311,9 +18995,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_48133D6A_BE44_43c9_A647_04650698EC95" xmi:type="uml:Class" name="cpov:PublicOrganisation" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="931" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="931" ea_eleType="element"/>
 				<properties documentation="An Organisation that is defined as being part of the public sector by a legal framework at any level.&#xA;&#xA;Additional information: &#xA;A body governed by public law:&#xA;- (a) established for the specific Purpose of meeting needs in the general interest&#xA;- (b) having legal personality; &#xA;- (c) financed, for the most part by the State, or regional or local authorities. &#xA;&#xA;Examples of Public Organisations are municipality, international public body, ministry, others.&#xA;&#xA;WG Approval 28/04/2020" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="jrevenga" version="1.0" phase="1.0" created="2020-02-11 17:35:16" modified="2024-03-18 12:26:43" complexity="1" status="Proposed"/>
+				<project author="jrevenga" version="1.0" phase="1.0" created="2020-02-11 17:35:16" modified="2024-07-23 11:55:02" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -18324,9 +19008,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A" xmi:type="uml:Class" name="cv:Channel" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="2668" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="2668" ea_eleType="element"/>
 				<properties documentation="A medium through which Agents interact. &#xA;&#xA;Additional Information&#xA;Typical examples include online services, email, endpoint on eDelivery infrastructure, phone, etc.&#xA;&#xA;Software solutions and electronic devices for communication and exchange of information between Buyers and economic Operators.&#xA;Lots may use ad-hoc electronic means of communication that are not generally available such as specific solutions for secure and dedicated communication or non-standard eCatalogues.&#xA;&#xA;See also Directive recitals 53 to 56.&#xA;&#xA;WG approval 2023-02-14" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2023-02-14 15:22:32" modified="2024-03-18 12:27:32" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2023-02-14 15:22:32" modified="2024-07-23 13:17:45" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -18335,7 +19019,7 @@
 				<attributes>
 					<attribute xmi:idref="EAID_7DB1AA63_8792_484d_909C_83FEC34C0F01" name="epo:hasAddressURL" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="The resource identifier for a Channel.&#xA;&#xA;WG approval 26/03/2024"/>
 						<model ea_localid="2262" ea_guid="{7DB1AA63-8792-484d-909C-83FEC34C0F01}"/>
 						<properties type="xsd:anyURI" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -18344,7 +19028,7 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -18373,9 +19057,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" xmi:type="uml:Class" name="dct:Location" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="3072" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="3072" ea_eleType="element"/>
 				<properties documentation="An identifiable geographic place or named place.&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-06-26 17:14:19" modified="2024-03-18 12:27:32" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-06-26 17:14:19" modified="2024-07-23 13:17:45" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -18413,9 +19097,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" xmi:type="uml:Class" name="epo:AccessTerm" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="849" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="849" ea_eleType="element"/>
 				<properties documentation="Conditions and stipulations about where and how to access the Procurement Documents.&#xA;&#xA;WG Approval 09/03/2021&#xA;&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="jseguraf" version="1.0" phase="1.0" created="2019-03-07 15:42:27" modified="2024-03-18 12:27:58" complexity="1" status="Proposed"/>
+				<project author="jseguraf" version="1.0" phase="1.0" created="2019-03-07 15:42:27" modified="2024-07-23 13:18:02" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -18496,9 +19180,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_23AE06F7_776F_4c3b_ACE5_A42B2D392823" xmi:type="uml:Class" name="epo:AcquiringCentralPurchasingBody" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1045" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1045" ea_eleType="element"/>
 				<properties documentation="Role of an Agent procuring activities conducted on a permanent basis in the form of the acquisition of supplies and/or services intended for other Buyers.&#xA;Additional Information:&#xA;In Public Procurement the Role of Acquiring Central Purchasing Body is carried out by a Central Purchasing Body for other Contracting Authorities.&#xA;&#xA;WG approval 05/08/2021&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-09-15 13:03:15" modified="2024-03-18 12:27:00" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-09-15 13:03:15" modified="2024-07-23 13:17:10" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -18509,9 +19193,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" xmi:type="uml:Class" name="epo:AcquiringParty" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="2109" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="2109" ea_eleType="element"/>
 				<properties documentation="The Role of an Agent that acts on the buying side of a Procurement Process.&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-10-31 11:31:45" modified="2024-03-18 12:27:00" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-10-31 11:31:45" modified="2024-07-23 13:17:10" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -18540,9 +19224,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_BAEE0189_A777_46c7_A426_F3B02E584BAC" xmi:type="uml:Class" name="epo:AdHocChannel" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="2902" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="2902" ea_eleType="element"/>
 				<properties documentation="Web page where tools and devices for electronic communication that are not generally available can be downloaded free of charge.&#xA;&#xA;Additional Information:&#xA;&#xA;This corresponds in eForms to BT-724 Tool Atypical.&#xA;&#xA;&#xA;WG Acceptance 10/01/2023&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-04-11 11:33:07" modified="2024-03-18 12:26:43" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-04-11 11:33:07" modified="2024-07-23 11:55:02" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -18553,9 +19237,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" xmi:type="uml:Class" name="epo:AgentInRole" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1326" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1326" ea_eleType="element"/>
 				<properties documentation="Relative concept that ties an Agent to a part they play in a given Situational Context.&#xA;&#xA;Additional information:&#xA;The classification of roles is based is based on the degree of involvement into the Procurement Process: &#xA;- Primary (Procurement) Pole is directly involved in the Procurement Process;&#xA;- Secondary (Procurement sub-) Role is secondary to the Procurement Process&#xA;- Tertiary (Related) Role is not involved in the Procurement Process." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 11:26:56" modified="2024-03-18 12:27:00" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 11:26:56" modified="2024-07-23 13:17:10" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -18612,9 +19296,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5" xmi:type="uml:Class" name="epo:AuxiliaryParty" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="2111" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="2111" ea_eleType="element"/>
 				<properties documentation="Role of an Agent who may be mentioned in the information exchanged during the Procurement Process but who does not play an active part in it." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-10-31 11:32:47" modified="2024-03-18 12:27:00" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-10-31 11:32:47" modified="2024-07-23 13:17:10" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -18622,6 +19306,7 @@
 				<extendedProperties tagged="0" package_name="classes"/>
 				<links>
 					<Generalization xmi:id="EAID_AE2DB18B_3AF3_4133_AE88_A4F91623D21B" start="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
+					<Generalization xmi:id="EAID_0E005307_D7E7_4c2a_B693_817916BDFA4B" start="EAID_0D5BCA5B_42CB_4202_9453_012E0A141952" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
 					<Generalization xmi:id="EAID_0F5296C9_3949_4cbc_913E_EAEE25BEEAD8" start="EAID_CADD27F3_86EF_483f_A036_7DF4251EE09C" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
 					<Generalization xmi:id="EAID_10602E2D_EE49_4483_BF7D_068AAD2C5033" start="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
 					<Generalization xmi:id="EAID_1982F8A2_ECBE_47d6_9A92_7176519FD4A5" start="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
@@ -18635,9 +19320,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_38BC5625_EAC0_4eb0_807A_C15FA10B40F7" xmi:type="uml:Class" name="epo:AwardCriteriaSummary" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="3035" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-06-08 12:06:15" modified="2024-03-18 12:49:27" complexity="1" status="Proposed"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="3035" ea_eleType="element"/>
+				<properties documentation="Overview of the Award Criteria.&#xA;&#xA;WG approval 19/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-06-08 12:06:15" modified="2024-07-23 13:19:02" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -18648,9 +19333,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2" xmi:type="uml:Class" name="epo:AwardCriterion" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="853" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="853" ea_eleType="element"/>
 				<properties documentation="Criterion that describes a Requirement that the Tender needs to resolve and on which the Tender is evaluated and ranked.&#xA;&#xA;WG approval 05/11/2018" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="mfontsan" version="1.0" phase="1.0" created="2018-05-28 17:05:42" modified="2024-03-18 12:49:27" complexity="1" status="Proposed"/>
+				<project author="mfontsan" version="1.0" phase="1.0" created="2018-05-28 17:05:42" modified="2024-07-23 13:19:02" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -18659,7 +19344,7 @@
 				<attributes>
 					<attribute xmi:idref="EAID_AA86F070_25D3_46df_95DD_5B5DE9E1726B" name="epo:hasAwardCriteriaStatedInProcurementDocuments" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="The Award Criteria are provided in the Procurement Documents.&#xA;&#xA;WG approval 26/03/2024"/>
 						<model ea_localid="2397" ea_guid="{AA86F070-25D3-46df-95DD-5B5DE9E1726B}"/>
 						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -18668,7 +19353,7 @@
 						<bounds lower="1" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -18695,9 +19380,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_B4F30642_373D_4195_B1E6_10198F138ED8" xmi:type="uml:Class" name="epo:Awarder" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1333" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1333" ea_eleType="element"/>
 				<properties documentation="A Role of an Agent that signs the Award Decision.&#xA;&#xA;Additional information:&#xA;BT-08 can be Awarding CBP; BG-03 is the Buyer. But Awarding CPB is not the same as the Buyer; the organisations may differ for these roles. Having the Awarder Role allows us to specify which Organisation is involved in the Award Decision.&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 11:38:56" modified="2024-03-18 12:27:00" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 11:38:56" modified="2024-07-23 13:17:10" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -18708,9 +19393,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_C932A7D1_D54B_40f1_92A7_459C07235810" xmi:type="uml:Class" name="epo:AwardEvaluationTerm" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1469" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1469" ea_eleType="element"/>
 				<properties documentation="Conditions and stipulations defining particularities of the evaluation of Award Criteria." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-01-16 17:32:55" modified="2024-03-18 12:37:20" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-01-16 17:32:55" modified="2024-07-23 13:18:22" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -18798,9 +19483,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_620C5C3F_3C72_4897_A377_32156A5461E3" xmi:type="uml:Class" name="epo:AwardingCentralPurchasingBody" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1050" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1050" ea_eleType="element"/>
 				<properties documentation="Role of an Agent procuring activities conducted on a permanent basis in the form of the award of Public Contracts or the conclusion of Framework Agreements for works, supplies or services intended for other Buyers.&#xA;Additional Information:&#xA;In Public Procurement the Role of Awarding Central purchasing Body is carried out by a Central Purchasing Body for other Contracting Authorities.&#xA;&#xA;WG approval 05/08/2021&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-09-15 13:04:01" modified="2024-03-18 12:27:00" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-09-15 13:04:01" modified="2024-07-23 13:17:10" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -18811,9 +19496,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687" xmi:type="uml:Class" name="epo:AwardOutcome" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="3068" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2023-06-26 15:15:25" modified="2024-03-18 12:53:58" complexity="1" status="Proposed"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="3068" ea_eleType="element"/>
+				<properties documentation="Result concerning the competition that was attributed by the Awarder.&#xA;&#xA;WG approval 19/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2023-06-26 15:15:25" modified="2024-07-23 13:19:28" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -18833,9 +19518,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_5696AD02_F9CD_40d0_94EC_172DCDA4EF78" xmi:type="uml:Class" name="epo:BudgetProvider" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1339" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1339" ea_eleType="element"/>
 				<properties documentation="A role of an agent whose Budget is used to pay for the Contract." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 11:59:15" modified="2024-03-18 12:27:00" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 11:59:15" modified="2024-07-23 13:17:10" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -18847,9 +19532,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C" xmi:type="uml:Class" name="epo:Business" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="856" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="856" ea_eleType="element"/>
 				<properties documentation="A private law company registered in a national registry.&#xA;&#xA;WG Approval 28/04/2020&#xA;&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="jrevenga" version="1.0" phase="1.0" created="2020-02-11 17:35:20" modified="2024-03-18 12:26:43" complexity="1" status="Proposed"/>
+				<project author="jrevenga" version="1.0" phase="1.0" created="2020-02-11 17:35:20" modified="2024-07-23 11:55:02" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -18879,9 +19564,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750" xmi:type="uml:Class" name="epo:Buyer" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="857" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="857" ea_eleType="element"/>
 				<properties documentation="A Role of an Agent that awards a Contract and/or purchases items.&#xA;&#xA;Additional information:&#xA;In Public Procurement the Role of Buyer is carried out by the following types of Organisation: Contracting Authority, Contracting Entity, a defense Contractor, an international Organisation, or an organisation awarding a Contract subsidized by a Contracting Authority.&#xA;In Pre-Award, the Buyer generally awards the Contract, however future purchasers may be foreseen.&#xA;In Post-Award the buyer generally refers to the purchaser of items." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2018-09-03 14:18:17" modified="2024-03-18 12:27:00" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2018-09-03 14:18:17" modified="2024-07-23 13:17:10" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -18946,6 +19631,7 @@
 					<Generalization xmi:id="EAID_7B93C4E4_6684_4b82_BE6A_D4FA2FE59843" start="EAID_ABEE1795_5EE6_4f51_ACEA_C3F05211F0B3" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
 					<Association xmi:id="EAID_8C74AF3F_89A0_4039_8257_A68F3DC30CC3" start="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
 					<Association xmi:id="EAID_9B2D6DCC_5092_48cf_878A_8035A42A43F9" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
+					<Association xmi:id="EAID_ADB3D05D_CE75_486d_B38A_27314A2F62B2" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
 					<Association xmi:id="EAID_C00C71CA_F2D3_48ca_8D27_E3F34E3AF36B" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
 					<Association xmi:id="EAID_D01E7677_5AC2_42b1_AA17_2A8EC003CCFE" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
 					<Association xmi:id="EAID_D2FAB429_5D16_4718_A790_6F3EB673B453" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
@@ -18955,9 +19641,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32" xmi:type="uml:Class" name="epo:Candidate" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="2605" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="2605" ea_eleType="element"/>
 				<properties documentation="The Role of an Agent that has sought an invitation or has been invited to take part in a restricted Procedure, in a competitive Procedure with negotiation, in a negotiated Procedure without prior publication, in a competitive dialogue or in an innovation partnership.&#xA;&#xA;WG approval 30/05/2023" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2023-01-31 14:30:12" modified="2024-03-18 12:27:00" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2023-01-31 14:30:12" modified="2024-07-23 13:17:10" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -18969,9 +19655,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6" xmi:type="uml:Class" name="epo:CatalogueProvider" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1049" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1049" ea_eleType="element"/>
 				<properties documentation="A Role of an Agent  compiling and supplying a Catalogue.&#xA;&#xA;Additional Information:&#xA;&#xA;The Catalogue Provider Role is usually played by the Agent that acts as a Seller, or by another Agent that acts on behalf of the Seller.&#xA;&#xA;WG Approval 28/01/2021&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-09-15 16:31:02" modified="2024-03-18 12:27:00" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-09-15 16:31:02" modified="2024-07-23 13:17:10" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -18985,9 +19671,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62" xmi:type="uml:Class" name="epo:CatalogueReceiver" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1048" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1048" ea_eleType="element"/>
 				<properties documentation="A Role of an Agent processing a Catalogue.&#xA;&#xA;Additional Information:&#xA;The Catalogue Receiver may not only receive it but also validate it, process it, etc.&#xA;&#xA;The Catalogue Receiver role is usually played by the agent that acts as a Buyer, or by another Agent that acts on behalf of the Buyer.&#xA;&#xA;WG Approval 28/01/2021" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-09-15 16:31:47" modified="2024-03-18 12:27:00" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-09-15 16:31:47" modified="2024-07-23 13:17:10" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -19001,9 +19687,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC" xmi:type="uml:Class" name="epo:CentralPurchasingBody" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="863" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="863" ea_eleType="element"/>
 				<properties documentation="Role of an Agent that provides centralised purchasing activities and, possibly, ancillary purchasing activities for other Buyers.&#xA;&#xA;Additional Information:&#xA;In Public Procurement the Role of Central Purchasing Body is carried out by a Contracting Authority for other Contracting Authorities.&#xA;Contracting Authority procuring activities conducted on a permanent basis, in one of the following forms:[...](b) the award of Public Contracts or the conclusion of Framework Agreements for works, supplies or services intended for Contracting Authorities;&#xA;&#xA;WG approval 05/08/2021" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="jseguraf" version="1.0" phase="1.0" created="2018-09-26 16:53:57" modified="2024-03-18 12:27:00" complexity="1" status="Proposed"/>
+				<project author="jseguraf" version="1.0" phase="1.0" created="2018-09-26 16:53:57" modified="2024-07-23 13:17:10" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;" styleex="ConstructID=0;"/>
 				<tags/>
@@ -19016,9 +19702,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" xmi:type="uml:Class" name="epo:ChangeInformation" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1811" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1811" ea_eleType="element"/>
 				<properties documentation="Alteration to previously provided details." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-04-28 22:14:16" modified="2024-03-18 12:54:52" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-28 22:14:16" modified="2024-07-23 13:20:45" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -19111,9 +19797,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_20289A3C_51F0_43b4_8663_0B6367844B1B" xmi:type="uml:Class" name="epo:ConcessionContract" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1892" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1892" ea_eleType="element"/>
 				<properties documentation="A Contract between one or more Buyers and one or more Economic Operators giving the right to the Economic Operators to exploit the rights foreseen in the Contract which may include the receipt of Payments.&#xA;&#xA;WG Approval 24/05/2022" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-05-19 12:42:34" modified="2024-03-18 12:54:23" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-05-19 12:42:34" modified="2024-07-23 13:20:19" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -19124,9 +19810,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" xmi:type="uml:Class" name="epo:ConcessionEstimate" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="2003" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-08-09 17:24:25" modified="2024-03-18 12:54:07" complexity="1" status="Proposed"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="2003" ea_eleType="element"/>
+				<properties documentation="Approximation concerning the foreseen Concession Contract.&#xA;&#xA;WG approval 19/03/2024&#xA;&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-08-09 17:24:25" modified="2024-07-23 13:19:37" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -19159,9 +19845,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0" xmi:type="uml:Class" name="epo:ContextDescription" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1718" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1718" ea_eleType="element"/>
 				<properties documentation="A description concerning a Procurement Object or a Notice in a specific Situation Context. &#xA;&#xA;Additional Information:&#xA;The description has its own identity (+I) but is dependent (+D) on the concerned Entity. &#xA;&#xA;We say that ContextDescription *concerns* an Entity.&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-04-15 16:35:04" modified="2024-03-18 12:54:07" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-04-15 16:35:04" modified="2024-07-23 13:19:37" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -19182,9 +19868,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_B2165393_B24C_4dd7_A2E2_DE976E538481" xmi:type="uml:Class" name="epo:ContextualProjection" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1719" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1719" ea_eleType="element"/>
 				<properties documentation="Projection of an Entity and all of its properties that hold in a given Situation Context. &#xA;&#xA;Additional Information:&#xA;The contextual projection does not have its own identity (-I), is dependent  (+D) on the described Entity, and is anti-rigid (~R)&#xA;&#xA;We say that ContextualProjection *describes* an Entity.&#xA;&#xA;Adaptation of ContextSlices pattern encoding a 4D view.&#xA;http://ontologydesignpatterns.org/wiki/Submissions:Context_Slices" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-04-15 16:35:23" modified="2024-03-18 12:54:07" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-04-15 16:35:23" modified="2024-07-23 13:19:37" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -19196,9 +19882,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" xmi:type="uml:Class" name="epo:Contract" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="867" ea_eleType="element"/>
-				<properties documentation="A voluntary, deliberate, and legally binding agreement between two or more competent parties.&#xA;&#xA;Additional information:&#xA;This includes Concession Contracts.&#xA;&#xA;WG approval 01/06/2018" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2018-03-25 17:57:55" modified="2024-03-18 12:54:23" complexity="1" status="Proposed"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="867" ea_eleType="element"/>
+				<properties documentation="A voluntary, deliberate, and legally binding agreement between two or more competent parties.&#xA;&#xA;WG approval 19/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2018-03-25 17:57:55" modified="2024-07-23 13:20:19" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -19257,6 +19943,7 @@
 					<Generalization xmi:id="EAID_3675E499_10A4_457e_9458_83E0C40CEC9A" start="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
 					<Association xmi:id="EAID_37C1B1D3_F31C_482d_82B0_7ED4BAC17D43" start="EAID_D847D616_70DB_473a_A2A4_6665F938474C" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
 					<Association xmi:id="EAID_4A2A2E13_AE75_4b0d_B325_4443E0BF6A2D" start="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+					<Association xmi:id="EAID_63923E1F_6373_4e4c_BC58_974BA33F469A" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
 					<Generalization xmi:id="EAID_7787587B_6BE4_4863_801D_DFF3EA946B55" start="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
 					<Association xmi:id="EAID_7E9B4B6E_15E8_4ec4_876B_BEE9D986B4DA" start="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
 					<Generalization xmi:id="EAID_7F8C9069_9D3F_4494_8C14_7C6DA83E8A46" start="EAID_3B0D0A49_89AC_495b_B909_CD8CC73898DE" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
@@ -19268,9 +19955,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" xmi:type="uml:Class" name="epo:ContractLotCompletionInformation" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1672" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1672" ea_eleType="element"/>
 				<properties documentation="Information related to a given Lot at the end of the procurement." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-03-25 10:39:52" modified="2024-03-18 12:54:07" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-03-25 10:39:52" modified="2024-07-23 13:19:37" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -19279,7 +19966,7 @@
 				<attributes>
 					<attribute xmi:idref="EAID_B32A9E0D_605C_457b_A377_9332E2AA545D" name="epo:hasPaymentValueDiscrepancyJustification" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="Justification for the actual value being different to the value in the initial Contract.&#xA;&#xA;WG approval 26/03/2024"/>
 						<model ea_localid="2407" ea_guid="{B32A9E0D-605C-457b-A377-9332E2AA545D}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -19288,7 +19975,7 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -19302,25 +19989,27 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" xmi:type="uml:Class" name="epo:Contractor" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="871" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="871" ea_eleType="element"/>
 				<properties documentation="The Role of an Agent  that has signed a Contract with a Buyer.&#xA;&#xA;WG approval 08/11/2022" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2020-03-26 16:01:35" modified="2024-03-18 12:27:00" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2020-03-26 16:01:35" modified="2024-07-23 13:17:10" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="classes"/>
 				<links>
+					<Association xmi:id="EAID_4347709B_D87B_4476_92B0_4EF65D96A0BA" start="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" end="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7"/>
 					<Generalization xmi:id="EAID_910BFAB5_C09F_48c2_A281_70A523440BFB" start="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+					<Association xmi:id="EAID_9E5B53CF_762F_4436_88E6_F386741960D6" start="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" end="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7"/>
 					<Association xmi:id="EAID_BBA3014F_919D_4de3_BCF2_6CA4F71150CA" start="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" end="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3"/>
 					<Association xmi:id="EAID_75F02E69_A9AF_47c5_B217_F52FFB1CAD53" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7"/>
 					<Association xmi:id="EAID_EC8CA809_26BC_46b1_A885_D5B3B1D5960A" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" xmi:type="uml:Class" name="epo:ContractSpecificTerm" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1891" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1891" ea_eleType="element"/>
 				<properties documentation="Gathering class for conditions and stipulations related to a contract in the Post-Award Phase." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-05-17 16:24:38" modified="2024-03-18 12:37:26" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-05-17 16:24:38" modified="2024-07-23 13:18:29" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -19336,9 +20025,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" xmi:type="uml:Class" name="epo:ContractTerm" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="873" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="873" ea_eleType="element"/>
 				<properties documentation="Conditions and stipulations defining particularities of the Post Award Phase.&#xA;&#xA;(WG approval 23/11/2018)&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="mfontsan" version="1.0" phase="1.0" created="2018-05-10 09:48:05" modified="2024-03-18 12:37:13" complexity="1" status="Proposed"/>
+				<project author="mfontsan" version="1.0" phase="1.0" created="2018-05-10 09:48:05" modified="2024-07-23 13:18:17" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -19541,9 +20230,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_44E7963D_28F5_4263_835A_24C87816F40C" xmi:type="uml:Class" name="epo:DesignContestRegimeTerm" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="876" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="876" ea_eleType="element"/>
 				<properties documentation="Conditions and stipulations defining particularities of a Design Contest.&#xA;&#xA;WG approval: 04-02-2021" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="jseguraf" version="1.0" phase="1.0" created="2018-12-19 15:34:26" modified="2024-03-18 12:37:13" complexity="1" status="Proposed"/>
+				<project author="jseguraf" version="1.0" phase="1.0" created="2018-12-19 15:34:26" modified="2024-07-23 13:18:17" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -19612,7 +20301,7 @@
 					</attribute>
 					<attribute xmi:idref="EAID_17586F94_9491_4e26_87CA_DC841CBE6FB1" name="epo:hasDescriptionOfPrizes" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="Explanatory text about Prizes.&#xA;&#xA;WG approval 26/03/2024"/>
 						<model ea_localid="2448" ea_guid="{17586F94-9491-4e26-87CA-DC841CBE6FB1}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -19621,7 +20310,7 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -19633,9 +20322,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" xmi:type="uml:Class" name="epo:DirectAwardTerm" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="877" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="877" ea_eleType="element"/>
 				<properties documentation="Conditions and stipulations defining particularities of the award of a Contract without prior publication.&#xA;&#xA;Addtional Information:&#xA;&#xA;Direct award may refer to a previous Procedure and/or specific Lot(s).&#xA;&#xA;It may also refer to other justified situations whereby there is no previous Procedure.&#xA;&#xA;See Directive 2014/24/EU Article 32.&#xA;&#xA;WG Approval 22/11/2019&#xA;&#xA;&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="jseguraf" version="1.0" phase="1.0" created="2019-03-19 14:59:21" modified="2024-03-18 12:28:04" complexity="1" status="Proposed"/>
+				<project author="jseguraf" version="1.0" phase="1.0" created="2019-03-19 14:59:21" modified="2024-07-23 13:18:07" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -19666,9 +20355,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_3B0D0A49_89AC_495b_B909_CD8CC73898DE" xmi:type="uml:Class" name="epo:DirectContract" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="3002" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-05-24 13:12:58" modified="2024-03-18 12:54:23" complexity="1" status="Proposed"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="3002" ea_eleType="element"/>
+				<properties documentation="A Contract resulting from Lot Award Outcome.&#xA;&#xA;Additional information:&#xA;A Framework Agreement is not a Direct Contract.&#xA;&#xA;WG approval 19/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-05-24 13:12:58" modified="2024-07-23 13:20:19" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -19680,9 +20369,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" xmi:type="uml:Class" name="epo:Document" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="878" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="878" ea_eleType="element"/>
 				<properties documentation="A set of interrelated Business Information representing the Business facts and associated metadata.&#xA;The information may be conveyed in any language, medium or form, including textual, numerical, graphic, cartographic, audio-visual forms, etc.&#xA;&#xA;WG Approval 23/05/2019&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2018-03-25 18:07:59" modified="2024-03-18 12:54:16" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2018-03-25 18:07:59" modified="2024-07-23 13:20:35" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -19843,10 +20532,31 @@
 					<Association xmi:id="EAID_F7CADBEA_BE8C_41f0_8070_7102E73439C9" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
 				</links>
 			</element>
+			<element xmi:idref="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" xmi:type="uml:Class" name="epo:Duration" scope="public">
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1698" ea_eleType="element"/>
+				<properties documentation="The length of time in which a concept occurs." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-01 17:00:17" modified="2024-07-23 13:21:12" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<links>
+					<Generalization xmi:id="EAID_9501DE7B_F539_4409_8D54_7B950268D75C" start="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" end="EAID_F8F2DEF8_6045_44d5_93B9_E57CE8023BE9"/>
+					<Association xmi:id="EAID_1EA9C84A_C46F_456b_A355_DA9CD314CBA0" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
+					<Association xmi:id="EAID_45B983F5_7502_49f2_984C_17FF6E47F8F9" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
+					<Association xmi:id="EAID_A01E8ADE_1698_4353_BEDB_63334B745ECB" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
+					<Association xmi:id="EAID_C741BADB_0CAC_40d5_A730_696A39D2224E" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
+					<Association xmi:id="EAID_EB2AC560_378D_4c18_9647_0E2E150D7463" start="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
+					<Association xmi:id="EAID_EFDCE7F5_7EC7_4537_B26B_232F5FB37A9C" start="EAID_3F572668_3AED_4090_BAB3_9047B4874154" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
+					<Generalization xmi:id="EAID_F8285143_A232_43ae_AFC8_89D40A9529FD" start="EAID_7D0E71D7_D624_4144_8134_2500CE9AB392" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
+					<Generalization xmi:id="EAID_FE0B0FB5_E0B6_41e2_AA82_ECF06C845021" start="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
+				</links>
+			</element>
 			<element xmi:idref="EAID_C06EA401_3F55_4448_B4FF_BB7EA510A155" xmi:type="uml:Class" name="epo:DynamicPurchaseSystemTechnique" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="880" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="880" ea_eleType="element"/>
 				<properties documentation="A Technique that allows the selection of Candidates throughout the Procedure via the Qualification Criteria, followed by individual Mini-Competitions for the Award of Purchase Contracts.&#xA;&#xA;WG approval 23/05/2023" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2018-03-25 12:34:06" modified="2024-03-18 12:51:51" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2018-03-25 12:34:06" modified="2024-07-23 13:19:19" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -19858,9 +20568,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_7D8A2312_4686_49e6_B174_97BCF34F4CE4" xmi:type="uml:Class" name="epo:EAuctionTechnique" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="881" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="881" ea_eleType="element"/>
 				<properties documentation="A repetitive Technique in which new Prices, revised downwards, and/or new values concerning certain elements of Tenders are bid on-line.&#xA;&#xA;Additional Information:&#xA;This corresponds in eForms to BT-767	 Electronic Auction .&#xA;&#xA;WG approval 20/07/2018" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="mfontsan" version="1.0" phase="1.0" created="2018-02-21 10:51:15" modified="2024-03-18 12:51:51" complexity="1" status="Proposed"/>
+				<project author="mfontsan" version="1.0" phase="1.0" created="2018-02-21 10:51:15" modified="2024-07-23 13:19:19" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -19871,9 +20581,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_E47E88D6_0393_469c_89FB_39DC4844FBCE" xmi:type="uml:Class" name="epo:EconomicStandingSummary" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="2944" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-05-02 16:35:20" modified="2024-03-18 12:49:27" complexity="1" status="Proposed"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="2944" ea_eleType="element"/>
+				<properties documentation="Overview of the financial viability of the economic operator.&#xA;&#xA;WG approval 19/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-05-02 16:35:20" modified="2024-07-23 13:19:02" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -19884,9 +20594,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_4AE23ED9_1639_41e0_A758_C201E2EDE124" xmi:type="uml:Class" name="epo:ElectronicSignature" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="2901" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-04-04 16:57:03" modified="2024-03-18 12:54:16" complexity="1" status="Proposed"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="2901" ea_eleType="element"/>
+				<properties documentation="Data in electronic form which is attached to or logically associated with other data in electronic form and which is used by the signatory to sign.&#xA;&#xA;Additional information:&#xA;The definition comes from REGULATION (EU) No 910/2014. &#xA;&#xA;WG approval 19/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-04-04 16:57:03" modified="2024-07-23 13:20:35" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -19914,9 +20624,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_7A0A8591_894D_4c11_A2EF_EAB3AA90B79D" xmi:type="uml:Class" name="epo:EmploymentInformationProvider" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1331" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1331" ea_eleType="element"/>
 				<properties documentation="A Role of an Agent  responsible for providing information concerning the general regulatory framework for employment protection and working conditions." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 11:35:05" modified="2024-03-18 12:27:00" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 11:35:05" modified="2024-07-23 13:17:10" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -19927,9 +20637,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_A26B1993_0ADD_4f4b_B33D_9CEF05DBC14D" xmi:type="uml:Class" name="epo:EnvironmentalProtectionInformationProvider" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1332" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1332" ea_eleType="element"/>
 				<properties documentation="A Role of an Agent responsible for providing information concerning the general regulatory framework for Environmental Protection." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 11:35:45" modified="2024-03-18 12:27:00" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 11:35:45" modified="2024-07-23 13:17:10" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -19940,9 +20650,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897" xmi:type="uml:Class" name="epo:Estimate" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1648" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1648" ea_eleType="element"/>
 				<properties documentation="An approximate calculation or a judgement of the value, number, Quantity or extent of something." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-03-17 12:56:06" modified="2024-03-18 12:54:07" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-03-17 12:56:06" modified="2024-07-23 13:19:37" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -19955,9 +20665,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_0C735489_15DC_40a7_A94E_A9202738B188" xmi:type="uml:Class" name="epo:EvaluationTerm" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="890" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="890" ea_eleType="element"/>
 				<properties documentation="Conditions and stipulations defining particularities of the Tender evaluation.&#xA;&#xA;(WG approval 23/11/2018)&#xA;&#xA;&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="mfontsan" version="1.0" phase="1.0" created="2018-05-10 09:35:29" modified="2024-03-18 12:37:20" complexity="1" status="Proposed"/>
+				<project author="mfontsan" version="1.0" phase="1.0" created="2018-05-10 09:35:29" modified="2024-07-23 13:18:22" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -19970,9 +20680,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90" xmi:type="uml:Class" name="epo:ExclusionGround" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="892" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="892" ea_eleType="element"/>
 				<properties documentation="Criterion that describes a legal Requirement to be met by the Economic Operator to be a Candidate in the Procurement.&#xA;&#xA;Additional Information:&#xA;This corresponds in eForms to BG-701 Exclusion Grounds.&#xA;&#xA;WG approval 31/10/2018" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="mfontsan" version="1.0" phase="1.0" created="2018-02-15 11:02:44" modified="2024-03-18 12:49:27" complexity="1" status="Proposed"/>
+				<project author="mfontsan" version="1.0" phase="1.0" created="2018-02-15 11:02:44" modified="2024-07-23 13:19:02" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -19984,9 +20694,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_AE22E69E_F035_4a34_A84F_629922B88DE1" xmi:type="uml:Class" name="epo:ExclusionGroundsSummary" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="2592" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-01-24 17:20:24" modified="2024-03-18 12:49:27" complexity="1" status="Proposed"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="2592" ea_eleType="element"/>
+				<properties documentation="Overview of the Exclusion Grounds.&#xA;&#xA;WG approval 19/03/2024&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-01-24 17:20:24" modified="2024-07-23 13:19:02" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -19997,22 +20707,25 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11" xmi:type="uml:Class" name="epo:ExpressionOfInterest" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1028" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1028" ea_eleType="element"/>
 				<properties documentation="Document presenting an Economic Operator's Request to be considered for Procedures covering a specific domain.&#xA;WG approval 13/04/2021" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="jseguraf" version="1.0" phase="1.0" created="2021-02-25 16:18:49" modified="2024-03-18 12:54:16" complexity="1" status="Proposed"/>
+				<project author="jseguraf" version="1.0" phase="1.0" created="2021-02-25 16:18:49" modified="2024-07-23 13:20:35" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="classes"/>
 				<links>
+					<Dependency xmi:id="EAID_08E68AE5_54CB_40f5_8E56_373B9F10194E" start="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11" end="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90"/>
+					<Association xmi:id="EAID_81FE8191_9E68_4e72_AA85_FA3686506D94" start="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
 					<Generalization xmi:id="EAID_DCD1791D_6597_41ef_AB35_766470760473" start="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Association xmi:id="EAID_DDF623FF_98AA_460a_A33E_F3B7832B7132" start="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11" end="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029" xmi:type="uml:Class" name="epo:FrameworkAgreement" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="896" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="896" ea_eleType="element"/>
 				<properties documentation="An agreement between one or more Contracting Authorities and one or more Economic Operators.&#xA;&#xA;Additional Information:&#xA;When a Framework Agreement is concerned, the FA will result from LotAwardOutcome which describes a Lot which specifies the both the Qualification and Award Criteria.&#xA;&#xA;WG approval 18/05/2021" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="jseguraf" version="1.0" phase="1.0" created="2020-01-09 16:11:12" modified="2024-03-18 12:54:23" complexity="1" status="Proposed"/>
+				<project author="jseguraf" version="1.0" phase="1.0" created="2020-01-09 16:11:12" modified="2024-07-23 13:20:19" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20025,9 +20738,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_D2862D88_92C5_4206_B142_36CDBA0095B8" xmi:type="uml:Class" name="epo:FrameworkAgreementTechnique" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="897" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="897" ea_eleType="element"/>
 				<properties documentation="Technique that establishes the terms governing Contracts to be awarded during a given Period, in particular with regard to Price and, where appropriate, the Quantity envisaged.&#xA;&#xA;WG approval 18/05/2021" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="mfontsan" version="1.0" phase="1.0" created="2018-02-06 17:24:11" modified="2024-03-18 12:51:51" complexity="1" status="Proposed"/>
+				<project author="mfontsan" version="1.0" phase="1.0" created="2018-02-06 17:24:11" modified="2024-07-23 13:19:20" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20038,9 +20751,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_FA070646_D88B_493f_96AB_8417E2069155" xmi:type="uml:Class" name="epo:FrameworkAgreementTerm" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="898" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="898" ea_eleType="element"/>
 				<properties documentation="Conditions and stipulations defining particularities in a Framework Agreement." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2019-02-06 14:47:50" modified="2024-03-18 12:37:13" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2019-02-06 14:47:50" modified="2024-07-23 13:18:17" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20101,9 +20814,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_495BBB92_468A_4f08_9330_A0C75730B97A" xmi:type="uml:Class" name="epo:Fund" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="899" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="899" ea_eleType="element"/>
 				<properties documentation="A financial resource used to support the Procurement.&#xA;&#xA;Additional Information:&#xA;&#xA;In the context of EU, Funds can be divided into programmes, actions and projects.&#xA;&#xA;Examples of EU funds are: the European Structural and Investment Funds, European Social Fund (ESF), the Connecting Europe Facility (CEF) programme, or the ISA2 programme and its actions (e.g. Action 2016.05 European Public Procurement Initiative, which supports the eProcurement Ontology under sub-action 3).&#xA;&#xA;Funds may change between the lot and the contract, for example in the case of an emergency crisis, a contract may be financed by a budget that was not foreseen in the call.&#xA;&#xA;WG Approved 14/05/2019&#xA;&#xA;&#xA;&#xA;&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lbotapor" version="1.0" phase="1.0" created="2018-03-21 20:47:50" modified="2024-03-18 12:54:23" complexity="1" status="Proposed"/>
+				<project author="lbotapor" version="1.0" phase="1.0" created="2018-03-21 20:47:50" modified="2024-07-23 13:20:19" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20164,9 +20877,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4" xmi:type="uml:Class" name="epo:GreenProcurement" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="900" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="900" ea_eleType="element"/>
 				<properties documentation="Approach whereby Buyers seek to procure with a reduced Environmental Impact.&#xA;&#xA;Additional Information:&#xA;The approach may apply to the complete life cycle. The reduced Environmental Impact is in comparison to goods, services and works with the same primary function that would otherwise be procured. &#xA;&#xA;Tightly related are article 68 - Life-cycle costing and article 67 - most economically advantageous Tender (see GPP handbook) https://ec.europa.eu/environment/gpp/pdf/Buying-Green-Handbook-3rd-Edition.pdf&#xA;An instance of the class GreenProcurement is represented in eForms with the code &quot;env-imp&quot; defined in the codelist Strategic-Procurement.Paragraphs) https://ec.europa.eu/environment/gpp/pdf/Buying-Green-Handbook-3rd-Edition.pdf" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2019-04-04 16:28:30" modified="2024-03-18 12:51:40" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2019-04-04 16:28:30" modified="2024-07-23 13:19:08" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20196,10 +20909,24 @@
 					<Association xmi:id="EAID_0BE43E48_CB11_4fae_87F3_C0ACAEAF591C" start="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0" end="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4"/>
 				</links>
 			</element>
+			<element xmi:idref="EAID_7D0E71D7_D624_4144_8134_2500CE9AB392" xmi:type="uml:Class" name="epo:IndefiniteDuration" scope="public">
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="2060" ea_eleType="element"/>
+				<properties documentation="A Duration without a fixed end date.&#xA;&#xA;WG approval 19/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-08-26 11:34:16" modified="2024-07-23 13:21:12" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<links>
+					<Generalization xmi:id="EAID_F8285143_A232_43ae_AFC8_89D40A9529FD" start="EAID_7D0E71D7_D624_4144_8134_2500CE9AB392" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
+					<NoteLink xmi:id="EAID_5259FE9C_CECB_4b18_A4A4_D1B45AFE4BED" start="EAID_AFD1E4C5_9D57_4c0a_B916_E199FA70A0DC" end="EAID_7D0E71D7_D624_4144_8134_2500CE9AB392"/>
+				</links>
+			</element>
 			<element xmi:idref="EAID_EC3D2F66_1FC6_4b4c_AAD2_04A3726B2332" xmi:type="uml:Class" name="epo:InnovativeProcurement" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="901" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="901" ea_eleType="element"/>
 				<properties documentation="Approach whereby Buyers seek to procure an innovative work, supply or service.&#xA;&#xA;Additional Information: &#xA;‘innovation’ means the implementation of a new or significantly improved product, service or process, including but not limited to production, building or construction processes, a new marketing method, or a new organizational method in business practices, workplace Organisation or external relations inter alia with the purpose of helping to solve societal challenges or to support the Europe 2020 strategy for smart, sustainable and inclusive growth;&#xA;See: Directive 2014/24&#xA;Articles: 2, 26 (3), 31, 67 (2.a)&#xA;&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2019-04-04 16:28:48" modified="2024-03-18 12:51:40" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2019-04-04 16:28:48" modified="2024-07-23 13:19:08" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20211,9 +20938,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896" xmi:type="uml:Class" name="epo:JuryMember" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="3042" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-06-12 16:28:51" modified="2024-03-18 12:27:00" complexity="1" status="Proposed"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="3042" ea_eleType="element"/>
+				<properties documentation="Role of an Agent who evaluates a design contest.&#xA;&#xA;WG approval 19/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-06-12 16:28:51" modified="2024-07-23 13:17:10" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20225,9 +20952,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_ABEE1795_5EE6_4f51_ACEA_C3F05211F0B3" xmi:type="uml:Class" name="epo:LeadBuyer" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="2229" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="2229" ea_eleType="element"/>
 				<properties documentation="A Role of an Agent  who is a Buyer and takes the administrative lead of the Procedure. &#xA;&#xA;WG agreement: 2022-11-22" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-11-22 15:39:46" modified="2024-03-18 12:27:00" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-11-22 15:39:46" modified="2024-07-23 13:17:10" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20238,9 +20965,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" xmi:type="uml:Class" name="epo:LotAwardOutcome" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1371" ea_eleType="element"/>
-				<properties documentation="Result concerning the Lot attributed by the Awarder." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 15:47:04" modified="2024-03-18 12:53:58" complexity="1" status="Proposed"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1371" ea_eleType="element"/>
+				<properties documentation="Result concerning the Lot that was attributed by the Awarder.&#xA;&#xA;WG approval 19/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 15:47:04" modified="2024-07-23 13:19:28" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20280,6 +21007,7 @@
 				</attributes>
 				<links>
 					<Association xmi:id="EAID_1E87247C_598C_4f96_8D8A_71BD69D25161" start="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_32F239DB_02BC_456a_934F_BBF695929296" start="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" end="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA"/>
 					<Association xmi:id="EAID_8E7619CE_95A4_4f77_A6DC_62DFC84C122D" start="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
 					<Association xmi:id="EAID_96BA801A_E8C8_4628_94BC_1C90816E0487" start="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
 					<Generalization xmi:id="EAID_F241B2E1_47C3_4512_8EBE_A60BD8ED070A" start="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" end="EAID_E7437025_771F_4143_BE33_620A29646687"/>
@@ -20288,9 +21016,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" xmi:type="uml:Class" name="epo:LotGroupAwardInformation" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1654" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1654" ea_eleType="element"/>
 				<properties documentation="Award information related to a given Group of Lots." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-03-17 13:25:27" modified="2024-03-18 12:53:58" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-03-17 13:25:27" modified="2024-07-23 13:19:28" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20300,6 +21028,7 @@
 					<Association xmi:id="EAID_01B7EE24_F987_4c92_B06C_0EA23C9FD1C7" start="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
 					<Association xmi:id="EAID_4B36ABDE_C6FC_4a8d_93CA_CC7ACC63568D" start="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" end="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
 					<Generalization xmi:id="EAID_5ACD6A3D_7AA3_4504_8B13_015B01092BC2" start="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+					<Association xmi:id="EAID_F890093A_076E_4f9b_9823_548DE5751CA7" start="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
 					<Association xmi:id="EAID_0A7EDA02_3460_4960_8D22_F25373156526" start="EAID_D847D616_70DB_473a_A2A4_6665F938474C" end="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2"/>
 					<Association xmi:id="EAID_9C6B2F1A_EF51_458e_A7C0_67100DC0E58E" start="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" end="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2"/>
 					<Association xmi:id="EAID_B6EB9836_FFEC_4652_9501_AB53057BAF53" start="EAID_71373AFD_6871_4946_B921_97A716439257" end="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2"/>
@@ -20307,9 +21036,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" xmi:type="uml:Class" name="epo:LotSpecificTerm" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1772" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1772" ea_eleType="element"/>
 				<properties documentation="Gathering class for conditions and stipulations related to a Lot." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-04-25 15:41:42" modified="2024-03-18 12:37:26" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-25 15:41:42" modified="2024-07-23 13:18:29" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20320,6 +21049,7 @@
 					<Generalization xmi:id="EAID_2EFFE2EC_6B27_4d48_B910_6C37C39CAAFC" start="EAID_E13C8393_D02E_4800_B8D5_38C02E2C8998" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
 					<Generalization xmi:id="EAID_41D43466_5575_4752_B3BF_0CA7ADD341E4" start="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
 					<Generalization xmi:id="EAID_4E161D86_3C31_466f_982A_26607071A85E" start="EAID_44E7963D_28F5_4263_835A_24C87816F40C" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
+					<Association xmi:id="EAID_505234FB_4CE0_475f_A94B_6552B0F5A59A" start="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
 					<Association xmi:id="EAID_7DEB98FB_35C4_4015_80BE_9C778A0BA2A5" start="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
 					<Generalization xmi:id="EAID_85E14E41_3BA7_4783_A633_615CD23835C1" start="EAID_82AA47D1_6939_4328_8108_0018817C75BD" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
 					<Generalization xmi:id="EAID_8DB5DB8D_4E96_4679_A104_F62859765981" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
@@ -20332,9 +21062,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_A312F200_1050_451d_97BB_07EBCE11D45C" xmi:type="uml:Class" name="epo:Mediator" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="908" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="908" ea_eleType="element"/>
 				<properties documentation="A Role of an Agent   that  attempts to resolve a dispute between different Agents and come to an agreement.&#xA;WG approval 20/04/2021" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="jseguraf" version="1.0" phase="1.0" created="2020-06-05 12:07:51" modified="2024-03-18 12:27:00" complexity="1" status="Proposed"/>
+				<project author="jseguraf" version="1.0" phase="1.0" created="2020-06-05 12:07:51" modified="2024-07-23 13:17:10" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20346,9 +21076,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" xmi:type="uml:Class" name="epo:MiniCompetitionAwardOutcome" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="3009" ea_eleType="element"/>
-				<properties documentation="Result concerning the process where multiple winners or candidates of previous stages of a procedure bid for a specific procurement attributed by the Awarder.&#xA;&#xA;Additional Information:&#xA;It is typically used in framework agreements where the suppliers have already been pre-selected, and the mini competition is used to determine which supplier is best suited for a particular project or contract.&#xA;It is also used in a Dynamic Purchasing System where the suppliers come from a list of Candidates." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-05-24 14:17:49" modified="2024-03-18 12:53:58" complexity="1" status="Proposed"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="3009" ea_eleType="element"/>
+				<properties documentation="Result concerning the mini-competition that was attributed by the Awarder.&#xA;&#xA;Additional Information:&#xA;The mini-competition is the process where multiple winners or candidates of previous stages of a procedure bid for a specific procurement.&#xA;It is typically used in framework agreements where the suppliers have already been pre-selected, and the mini competition is used to determine which supplier is best suited for a particular project or contract.&#xA;It is also used in a Dynamic Purchasing System where the suppliers come from a list of Candidates.&#xA;&#xA;WG approval 19/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-05-24 14:17:49" modified="2024-07-23 13:19:28" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20360,10 +21090,147 @@
 					<Association xmi:id="EAID_FF75C037_BE4C_49d2_A743_BAD5FFBD3003" start="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8" end="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5"/>
 				</links>
 			</element>
+			<element xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" xmi:type="uml:Class" name="epo:MonetaryValue" scope="public">
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="960" ea_eleType="element"/>
+				<properties documentation="A number of monetary units specified using a given unit of currency.&#xA;&#xA;Additional information:&#xA;In the pre-award phase of the procurement, all monetary values are considered to exclude VAT based on the Directive 2014/24/EU.&#xA;&#xA;WG approval 13/04/2021&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2019-05-24 15:35:35" modified="2024-07-23 13:21:12" complexity="1" status="Proposed"/>
+				<code product_name="Java" gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<attributes>
+					<attribute xmi:idref="EAID_2C82F10F_E6DC_49ee_8B5D_E915D4361E9C" name="epo:hasAmountValue" scope="Public">
+						<initial/>
+						<documentation value="The numeric value of the amount, including decimals."/>
+						<model ea_localid="1906" ea_guid="{2C82F10F-E6DC-49ee-8B5D-E915D4361E9C}"/>
+						<properties type="xsd:decimal" derived="0" precision="0" collection="false" length="0" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="2"/>
+						<stereotype/>
+						<bounds lower="1" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_B53ED566_A1AF_4a19_A650_4A057D5FB465" name="epo:hasCurrencyCodeListAgencyID" scope="Public">
+						<initial/>
+						<documentation value="Identifier of the agency that maintains the currency code list used.&#xA;WG approval 13/04/2021"/>
+						<model ea_localid="1929" ea_guid="{B53ED566-A1AF-4a19-A650-4A057D5FB465}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="2"/>
+						<stereotype/>
+						<bounds lower="0" upper="*"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_9BDDFF77_87A2_428c_A675_CD62FC2FF951" name="epo:hasCurrencyCodeListAgencyName" scope="Public">
+						<initial/>
+						<documentation value="Name of the agency that maintains the currency code list used.&#xA;WG approval 13/04/2021"/>
+						<model ea_localid="1930" ea_guid="{9BDDFF77-87A2-428c-A675-CD62FC2FF951}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="3"/>
+						<stereotype/>
+						<bounds lower="0" upper="*"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_81C9CD14_9DC4_4cbd_8A9D_15BCC4606424" name="epo:hasCurrencyCodeListID" scope="Public">
+						<initial/>
+						<documentation value="Concept scheme URI used for the currency code list.&#xA;WG approval 13/04/2021"/>
+						<model ea_localid="1931" ea_guid="{81C9CD14-9DC4-4cbd-8A9D-15BCC4606424}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="4"/>
+						<stereotype/>
+						<bounds lower="0" upper="*"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
+				<links>
+					<Dependency xmi:id="EAID_E9E2A1B8_A705_4847_8FE6_3B40BD241A4B" start="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" end="EAID_FBD046CD_CD18_4d96_99E0_63CAC8A5D594"/>
+					<Association xmi:id="EAID_01B7EE24_F987_4c92_B06C_0EA23C9FD1C7" start="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_079E96B7_4324_4eba_B071_A8B833BDA1EF" start="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_11ACAC30_71BA_444b_B7E9_7062F4927536" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_14B7672E_A531_45a7_BB29_EB9C02AF1551" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_1E87247C_598C_4f96_8D8A_71BD69D25161" start="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_202AF5A1_B4FE_48a4_91D4_F6387465413F" start="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_2729D2D0_C843_497f_B19D_1727246FC1BD" start="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_29D3C49F_AF44_49ad_8519_B199CADD080B" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_2C64F9E7_B02B_4433_AB2C_0A6E23A8559E" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_2E9FE66A_E025_4563_9A59_461990838D96" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_3127E296_9886_44bc_86E7_B4E433F87208" start="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_3220FB6D_76C7_486a_9953_EA1E6D255A89" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_3284019D_3E6C_424a_AACD_8319D1389BB9" start="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_357DB7CB_140F_4167_B4ED_129923676841" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_470D1B16_C07B_4868_91B2_799578663395" start="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_47E28283_E9BB_4790_9AB4_37A6F31DF36A" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_5009F883_10B2_4e9c_96A3_A1F92BE8EA63" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_510F8DDB_DB12_48df_92AE_A27F7DFCCAC3" start="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_516CC611_B255_4c67_AAF8_2E19960E553F" start="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_547A511C_F377_4405_82EA_14ABA20458B6" start="EAID_E7437025_771F_4143_BE33_620A29646687" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_55AE269D_7874_4515_A52E_6EBA9F23871A" start="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_569C582B_2F50_4a11_B7B6_50CA2F0A9B94" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_5A597CB9_3064_430b_A49F_DC0D80093AA3" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_5EDC73B7_1ABC_4e6f_9003_79369EBD749D" start="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_653ADA02_9DFC_48b4_A935_786F35AF2AFB" start="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_6B579730_463A_4857_B85E_6B8274FE3291" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_6D0F07D8_06B8_43e0_AB80_8F686D5C488E" start="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_72A6C38F_77C6_4480_A13E_A5E9A66D9379" start="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_72A7614C_D179_4558_8F62_2FA41A99DF74" start="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_77A962A1_6ADC_4a69_9C87_1543CFCC17D9" start="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_7A92C123_93F7_4d51_A677_A1E36D3B53C0" start="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_7AAF3614_44A0_4944_8E1A_EF574D760E6F" start="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_87123434_C2AD_43de_925D_13E9A7667A18" start="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_8A3AB883_9FE4_42fd_AFC8_322B44CBDADD" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_8DBBB829_4470_4b0d_A142_494C41C8807D" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_8E7619CE_95A4_4f77_A6DC_62DFC84C122D" start="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_91D18452_424C_4f36_8E1E_BF993F4D765A" start="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_949017B7_0159_4fe1_8469_562A93DEF12E" start="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_98D513D4_9622_4217_94D7_26E6E451AF0C" start="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_9BEABBA1_FA04_4d98_97DE_5E69567FADBC" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_9BF032E2_6893_45df_95FE_A08E92EA8618" start="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_A110770D_19E8_400c_A438_44EEAB172389" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_A13D1892_1403_4dcc_B7C6_33C21269E183" start="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_A287E36F_7CEB_4668_B1A5_01DDEE025D3A" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_AB852C7E_4390_46da_9255_1C4C8BE7B02F" start="EAID_C215EC75_82FD_45d3_832A_B3989A897692" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_AE377F2A_EF0B_4bd7_8D4A_95B9DD217458" start="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC" start="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_B20953AE_CF64_46a1_9C57_33B27067739D" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_BB64ED52_1D30_4395_ABC1_3473F1CBCDE7" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_C35EEDCE_0633_482d_BA4A_4553057B7C23" start="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_C3F576CC_0DFC_40d6_86C4_6F47177DB0C6" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_C753CDC6_88B6_449b_B44C_0F56A31472A7" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_C8D53635_0827_4589_A374_A1CFC018D076" start="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_CBE972DE_D8B8_42a5_A6A1_F386873985BC" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_D257E7B8_BA32_4888_BB1A_167306D6B16C" start="EAID_E7437025_771F_4143_BE33_620A29646687" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_D7964CE9_B09A_4855_B489_34E46CFF8E24" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_EBC0DED2_0415_4ef8_A495_71F8920238AD" start="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_F78CF3B1_3FB3_43b9_B9AB_1FE660C3663F" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_F8221739_F0D9_41f5_A179_C864AC960D8F" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_F890093A_076E_4f9b_9823_548DE5751CA7" start="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+				</links>
+			</element>
 			<element xmi:idref="EAID_3F572668_3AED_4090_BAB3_9047B4874154" xmi:type="uml:Class" name="epo:MultipleStageProcedureTerm" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="909" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="909" ea_eleType="element"/>
 				<properties documentation="Conditions and stipulations defining particularities of Procedures carried out in several steps&#xA;Additional Information: &#xA;Generally this refers to Procedures where selection is carried out to qualify Tenderers who are then requested to submit the rest of their Tender for evaluation is Restricted Procedure.&#xA;WG Approval 15/04/2021" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="jseguraf" version="1.0" phase="1.0" created="2019-08-22 16:17:40" modified="2024-03-18 12:37:13" complexity="1" status="Proposed"/>
+				<project author="jseguraf" version="1.0" phase="1.0" created="2019-08-22 16:17:40" modified="2024-07-23 13:18:17" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20462,7 +21329,7 @@
 					</attribute>
 					<attribute xmi:idref="EAID_78F1520E_CC7B_498f_B8C4_29436D9CC375" name="epo:hasQualificationSystemRenewalDescription" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="Explanation of how a Qualification System is re-established.&#xA;&#xA;Additional information:&#xA;A Qualification System qualifies an economic operator to take part in a tendering process. Usually, in such cases the economic operator passes the Exclusion Grounds and Selection Criteria.&#xA;&#xA;WG approval 26/03/2024"/>
 						<model ea_localid="2111" ea_guid="{78F1520E-CC7B-498f-B8C4-29436D9CC375}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -20471,7 +21338,7 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -20482,9 +21349,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_BA1BBA64_88B1_420e_8141_092908A95E2B" xmi:type="uml:Class" name="epo:NonDisclosureAgreementTerm" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="3064" ea_eleType="element"/>
-				<properties documentation="Conditions and stipulations" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-06-20 16:39:15" modified="2024-03-18 12:27:58" complexity="1" status="Proposed"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="3064" ea_eleType="element"/>
+				<properties documentation="Conditions and stipulations about a non-disclosure agreement.&#xA;&#xA;Additional information:&#xA;A non-disclosure agreement is a Contract between different parties which ensures information is not shared with other parties.&#xA;&#xA;WG approval 26/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-06-20 16:39:15" modified="2024-07-23 13:18:02" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20508,7 +21375,7 @@
 					</attribute>
 					<attribute xmi:idref="EAID_3EA015F6_48CD_438f_B329_FEB32481EDA8" name="epo:isNonDisclosureAgreementRequired" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="A non-disclosure agreement is needed.&#xA;&#xA;Additional information:&#xA;A non-disclosure agreement is a Contract between different parties which ensures information is not shared with other parties.&#xA;&#xA;WG approval 26/03/2024&#xA;"/>
 						<model ea_localid="2430" ea_guid="{3EA015F6-48CD-438f-B329-FEB32481EDA8}"/>
 						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -20517,7 +21384,7 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -20527,9 +21394,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_3E3C6304_E823_43a1_8914_2046342E8F96" xmi:type="uml:Class" name="epo:NonPublishedInformation" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="3085" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="3085" ea_eleType="element"/>
 				<properties documentation="Information about fields not published in this Notice. &#xA;&#xA;Additional Information:&#xA;The non-published information may become available at a later date and may differ from one element to another within a given Document.&#xA;&#xA;Examples of fields that may not be immediately published are Winner, Tender and Procedure Lot Result, etc., e.g. for security reasons.&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-07-04 14:28:04" modified="2024-03-18 12:54:52" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-07-04 14:28:04" modified="2024-07-23 13:20:45" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20575,9 +21442,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" xmi:type="uml:Class" name="epo:Notice" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="910" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="910" ea_eleType="element"/>
 				<properties documentation="Document published by the Buyer about market opportunities and results.&#xA;&#xA;WG Approval 23/05/2019&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="mfontsan" version="1.0" phase="1.0" created="2018-02-21 10:55:49" modified="2024-03-18 12:54:16" complexity="1" status="Proposed"/>
+				<project author="mfontsan" version="1.0" phase="1.0" created="2018-02-21 10:55:49" modified="2024-07-23 13:20:35" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20586,7 +21453,7 @@
 				<attributes>
 					<attribute xmi:idref="EAID_1264386A_C67E_4009_888E_552A62DE7225" name="epo:hasOJSIssueNumber" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="The issue identifier of the Supplement to the EU Official Journal.&#xA;&#xA;Additional information:&#xA;The format of this identifier is XX-YYYY.&#xA;&#xA;WG approval 26/03/2024"/>
 						<model ea_localid="2353" ea_guid="{1264386A-C67E-4009-888E-552A62DE7225}"/>
 						<properties type="xsd:integer" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -20595,7 +21462,7 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -20616,7 +21483,7 @@
 					</attribute>
 					<attribute xmi:idref="EAID_AC36AFF2_4288_4e0c_8944_0179AA352784" name="epo:hasNoticePublicationNumber" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="The identifier of the published Notice.&#xA;&#xA;Additional information:&#xA;The format of this identifier is XXXXXXXX-YYYY.&#xA;&#xA;WG approval 26/03/2024"/>
 						<model ea_localid="2356" ea_guid="{AC36AFF2-4288-4e0c-8944-0179AA352784}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -20625,13 +21492,13 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
 					<attribute xmi:idref="EAID_41B830AF_AE4D_4902_8134_A119102AB4ED" name="epo:hasFormNumber" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="The number of the form used to create the Standard Form Notice and not an eForms Notice.&#xA;&#xA;WG approval 26/03/2024"/>
 						<model ea_localid="2357" ea_guid="{41B830AF-AE4D-4902-8134-A119102AB4ED}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -20640,7 +21507,7 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -20701,11 +21568,11 @@
 					<Association xmi:id="EAID_F955E894_651A_4a8b_A411_E8DA312BC449" start="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" end="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
 					<Generalization xmi:id="EAID_05C9AA43_1AE1_4dbd_8080_CCC8C1824CB7" start="EAID_71373AFD_6871_4946_B921_97A716439257" end="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
 					<Association xmi:id="EAID_3FEA813D_50A9_4b54_8B7C_0A19B505F52F" start="EAID_3E3C6304_E823_43a1_8914_2046342E8F96" end="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
-					<Generalization xmi:id="EAID_5217DA2B_F336_4793_85E1_6829959E93BB" start="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03" end="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
 					<Association xmi:id="EAID_7E3AE348_60D1_44cb_BC5F_08B65291C2AC" start="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" end="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
 					<Association xmi:id="EAID_7EE70932_F57C_4861_BE52_91F3F7270840" start="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" end="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
 					<Generalization xmi:id="EAID_95EED5E2_B9B4_4812_B1E5_07E432421C63" start="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" end="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
 					<Generalization xmi:id="EAID_9B54EEA9_42F0_4e42_A2F1_707153826314" start="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" end="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
+					<Generalization xmi:id="EAID_A1DC6D24_EABE_467c_80DC_91F8A4D3F0DE" start="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03" end="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
 					<Generalization xmi:id="EAID_A87ED0E5_0C79_4015_8392_5BAE0E90B288" start="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" end="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
 					<Generalization xmi:id="EAID_AD106A36_48F1_47c9_A453_938579C970A7" start="EAID_17662AEF_1321_446a_AE42_0583F7417A79" end="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
 					<Generalization xmi:id="EAID_B825D1CD_744B_411b_A025_488C1781D353" start="EAID_D847D616_70DB_473a_A2A4_6665F938474C" end="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
@@ -20714,9 +21581,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" xmi:type="uml:Class" name="epo:NoticeAwardInformation" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1655" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1655" ea_eleType="element"/>
 				<properties documentation="Information about an Award Notice." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-03-17 13:25:47" modified="2024-03-18 12:53:58" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-03-17 13:25:47" modified="2024-07-23 13:19:28" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20738,9 +21605,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF" xmi:type="uml:Class" name="epo:Offer" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="2625" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="2625" ea_eleType="element"/>
 				<properties documentation="Document providing the Monetary Value and the details to fulfill the Requirements set out in the Procurement Documents or Request for Offer.  &#xA;&#xA;Additional information:&#xA;A quotation is considered to be an Offer in the eProcurement Ontology.&#xA;&#xA;WG approval 09/02/2023" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-02-09 15:39:50" modified="2024-03-18 12:54:16" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-02-09 15:39:50" modified="2024-07-23 13:20:35" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20752,9 +21619,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" xmi:type="uml:Class" name="epo:OfferingParty" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="883" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="883" ea_eleType="element"/>
 				<properties documentation="The Role of an Agent that acts on the Economic Operator side during a Procurement Process.&#xA;&#xA;Additional information:&#xA;As per the European Procurement Directives the notion of ‘Economic Operators’ should be interpreted in a broad manner so as to include any Persons and/or Entities which offer the execution of works, the supply of products or the provision of services on the market, irrespective of the legal form under which they have chosen to operate. Thus, firms, branches, subsidiaries, partnerships, cooperative societies, limited companies, universities, public or private, and other forms of entities than natural Persons should all fall within the notion of Economic Operator, whether or not they are ‘Legal Persons’ in all circumstances." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="mfontsan" version="1.0" phase="1.0" created="2018-02-07 09:36:37" modified="2024-03-18 12:27:00" complexity="1" status="Proposed"/>
+				<project author="mfontsan" version="1.0" phase="1.0" created="2018-02-07 09:36:37" modified="2024-07-23 13:17:35" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20765,22 +21632,25 @@
 					<Generalization xmi:id="EAID_0B89904B_56C2_4154_BC18_F6B8F5B8635B" start="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
 					<Generalization xmi:id="EAID_199C3BDF_913A_42e4_A409_64CB2CE61248" start="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
 					<Generalization xmi:id="EAID_28774B07_2278_44a1_B47E_F671B4F00F63" start="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+					<Generalization xmi:id="EAID_2AAB3E29_13AA_402b_B91F_9E3189FB3EC9" start="EAID_8335C0F2_1EB0_4dcb_94E3_EFE2E0DF3118" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
 					<Generalization xmi:id="EAID_5729A98B_A925_4816_AEF4_9EBDE5851B98" start="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
 					<Association xmi:id="EAID_7775FD52_1FE1_445c_9B8B_96AA208D3134" start="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
 					<Generalization xmi:id="EAID_7B0A44E0_63E1_4c30_AB83_DA8166C24C14" start="EAID_4E7C30BC_ABE6_4736_8E07_54ED87CB1179" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+					<Association xmi:id="EAID_81FE8191_9E68_4e72_AA85_FA3686506D94" start="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
 					<Generalization xmi:id="EAID_910BFAB5_C09F_48c2_A281_70A523440BFB" start="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
 					<Generalization xmi:id="EAID_A27A53B2_A6D1_4fdd_A43E_D33DC6607852" start="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
 					<Generalization xmi:id="EAID_A641D156_C668_4cc3_9877_03C8FEE30681" start="EAID_C52C2B8E_EBBE_4a9a_A48C_B479107AD49E" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
 					<Generalization xmi:id="EAID_A88E2729_62D9_493c_8105_4D93D49DFA8A" start="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
 					<Generalization xmi:id="EAID_ACAE27B9_7F0D_4491_BDBC_A13B860A4535" start="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
 					<Generalization xmi:id="EAID_D2C94CC0_A14F_4c9c_B4C0_912C9C11EC4E" start="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+					<Generalization xmi:id="EAID_D86AFBB4_83ED_4d20_960D_7A768CA3117C" start="EAID_6161E37F_B166_4ecf_A645_92E7667F0CC8" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
 					<Generalization xmi:id="EAID_E4D55FF7_2180_4a21_A34C_23F9AB59E814" start="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_C52C2B8E_EBBE_4a9a_A48C_B479107AD49E" xmi:type="uml:Class" name="epo:OfferIssuer" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="2626" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="2626" ea_eleType="element"/>
 				<properties documentation="The Role of an Agent  that distributes an Offer.&#xA;&#xA;WG approval 09/02/2023" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-02-09 15:42:57" modified="2024-03-18 12:27:00" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-02-09 15:42:57" modified="2024-07-23 13:17:35" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20792,9 +21662,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_A958E5F1_29FE_4263_AEBA_5D8644A7677A" xmi:type="uml:Class" name="epo:OfflineAccessProvider" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1350" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1350" ea_eleType="element"/>
 				<properties documentation="A Role of an Agent  responsible for providing offline access to the Procurement Documents." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 12:24:57" modified="2024-03-18 12:27:00" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 12:24:57" modified="2024-07-23 13:17:35" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20806,9 +21676,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_82AA47D1_6939_4328_8108_0018817C75BD" xmi:type="uml:Class" name="epo:OpeningTerm" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="912" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="912" ea_eleType="element"/>
 				<properties documentation="Conditions and stipulations defining particularities of the opening of Tenders.&#xA;Additional Information:&#xA;The opening of Tenders is the event when Tenders are made accessible for evaluation, it is generally the same date and time for all Tenders.&#xA;WG Approval 15/04/2021" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2019-03-12 16:01:17" modified="2024-03-18 12:27:58" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2019-03-12 16:01:17" modified="2024-07-23 13:18:02" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20868,9 +21738,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" xmi:type="uml:Class" name="epo:OrganisationGroup" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="914" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="914" ea_eleType="element"/>
 				<properties documentation="Agreed collaboration of several Organisations.&#xA;Additional Information:&#xA;This concept has been created to fulfill the need to represent a grouping of Organisations that is not necessarily registered i.e, consortia.&#xA;WG approval 15/04/2021" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2020-07-16 17:01:20" modified="2024-03-18 12:26:43" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2020-07-16 17:01:20" modified="2024-07-23 11:55:02" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20900,9 +21770,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_23E9784F_4AEE_4484_9BAC_28A7FEB05838" xmi:type="uml:Class" name="epo:OriginatorRequest" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="2630" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="2630" ea_eleType="element"/>
 				<properties documentation="Document in which the Originator describes his needs.&#xA;&#xA;WG approval 09/02/2023" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-02-09 16:19:26" modified="2024-03-18 12:54:16" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-02-09 16:19:26" modified="2024-07-23 13:20:35" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20914,9 +21784,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51" xmi:type="uml:Class" name="epo:OtherEntity" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="2202" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="2202" ea_eleType="element"/>
 				<properties documentation="Economic Operator (who is not a Subcontractor) on which the Tenderer relies upon, to meet Selection Criteria." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-11-21 17:12:26" modified="2024-03-18 12:27:00" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-11-21 17:12:26" modified="2024-07-23 13:17:35" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20927,9 +21797,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_432BFDAD_99CD_40ab_A159_824F0F6571E2" xmi:type="uml:Class" name="epo:ParticipationCondition" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="2589" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="2589" ea_eleType="element"/>
 				<properties documentation="Criterion that describes a Requirement to take part in a procurement.&#xA;&#xA;WG approval 30/05/2023" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-01-24 17:12:00" modified="2024-03-18 12:49:27" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-01-24 17:12:00" modified="2024-07-23 13:19:02" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20941,9 +21811,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_44E6EE1C_AF22_4586_B990_EF3674BAE826" xmi:type="uml:Class" name="epo:ParticipationConditionsSummary" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="2591" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-01-24 17:19:52" modified="2024-03-18 12:49:27" complexity="1" status="Proposed"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="2591" ea_eleType="element"/>
+				<properties documentation="Overview of the Participation Conditions.&#xA;&#xA;WG approval 19/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-01-24 17:19:52" modified="2024-07-23 13:19:02" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -20952,7 +21822,7 @@
 				<attributes>
 					<attribute xmi:idref="EAID_5699166A_F9A9_4ed3_8B7D_8A8A4C4E0014" name="epo:describesObjectiveParticipationRules" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="General explanatory text on the rules and criteria to be fulfilled by the Tender.&#xA;&#xA;WG approval 02/05/2024"/>
 						<model ea_localid="2373" ea_guid="{5699166A-F9A9-4ed3-8B7D-8A8A4C4E0014}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -20961,13 +21831,13 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
 					<attribute xmi:idref="EAID_F79D34B1_CCFA_4297_8DDC_3871A35AD86D" name="epo:describesVerificationMethod" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="General explanatory text on the means used to validate the Participation Conditions.&#xA;&#xA;WG approval 02/05/2024"/>
 						<model ea_localid="2381" ea_guid="{F79D34B1-CCFA-4297-8DDC-3871A35AD86D}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -20976,7 +21846,7 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -20987,9 +21857,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_572B82B3_FF4C_43b8_9C2C_09AD5D3F4615" xmi:type="uml:Class" name="epo:ParticipationRequestProcessor" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1340" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1340" ea_eleType="element"/>
 				<properties documentation="A Role of an Agent  responsible for processing Requests To Participate." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 11:59:38" modified="2024-03-18 12:27:10" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 11:59:38" modified="2024-07-23 13:17:35" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21001,9 +21871,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_9403AC67_80A3_4c77_9299_6171EF9D6788" xmi:type="uml:Class" name="epo:ParticipationRequestReceiver" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1341" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1341" ea_eleType="element"/>
 				<properties documentation="A Role of an Agent  responsible for receiving Requests To Participate." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 12:03:54" modified="2024-03-18 12:27:10" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 12:03:54" modified="2024-07-23 13:17:35" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21015,9 +21885,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" xmi:type="uml:Class" name="epo:ParticipationRequestTerm" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1477" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1477" ea_eleType="element"/>
 				<properties documentation="Conditions and stipulations defining particularities of requesting participation in a Procedure." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-01-17 16:41:46" modified="2024-03-18 12:27:48" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-01-17 16:41:46" modified="2024-07-23 13:17:50" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21030,9 +21900,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_C0F5DE45_CA08_46dd_AD44_E7EF577A809D" xmi:type="uml:Class" name="epo:PaymentExecutor" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1338" ea_eleType="element"/>
-				<properties documentation="A Role of an Agent  responsible for executing the Payment." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 11:58:43" modified="2024-03-18 12:27:10" complexity="1" status="Proposed"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1338" ea_eleType="element"/>
+				<properties documentation="A Role of an Agent responsible for executing the Payment." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 11:58:43" modified="2024-07-23 13:17:35" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21043,10 +21913,73 @@
 					<Association xmi:id="EAID_001164A7_CB8C_462e_BBD0_75D03FADA8D8" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_C0F5DE45_CA08_46dd_AD44_E7EF577A809D"/>
 				</links>
 			</element>
+			<element xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" xmi:type="uml:Class" name="epo:Period" scope="public">
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="915" ea_eleType="element"/>
+				<properties documentation="A time interval or a Duration.&#xA;&#xA;WG approval 28/04/2020&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="lbotapor" version="1.0" phase="1.0" created="2018-03-21 21:32:49" modified="2024-07-23 13:21:12" complexity="1" status="Proposed"/>
+				<code product_name="Java" gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<attributes>
+					<attribute xmi:idref="EAID_C6A0334F_7F34_4839_ADEB_482CEC470A98" name="epo:hasBeginning" scope="Public">
+						<initial/>
+						<documentation value="The date and time on which this period begins."/>
+						<model ea_localid="1696" ea_guid="{C6A0334F-7F34-4839-ADEB-482CEC470A98}"/>
+						<properties type="xsd:dateTime" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="0"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_D3F00005_AF7C_45ab_927B_B38B2CEBC0D5" name="epo:hasEnd" scope="Public">
+						<initial/>
+						<documentation value="The date and time at which this period ends."/>
+						<model ea_localid="1700" ea_guid="{D3F00005-AF7C-45ab-927B-B38B2CEBC0D5}"/>
+						<properties type="xsd:dateTime" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="4"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
+				<links>
+					<Dependency xmi:id="EAID_007A256B_E0B5_4a62_B8D7_2BC14F331BE5" start="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" end="EAID_5A01D361_6509_447f_B318_F20F23FBF81F"/>
+					<Association xmi:id="EAID_11C78626_167C_4c06_AF8A_1D37420731A9" start="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+					<Association xmi:id="EAID_1864913C_FE85_48db_829F_004DFE769A97" start="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+					<Association xmi:id="EAID_24C53A6F_084E_4dbf_817A_1DF5BE5981D8" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+					<Association xmi:id="EAID_33FC7129_7479_45ab_AECD_F356DB6C1872" start="EAID_A8D775E4_EEB9_4502_B8A1_C1DD5D555864" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+					<Association xmi:id="EAID_3A930003_5665_43a6_9887_A78953BBB2E2" start="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+					<Association xmi:id="EAID_45DE6A43_058C_45b5_9BD1_786F801B344D" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+					<Association xmi:id="EAID_6D166D58_F0F4_4650_92D7_DAC20DD7E2F8" start="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+					<Association xmi:id="EAID_6D569FED_815F_45f4_87EA_C0E83DC5C9AF" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+					<Association xmi:id="EAID_89C3F218_90EF_42ed_B918_7EEB88718C50" start="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+					<Association xmi:id="EAID_8FF88923_D9FB_4937_B866_FABECBC1DB55" start="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+					<Association xmi:id="EAID_9EDDC1AB_FC05_462d_A479_433862DD01D8" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+					<Association xmi:id="EAID_B2FBB3C3_8542_4cd9_8B7E_A25D4A6C9048" start="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+					<Association xmi:id="EAID_D07B06AA_2E5B_4fa1_B0EA_CB49790C2AAD" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+					<Association xmi:id="EAID_D77EAC2F_A434_424a_8ECC_D32EF06886BB" start="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+					<Association xmi:id="EAID_DCA21CBC_3D4F_480a_B24B_49A69CC51624" start="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+					<Association xmi:id="EAID_DE5098A6_B134_4261_8994_841365A27FAB" start="EAID_3780AA50_D898_4068_B300_47B46651CA0A" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+					<Association xmi:id="EAID_ED4865EB_995F_486e_A7A9_407855E7F1B8" start="EAID_6966846F_842F_4149_A95B_AE374D603608" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+					<Association xmi:id="EAID_FAA22183_A73E_42a1_854B_9995087470E4" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+				</links>
+			</element>
 			<element xmi:idref="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496" xmi:type="uml:Class" name="epo:Prize" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="921" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="921" ea_eleType="element"/>
 				<properties documentation="A reward given  in a Contest.&#xA;WG approval: 15/04/2021" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="jseguraf" version="1.0" phase="1.0" created="2019-08-29 14:54:33" modified="2024-03-18 12:37:13" complexity="1" status="Proposed"/>
+				<project author="jseguraf" version="1.0" phase="1.0" created="2019-08-29 14:54:33" modified="2024-07-23 13:18:17" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21075,9 +22008,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" xmi:type="uml:Class" name="epo:ProcedureSpecificTerm" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1773" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1773" ea_eleType="element"/>
 				<properties documentation="Gathering class for conditions and stipulations related to a Procedure." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-04-25 15:41:50" modified="2024-03-18 12:37:26" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-25 15:41:50" modified="2024-07-23 13:18:29" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21097,9 +22030,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" xmi:type="uml:Class" name="epo:ProcedureTerm" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="923" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="923" ea_eleType="element"/>
 				<properties documentation="Conditions and stipulations defining particularities of the Procedure.&#xA;&#xA;(WG approval 23/11/2018)" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="mfontsan" version="1.0" phase="1.0" created="2018-05-09 10:12:00" modified="2024-03-18 12:28:04" complexity="1" status="Proposed"/>
+				<project author="mfontsan" version="1.0" phase="1.0" created="2018-05-09 10:12:00" modified="2024-07-23 13:18:07" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21228,7 +22161,7 @@
 					</attribute>
 					<attribute xmi:idref="EAID_124D7CD7_247B_42a3_AFEB_0FB9003A6A40" name="epo:hasNationalProcedureRules" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="The resource identifier where the information about the national rules applicable to the procedure can be found.&#xA;&#xA;WG approval 02/05/2024"/>
 						<model ea_localid="2110" ea_guid="{124D7CD7-247B-42a3-AFEB-0FB9003A6A40}"/>
 						<properties type="xsd:anyURI" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -21237,7 +22170,7 @@
 						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -21251,9 +22184,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_7D5A2915_BFCE_41da_BDCF_E7310A70B190" xmi:type="uml:Class" name="epo:ProcessPlanningTerm" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1911" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1911" ea_eleType="element"/>
 				<properties documentation="Conditions and stipulations defining particularities of the unfolding of the Procurement Process." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-05-30 13:01:34" modified="2024-03-18 12:37:26" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-05-30 13:01:34" modified="2024-07-23 13:18:29" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21311,9 +22244,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D" xmi:type="uml:Class" name="epo:ProcurementCriteriaSummary" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="2590" ea_eleType="element"/>
-				<properties documentation="WG approval 24/01/2023" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-01-24 17:19:19" modified="2024-03-18 12:49:27" complexity="1" status="Proposed"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="2590" ea_eleType="element"/>
+				<properties documentation="Overview of the Procurement Criteria.&#xA;&#xA;WG approval 19/03/2024&#xA;&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-01-24 17:19:19" modified="2024-07-23 13:19:02" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21322,7 +22255,7 @@
 				<attributes>
 					<attribute xmi:idref="EAID_41E8D101_053A_4b0b_93CE_CA1C3787B4A3" name="epo:indicatesPerformingStaffInformationRequirement" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="Obligation to indicate the names and professional qualifications of the staff assigned to performing the contract.&#xA;&#xA;WG approval 02/05/2024"/>
 						<model ea_localid="2241" ea_guid="{41E8D101-053A-4b0b-93CE-CA1C3787B4A3}"/>
 						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -21331,7 +22264,7 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -21345,9 +22278,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" xmi:type="uml:Class" name="epo:ProcurementCriterion" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="924" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="924" ea_eleType="element"/>
 				<properties documentation="A criterion specific to Procurement.&#xA;&#xA;Additional Information:&#xA;&#xA;This Procurement Criterion can be only Exclusion Ground, Selection Criterion or Award Criterion. Each of these Criteria can contain subcriteria (Criterion class).&#xA;&#xA;WG Approval 23/04/2020" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2018-08-01 14:32:21" modified="2024-03-18 12:49:27" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2018-08-01 14:32:21" modified="2024-07-23 13:19:02" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21399,9 +22332,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" xmi:type="uml:Class" name="epo:ProcurementDocument" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="926" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="926" ea_eleType="element"/>
 				<properties documentation="Document produced or referred to by the Buyer to describe or determine elements of the Procurement.&#xA;&#xA;Additional information:&#xA;&#xA;Procurement Documents are to be accessible since the date of publication of the Contract Notice or the prior information Notice when used as a call for competition.&#xA;&#xA;Examples of Procurement Documents are Technical Specifications, the Descriptive Document, proposed conditions of Contract, formats for the presentation of Documents by Candidates and Tenderers, information on generally applicable obligations.&#xA;&#xA;Other Documents related to the Procedure such as Notices are not considered to be Procurement Documents.&#xA;&#xA;WG Approval 23/05/2019 17:08:30" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lbotapor" version="1.0" phase="1.0" created="2018-03-21 22:36:31" modified="2024-03-18 12:54:16" complexity="1" status="Proposed"/>
+				<project author="lbotapor" version="1.0" phase="1.0" created="2018-03-21 22:36:31" modified="2024-07-23 13:20:35" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21415,9 +22348,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_EA883AD5_9C26_467b_90B7_4F724B6E5E5E" xmi:type="uml:Class" name="epo:ProcurementProcedureInformationProvider" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1349" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1349" ea_eleType="element"/>
 				<properties documentation="A Role of an Agent  responsible for providing additional information about the Procurement Procedure." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 12:24:38" modified="2024-03-18 12:27:10" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 12:24:38" modified="2024-07-23 13:17:36" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21429,9 +22362,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_1062E1ED_D094_425e_B51B_9E700090C968" xmi:type="uml:Class" name="epo:ProcurementProcessInformation" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1946" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1946" ea_eleType="element"/>
 				<properties documentation="Information about the temporal unfolding or succession of Procurement Objects." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-07-07 12:02:13" modified="2024-03-18 12:54:07" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-07-07 12:02:13" modified="2024-07-23 13:19:38" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21491,9 +22424,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_49EC0F16_408C_4b28_B611_0048946DC070" xmi:type="uml:Class" name="epo:ProcurementServiceProvider" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="927" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="927" ea_eleType="element"/>
 				<properties documentation="Role of a public or private body which offers ancillary purchasing activities on the market.&#xA;&#xA;Additional information&#xA;&#xA;&quot;Ancillary Purchasing Activities&quot; means activities consisting in the provision of support to purchasing activities, in particular in the following forms:&#xA;(a) technical infrastructure enabling Contracting Authorities to award Public Contracts or to conclude Framework Agreements for works, supplies or services;&#xA;(b) advice on the conduct or design of public Procurement Procedures;&#xA;(c) preparation and management of Procurement Procedures on behalf and for the account of the Contracting Authority concerned;&#xA;&#xA;Source: Directive 2014/24/EU, Article 2, paragraphs 17 and 15.&#xA;&#xA;This would be equivalent to the concept of 'ProcuringEntity' in OCDS: 'The Entity managing the Procurement, which may be different from the Buyer who is paying / using the items being procured'.&#xA;&#xA;WG Approval 24/03/2020&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="jseguraf" version="1.0" phase="1.0" created="2018-09-26 16:55:20" modified="2024-03-18 12:27:10" complexity="1" status="Proposed"/>
+				<project author="jseguraf" version="1.0" phase="1.0" created="2018-09-26 16:55:20" modified="2024-07-23 13:17:36" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21508,9 +22441,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_CACB5357_5E4E_455f_8BFF_A7D6264C2555" xmi:type="uml:Class" name="epo:ProfessionalSuitabilitySummary" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="2943" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-05-02 16:32:14" modified="2024-03-18 12:49:27" complexity="1" status="Proposed"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="2943" ea_eleType="element"/>
+				<properties documentation="Overview of the professional ability required for the economic operator to execute the contract.&#xA;&#xA;WG approval 19/03/2024&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-05-02 16:32:14" modified="2024-07-23 13:19:02" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21519,7 +22452,7 @@
 				<attributes>
 					<attribute xmi:idref="EAID_0DA26AD7_BE49_4db1_AA79_96A38D4F56DB" name="epo:describesProfessionRelevantLaw" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="Explanatory text about the law concerning the profession.&#xA;&#xA;WG approval 02/05/2024"/>
 						<model ea_localid="2239" ea_guid="{0DA26AD7-BE49-4db1-AA79-96A38D4F56DB}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -21528,13 +22461,13 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
 					<attribute xmi:idref="EAID_85DA2813_C14D_4de1_BF7F_2C1F3E0C5D6F" name="epo:hasServiceReservedToParticularProfession" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="Execution of the contract is limited to a particular profession.&#xA;&#xA;WG approval 02/05/2024"/>
 						<model ea_localid="2240" ea_guid="{85DA2813-C14D-4de1-BF7F-2C1F3E0C5D6F}"/>
 						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -21543,13 +22476,13 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
 					<attribute xmi:idref="EAID_F84EB591_D812_40e9_A95F_3E051ECF3AE8" name="epo:describesProfession" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="Explanatory text about the profession.&#xA;&#xA;WG approval 02/05/2024"/>
 						<model ea_localid="2388" ea_guid="{F84EB591-D812-40e9-A95F-3E051ECF3AE8}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -21558,7 +22491,7 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -21568,9 +22501,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4" xmi:type="uml:Class" name="epo:Project" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="2635" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="2635" ea_eleType="element"/>
 				<properties documentation="A collaborative enterprise that is carefully planned to achieve a particular aim." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-02-09 17:15:26" modified="2024-03-18 12:26:26" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-02-09 17:15:26" modified="2024-07-23 11:54:54" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21579,12 +22512,13 @@
 				<links>
 					<Association xmi:id="EAID_EC04B8A5_6281_4f14_8017_204CCE05A2CC" start="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
 					<Association xmi:id="EAID_9866393B_8067_4f18_9B28_69541B862505" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4"/>
+					<Association xmi:id="EAID_D8A21C51_ABAE_473e_819D_1729AC275BCF" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8" xmi:type="uml:Class" name="epo:PurchaseContract" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="932" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="932" ea_eleType="element"/>
 				<properties documentation="A Contract resulting from using a Dynamic Purchasing System Technique or Framework Agreement Technique." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2018-08-29 15:25:18" modified="2024-03-18 12:54:23" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2018-08-29 15:25:18" modified="2024-07-23 13:20:19" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21597,9 +22531,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89" xmi:type="uml:Class" name="epo:QualificationCriteriaSummary" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="2950" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-05-05 12:20:34" modified="2024-03-18 12:49:27" complexity="1" status="Proposed"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="2950" ea_eleType="element"/>
+				<properties documentation="Overview of the Qualification Criteria.&#xA;&#xA;WG approval 19/03/2024&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-05-05 12:20:34" modified="2024-07-23 13:19:02" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21608,7 +22542,7 @@
 				<attributes>
 					<attribute xmi:idref="EAID_91A9B7A4_DF99_409a_B7EC_1F11AB228F3E" name="epo:hasQualificationCondition" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="Requirements to be fulfilled by tenders in view of their qualification.&#xA;&#xA;WG approval 02/05/2024"/>
 						<model ea_localid="2382" ea_guid="{91A9B7A4-DF99-409a-B7EC-1F11AB228F3E}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -21617,13 +22551,13 @@
 						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
 					<attribute xmi:idref="EAID_EB158250_E9F3_442e_8CF7_7CC26E757EE5" name="epo:hasConditionVerificationMethod" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="Means used to validate the qualification requirements.&#xA;&#xA;WG approval 02/05/2024&#xA;"/>
 						<model ea_localid="2383" ea_guid="{EB158250-E9F3-442e-8CF7-7CC26E757EE5}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -21632,7 +22566,7 @@
 						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -21644,9 +22578,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD" xmi:type="uml:Class" name="epo:QualificationCriterion" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="2951" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="2951" ea_eleType="element"/>
 				<properties documentation="Criterion used in the first stage of procurement.&#xA;&#xA;WG approval 30/05/2023" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-05-05 12:21:53" modified="2024-03-18 12:49:27" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-05-05 12:21:53" modified="2024-07-23 13:19:02" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21660,10 +22594,91 @@
 					<Generalization xmi:id="EAID_B61D93A6_A88F_4730_93D5_612F44B8ECE4" start="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122" end="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD"/>
 				</links>
 			</element>
+			<element xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" xmi:type="uml:Class" name="epo:Quantity" scope="public">
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1022" ea_eleType="element"/>
+				<properties documentation="A counted number of non-monetary units possibly including fractions.&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="mfontsan" version="1.0" phase="1.0" created="2018-10-22 10:56:42" modified="2024-07-23 13:21:12" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<attributes>
+					<attribute xmi:idref="EAID_439A021A_4789_4775_8650_9C585138E43E" name="epo:hasQuantityValue" scope="Public">
+						<initial/>
+						<documentation value="The numeric value of the quantity, including decimals."/>
+						<model ea_localid="1917" ea_guid="{439A021A-4789-4775-8650-9C585138E43E}"/>
+						<properties type="xsd:decimal" derived="0" precision="0" collection="false" length="0" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="0"/>
+						<stereotype/>
+						<bounds lower="1" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_27144131_8BB5_4491_A8AD_C3C93FA46553" name="epo:hasUnitDescription" scope="Public">
+						<initial/>
+						<documentation value="A narrative explanation defining the units of items being counted&#xA;&#xA;Additional information: This could be for example individual items or pack or two.&#xA;&#xA;WG Approval 09/11/2021"/>
+						<model ea_localid="1922" ea_guid="{27144131-8BB5-4491-A8AD-C3C93FA46553}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="5"/>
+						<stereotype/>
+						<bounds lower="0" upper="*"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
+				<links>
+					<Dependency xmi:id="EAID_30CBA4D5_2CA0_4043_A8BC_8FBCF102380D" start="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" end="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3"/>
+					<Association xmi:id="EAID_0167DB54_9519_42f6_BD3B_F46B589F376C" start="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_05490F76_8D40_4d74_97D4_F3871039E80A" start="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_0AC5D04E_7364_4118_9D94_CE93A68B3CF9" start="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_0F1AB34D_EA8C_44fb_B232_AA4B138F066B" start="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_11D3CF7A_4949_410c_A7E5_91AB91646B43" start="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_1F622DE3_2DEE_491f_A5F1_B592E89F9030" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_2ECAEC7F_2186_4280_A2C0_6DC585D1EE96" start="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_30A83FCD_B7E1_4f9c_95D1_48B460BCC4B8" start="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_3D54F6F9_658D_40fe_9D16_D79F46DB945C" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_45480564_D6B2_41da_8694_DC63D52825C1" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_4BA4CF11_20FC_48b0_A739_471F732B8482" start="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_55AE0CEF_3CD9_464a_82E7_387507253B10" start="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_5C5BD66A_585D_4646_9A7B_894EA99DED44" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_65E8EC44_CB4C_4aa9_8218_75D01ED44538" start="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_73E249AD_BE82_405c_AC1C_956CD538804F" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_75378C4F_ABAD_440f_8E1B_502A7CDA0486" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_76005691_B905_4be3_99BF_394E56A591CE" start="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_770594A4_09FD_4b6e_8D27_8D44BA5CA36A" start="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_838E60F9_C54C_4c80_88A3_D705701F1971" start="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_87C6E00F_DAEB_4e79_8340_AC2FC83206DA" start="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_87DEA454_B158_4e44_91D6_F1D258049A37" start="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_8C56C81B_B46D_49ef_B3BF_333FDA416F39" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_95D24239_8F4D_44c8_97D1_1C26296607DA" start="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_9EA3B8C3_695C_4b42_8481_D40EEC904171" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_A0FABF7A_1814_4dd4_BD97_28BD0C9F2F49" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_B1577190_0947_4041_ACDC_BC0C377734AF" start="EAID_BB1AAA4C_E66B_4fde_A0B6_1A30FC13503B" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_B4F0448C_1741_4b38_9973_F506CB883BA2" start="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_B9C9C412_36FA_46d5_AA00_34CA1CC60CA2" start="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_C5E4577A_5BDB_4176_9418_BB9B2E957222" start="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_E93A74BB_614F_4b1c_AE59_F45CD626BB7A" start="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_F475E438_48A3_41f5_A736_268C91FF8AF2" start="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_F70CA1D5_5E5E_4028_8583_6B810BB672CD" start="EAID_BB1AAA4C_E66B_4fde_A0B6_1A30FC13503B" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_F93A2AAD_C014_4fa4_88EE_23DE2339DB3C" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_F9F5CFA7_D31A_4c48_80EF_346FB3152195" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Association xmi:id="EAID_FA2388C8_1471_4d6b_9B9F_2E0BBE858668" start="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+				</links>
+			</element>
 			<element xmi:idref="EAID_A91B204C_7A0E_4608_A8D0_545E069052CC" xmi:type="uml:Class" name="epo:RequestForClarification" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1027" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1027" ea_eleType="element"/>
 				<properties documentation="A demand for elucidation of received information.&#xA;Additional Information:  &#xA;Requests for clarification are usually used by Buyers during the process of award or evaluation to understand specific aspects of the Tender without altering the Tender.&#xA;WG approval 20/04/2021" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="jseguraf" version="1.0" phase="1.0" created="2021-02-25 16:18:30" modified="2024-03-18 12:54:16" complexity="1" status="Proposed"/>
+				<project author="jseguraf" version="1.0" phase="1.0" created="2021-02-25 16:18:30" modified="2024-07-23 13:20:35" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21674,9 +22689,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_F72FB743_EDB9_4511_9787_B6F389BACA6B" xmi:type="uml:Class" name="epo:RequestForParticipation" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1029" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1029" ea_eleType="element"/>
 				<properties documentation="Application of an Economic Operator to be included in a Procurement Procedure.&#xA;WG approval: 20/04/2021" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="jseguraf" version="1.0" phase="1.0" created="2021-02-25 16:19:14" modified="2024-03-18 12:54:16" complexity="1" status="Proposed"/>
+				<project author="jseguraf" version="1.0" phase="1.0" created="2021-02-25 16:19:14" modified="2024-07-23 13:20:35" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21687,9 +22702,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" xmi:type="uml:Class" name="epo:ReviewDecision" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1675" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1675" ea_eleType="element"/>
 				<properties documentation="Information about Review Decisions. " isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-03-25 13:09:19" modified="2024-03-18 12:54:38" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-03-25 13:09:19" modified="2024-07-23 13:20:26" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21722,9 +22737,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_07601514_1C57_47ce_9A2D_CD97C5116067" xmi:type="uml:Class" name="epo:Reviewer" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="938" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="938" ea_eleType="element"/>
 				<properties documentation="Role of an Agent who investigates the overall correctness of a Procurement Procedure, producing a related report.&#xA;Additional Information:&#xA;Any Organisation or Person may request a review of a Procurement Procedure.&#xA;WG approval: 20/04/2021" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="jseguraf" version="1.0" phase="1.0" created="2020-06-05 12:07:40" modified="2024-03-18 12:27:10" complexity="1" status="Proposed"/>
+				<project author="jseguraf" version="1.0" phase="1.0" created="2020-06-05 12:07:40" modified="2024-07-23 13:17:36" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21737,9 +22752,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A" xmi:type="uml:Class" name="epo:ReviewIrregularitySummary" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1681" ea_eleType="element"/>
-				<properties documentation="Information about the number and type of requests the Buyer received to review any of its decisions (e.g. the Technical Specifications, Award Decision).&#xA;&#xA;Additional information:&#xA;This class corresponds  in eForms to BG-613	    Buyer Review Requests.&#xA;&#xA;&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-03-25 13:45:37" modified="2024-03-18 12:54:07" complexity="1" status="Proposed"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1681" ea_eleType="element"/>
+				<properties documentation="Overview of the number and type of requests the Buyer received to review any of its decisions (e.g. the Technical Specifications, Award Decision).&#xA;&#xA;WG approval 19/03/2024&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-03-25 13:45:37" modified="2024-07-23 13:19:38" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21769,9 +22784,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" xmi:type="uml:Class" name="epo:ReviewObject" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1677" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1677" ea_eleType="element"/>
 				<properties documentation="Information about a Review Request or a Review Decision.&#xA;&#xA;Additional information:&#xA;This class corresponds to the BG-714 Review in eForms.&#xA;&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-03-25 13:15:05" modified="2024-03-18 12:54:38" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-03-25 13:15:05" modified="2024-07-23 13:20:26" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21819,9 +22834,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_DCE733E5_38D7_4e94_A8B8_B385E9A6811B" xmi:type="uml:Class" name="epo:ReviewProcedureInformationProvider" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1351" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1351" ea_eleType="element"/>
 				<properties documentation="A Role of an Agent  who is providing more information on the time limits for review Procedures." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 12:25:17" modified="2024-03-18 12:27:10" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 12:25:17" modified="2024-07-23 13:17:36" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21833,9 +22848,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" xmi:type="uml:Class" name="epo:ReviewRequest" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1543" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1543" ea_eleType="element"/>
 				<properties documentation="Information about requests to review procedures. " isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-02-04 11:36:27" modified="2024-03-18 12:54:38" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-02-04 11:36:27" modified="2024-07-23 13:20:26" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21927,9 +22942,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_4E7C30BC_ABE6_4736_8E07_54ED87CB1179" xmi:type="uml:Class" name="epo:ReviewRequester" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1046" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1046" ea_eleType="element"/>
 				<properties documentation="Role of an Agent who requests the review of a (Procurement) Procedure.&#xA;&#xA;WG Approval 23/10/2021" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-11-12 12:02:32" modified="2024-03-18 12:27:10" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-11-12 12:02:32" modified="2024-07-23 13:17:36" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21940,9 +22955,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_92AE6E92_3A20_4642_A531_93ABFC476500" xmi:type="uml:Class" name="epo:ReviewRequestSummary" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1542" ea_eleType="element"/>
-				<properties documentation="Summary information about the requests the Buyer received to review any of its decisions (e.g. the technical specifications, award decision), as set out in Art. 1(5) of Directive 89/665/EEC and Directive 92/13/EEC, and about the complainants that submitted the requests.&#xA;&#xA;Additional information:&#xA;This class corresponds  in eForms to BG-612	    Buyer Review Summary." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-02-04 11:29:25" modified="2024-03-18 12:54:08" complexity="1" status="Proposed"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1542" ea_eleType="element"/>
+				<properties documentation="Overview of the requests received by the Buyer to review any of its decisions (e.g. the technical specifications, award decision), as set out in Art. 1(5) of Directive 89/665/EEC and Directive 92/13/EEC, and about the complainants that submitted the requests.&#xA;&#xA;WG approval 19/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-02-04 11:29:25" modified="2024-07-23 13:19:38" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -21972,9 +22987,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" xmi:type="uml:Class" name="epo:ReviewTerm" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="3090" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="3090" ea_eleType="element"/>
 				<properties documentation="Conditions and stipulations defining particularities of the review.&#xA;&#xA;WG approval 23/11/2018" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-07-13 06:43:18" modified="2024-03-18 12:27:51" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-07-13 06:43:18" modified="2024-07-23 13:17:53" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -22035,9 +23050,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_E13C8393_D02E_4800_B8D5_38C02E2C8998" xmi:type="uml:Class" name="epo:SecurityClearanceTerm" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="941" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="941" ea_eleType="element"/>
 				<properties documentation="Conditions and stipulations about the status requested of individuals allowing them access to classified information (state or organisational secrets) or to restricted areas, after completion of a thorough background check.&#xA;&#xA;Additional information: &#xA;This corresponds in eForms to BT-578, BT-78, BT-732 .&#xA;&#xA;WG approval 20/06/2023&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2019-02-26 15:12:29" modified="2024-03-18 12:27:58" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2019-02-26 15:12:29" modified="2024-07-23 13:18:02" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -22046,7 +23061,7 @@
 				<attributes>
 					<attribute xmi:idref="EAID_FDA0BF50_CABF_495e_8376_7F059C142FA2" name="epo:hasDeadline" scope="Public">
 						<initial/>
-						<documentation value="The deadline by which the security clearance must be submitted to the buyer.&#xA;&#xA;WG Approval 12/09/2019&#xA;&#xA;"/>
+						<documentation value="The time limit by which the security clearance must be submitted to the buyer.&#xA;&#xA;WG Approval 02/05/2024&#xA;&#xA;"/>
 						<model ea_localid="1771" ea_guid="{FDA0BF50-CABF-495e-8376-7F059C142FA2}"/>
 						<properties type="xsd:dateTime" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
@@ -22076,7 +23091,7 @@
 					</attribute>
 					<attribute xmi:idref="EAID_8710D5D2_1B92_4286_8D4C_A392932D7D7E" name="epo:isSecurityClearanceRequired" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="Security Clearance is needed.&#xA;&#xA;WG approval 02/05/2024"/>
 						<model ea_localid="2429" ea_guid="{8710D5D2-1B92-4286-8D4C-A392932D7D7E}"/>
 						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -22085,7 +23100,7 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -22095,9 +23110,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_6966846F_842F_4149_A95B_AE374D603608" xmi:type="uml:Class" name="epo:SelectedCandidateList" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="3006" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="3006" ea_eleType="element"/>
 				<properties documentation="Record of Candidates admitted to take part in award phases of procurements.&#xA;&#xA;WG approval 30/05/2023" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-05-24 14:01:24" modified="2024-03-18 12:53:58" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-05-24 14:01:24" modified="2024-07-23 13:19:28" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -22110,9 +23125,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB" xmi:type="uml:Class" name="epo:SelectionCriteriaSummary" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="2593" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-01-24 17:20:38" modified="2024-03-18 12:49:27" complexity="1" status="Proposed"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="2593" ea_eleType="element"/>
+				<properties documentation="Overview of the Selection Criteria.&#xA;&#xA;WG approval 19/03/2024&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-01-24 17:20:38" modified="2024-07-23 13:19:02" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -22121,7 +23136,7 @@
 				<attributes>
 					<attribute xmi:idref="EAID_3A627DC2_E5DD_431b_8A44_E0CCD873D80E" name="epo:hasSelectionCriteriaStatedInProcurementDocuments" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="The Selection Criteria are present in the Procurement Documents.&#xA;&#xA;WG approval 02/05/2024"/>
 						<model ea_localid="2368" ea_guid="{3A627DC2-E5DD-431b-8A44-E0CCD873D80E}"/>
 						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -22130,13 +23145,13 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
 					<attribute xmi:idref="EAID_F01C6008_3838_4756_A2F0_4B97431AD5FB" name="epo:describesMinimumLevelOfStandards" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="Explanatory text regarding the minimum level of standards required.&#xA;&#xA;WG approval 02/05/2024"/>
 						<model ea_localid="2369" ea_guid="{F01C6008-3838-4756-A2F0-4B97431AD5FB}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -22145,7 +23160,7 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -22158,9 +23173,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122" xmi:type="uml:Class" name="epo:SelectionCriterion" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="942" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="942" ea_eleType="element"/>
 				<properties documentation="Criterion that describes a capacity Requirement that the Economic Operator needs to fulfill to participate in the procurement.&#xA;&#xA;Additional Information:&#xA;Selection criteria may relate to:&#xA;(a) suitability to pursue the professional activity;&#xA;(b) economic and financial standing;&#xA;(c) technical and professional ability&#xA;&#xA;WG approval 31/10/2018" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="mfontsan" version="1.0" phase="1.0" created="2018-05-28 16:56:43" modified="2024-03-18 12:49:27" complexity="1" status="Proposed"/>
+				<project author="mfontsan" version="1.0" phase="1.0" created="2018-05-28 16:56:43" modified="2024-07-23 13:19:02" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -22190,9 +23205,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_C7B390E7_9D78_49dc_8846_DAF686401728" xmi:type="uml:Class" name="epo:SelectionEvaluationTerm" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1468" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1468" ea_eleType="element"/>
 				<properties documentation="Conditions and stipulations defining particularities of the evaluation of Selection Criteria." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-01-16 17:32:37" modified="2024-03-18 12:37:20" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-01-16 17:32:37" modified="2024-07-23 13:18:22" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -22203,9 +23218,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_2DF96E3A_E135_465d_908F_EAB3689291DE" xmi:type="uml:Class" name="epo:SocialProcurement" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="943" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="943" ea_eleType="element"/>
 				<properties documentation="Approach whereby Buyers seek to procure by fulfilling social objectives.&#xA;&#xA;Additional Information: &#xA;Socially Responsible Public Procurement (SRPP) -&#xA;‘SRPP’ means Procurement Operations that take into account one or more of the following social considerations: employment opportunities, decent work, compliance with social and labour rights, social inclusion (including persons with disabilities), equal opportunities, accessibility design for all, taking account of sustainability criteria, including ethical trade issues and wider voluntary compliance with corporate social responsibility (CSR), while observing the principles enshrined in the Treaty for the European Union (TFEU) and the Procurement Directives. &#xA;Source: Buying Social - A Guide to Taking Account of Social Considerations in Public Procurement (Publications Office of the European Union, 2011) https://op.europa.eu/en/publication-detail/-/publication/cb70c481-0e29-4040-9be2-c408cddf081f/language-en&#xA;See Article 18 and Annex X Directive 2014/24." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2019-04-04 16:28:40" modified="2024-03-18 12:51:40" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2019-04-04 16:28:40" modified="2024-07-23 13:19:08" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -22216,10 +23231,41 @@
 					<Generalization xmi:id="EAID_857D08F9_84F2_4d98_8718_882951247DF8" start="EAID_2DF96E3A_E135_465d_908F_EAB3689291DE" end="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA"/>
 				</links>
 			</element>
+			<element xmi:idref="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C" xmi:type="uml:Class" name="epo:SpecificDuration" scope="public">
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="2059" ea_eleType="element"/>
+				<properties documentation="The exact Duration.&#xA;&#xA;WG approval 19/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-08-26 11:34:06" modified="2024-07-23 13:21:12" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<attributes>
+					<attribute xmi:idref="EAID_443A0D12_FC67_4252_86EC_D1E5C696FA85" name="time:numericDuration" scope="Public">
+						<initial/>
+						<documentation value="Value of a temporal extent expressed as a number."/>
+						<model ea_localid="2026" ea_guid="{443A0D12-FC67-4252-86EC-D1E5C696FA85}"/>
+						<properties type="xsd:decimal" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="0"/>
+						<stereotype/>
+						<bounds lower="1" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
+				<links>
+					<Dependency xmi:id="EAID_90566F74_64BC_49c8_8076_1ECB982268EE" start="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C" end="EAID_EDCD6F3A_F86A_46ca_ACD1_13C3E1A4B7F9"/>
+					<Generalization xmi:id="EAID_FE0B0FB5_E0B6_41e2_AA82_ECF06C845021" start="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
+				</links>
+			</element>
 			<element xmi:idref="EAID_4F81C811_16F5_4332_BAEA_9843D331872F" xmi:type="uml:Class" name="epo:StatisticalInformation" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="944" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="944" ea_eleType="element"/>
 				<properties documentation="Statistical data on the Procedure and the Lot. &#xA;&#xA;Additional Information&#xA;&#xA;At the present time Procurement Procedures are not fully electronic. At a later date, information on the Tenders received could be inferred by the data in the eProcurement System.&#xA;Therefore this class is temporal and should cease to exist in fully electronic Procurement.&#xA;The need for its presence responds also to the alignment with the Regulation (EU) 2019/1780 (eForms).&#xA;&#xA;Attention will have to be paid in the future to possible inconsistencies derived from data placed in other classes and data held in the Statistical Information class; e.g. the TenderEvaluation class (see eEvaluation diagram) has the attribute admissibileTender indicator, which in case of being false, may enter in contradiction with the highest or lowest Tender value for that very same inadmissible Tender.&#xA;&#xA;WG Approval 12/12/2019&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="mfontsan" version="1.0" phase="1.0" created="2018-05-23 14:50:12" modified="2024-03-18 12:54:08" complexity="1" status="Proposed"/>
+				<project author="mfontsan" version="1.0" phase="1.0" created="2018-05-23 14:50:12" modified="2024-07-23 13:19:38" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -22233,9 +23279,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA" xmi:type="uml:Class" name="epo:StrategicProcurement" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="945" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="945" ea_eleType="element"/>
 				<properties documentation="Public Procurement that contributes to achieving pressing policy goals.&#xA;&#xA;Additional Information:&#xA;Specific strategic goals could be, for example, Environmental Protection, innovation, job creation and the development of small and medium enterprises.&#xA;&#xA;This corresponds in eForms to BG-713 Strategic Procurement. The subclasses are given by the choices in BT-06	 Strategic Procurement.&#xA;&#xA;Based on https://legalinstruments.oecd.org/en/instruments/OECD-LEGAL-0411 (see paragraph on &quot;background information&quot;.&#xA;&#xA;WG Approval 10/03/2020" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2019-04-02 14:47:14" modified="2024-03-18 12:51:40" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2019-04-02 14:47:14" modified="2024-07-23 13:19:08" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -22275,6 +23321,7 @@
 				</attributes>
 				<links>
 					<Dependency xmi:id="EAID_1BB31111_F63D_4464_AA32_D22B32C1DF1F" start="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA" end="EAID_DFCCF9E6_D161_4a4e_8468_6429D56A1496"/>
+					<Association xmi:id="EAID_32F239DB_02BC_456a_934F_BBF695929296" start="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" end="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA"/>
 					<Association xmi:id="EAID_81D470D5_433B_4242_826E_974C4A3AEF87" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA"/>
 					<Generalization xmi:id="EAID_857D08F9_84F2_4d98_8718_882951247DF8" start="EAID_2DF96E3A_E135_465d_908F_EAB3689291DE" end="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA"/>
 					<Generalization xmi:id="EAID_ADB72D59_DC72_465e_97A2_B2C5B93B0F80" start="EAID_EC3D2F66_1FC6_4b4c_AAD2_04A3726B2332" end="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA"/>
@@ -22282,9 +23329,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E" xmi:type="uml:Class" name="epo:SubcontractingEstimate" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1650" ea_eleType="element"/>
-				<properties documentation="Information on the approximation of the foreseen Subcontracting." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-03-17 13:01:01" modified="2024-03-18 12:54:08" complexity="1" status="Proposed"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1650" ea_eleType="element"/>
+				<properties documentation="Approximation concerning the foreseen Subcontracting.&#xA;&#xA;WG approval 19/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-03-17 13:01:01" modified="2024-07-23 13:19:38" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -22321,6 +23368,36 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
+					<attribute xmi:idref="EAID_6C70AD90_9D48_480a_BF77_791AAC05D8D5" name="epo:isSubcontractingValueKnown" scope="Public">
+						<initial/>
+						<documentation/>
+						<model ea_localid="2639" ea_guid="{6C70AD90-9D48-480a-BF77-791AAC05D8D5}"/>
+						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="3"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_A2B1A2FE_B767_4af0_BE7E_EF7EAB190232" name="epo:isSubcontractingPercentageKnown" scope="Public">
+						<initial/>
+						<documentation/>
+						<model ea_localid="2640" ea_guid="{A2B1A2FE-B767-4af0-BE7E-EF7EAB190232}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="4"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
 					<attribute xmi:idref="EAID_467A3DAE_DEA8_4237_9133_432198D98388" name="epo:hasSubjectMatter" scope="Public">
 						<initial/>
 						<documentation value="Description of the share of the contract that is to be subcontracted. &#xA;&#xA;Additional infromation:&#xA;This can be an aggregate of several subcontracts.&#xA;&#xA;WG Approval 09/11/2021"/>
@@ -22344,9 +23421,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" xmi:type="uml:Class" name="epo:Subcontractor" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="947" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="947" ea_eleType="element"/>
 				<properties documentation="A Role of an Agent  that has an agreement to perform part or all of the obligations of another Agents's Contract. &#xA;Additional information&#xA;For some Procedures, the Subcontractor signs as well the Contract between the Buyer and the Contractor.&#xA;&#xA;At tendering time, entities relied upon by the Economic Operators can be Subcontractors or not. &#xA;&#xA;When modelling ESPD we will analyze whether we need or not a Role named &quot;relied upon&quot;.&#xA;&#xA;WG approval 05/08/2021&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2020-03-26 16:02:18" modified="2024-03-18 12:27:10" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2020-03-26 16:02:18" modified="2024-07-23 13:17:36" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -22355,12 +23432,15 @@
 				<links>
 					<Generalization xmi:id="EAID_A27A53B2_A6D1_4fdd_A43E_D33DC6607852" start="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
 					<Association xmi:id="EAID_24545C91_D269_4cfe_A646_9A2FDEE01B0F" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7"/>
+					<Association xmi:id="EAID_4347709B_D87B_4476_92B0_4EF65D96A0BA" start="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" end="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7"/>
+					<Association xmi:id="EAID_9E5B53CF_762F_4436_88E6_F386741960D6" start="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" end="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7"/>
+					<Association xmi:id="EAID_ED09AA70_1480_4e41_8F94_BA9A89E0B960" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561" xmi:type="uml:Class" name="epo:SubcontractTerm" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="948" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="948" ea_eleType="element"/>
 				<properties documentation="A concept to describe the main information regarding the share of parts of the Contract to third parties." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2018-05-08 10:41:16" modified="2024-03-18 12:37:13" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2018-05-08 10:41:16" modified="2024-07-23 13:18:17" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -22465,9 +23545,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" xmi:type="uml:Class" name="epo:SubmissionStatisticalInformation" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1544" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1544" ea_eleType="element"/>
 				<properties documentation="Statistical information about submissions on a given competition, either at Lot level or Mini-Competition level.&#xA;&#xA;WG approval 30/05/2023" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-02-04 11:50:32" modified="2024-03-18 12:54:08" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-02-04 11:50:32" modified="2024-07-23 13:19:38" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -22626,7 +23706,7 @@
 					</attribute>
 					<attribute xmi:idref="EAID_4FC750AC_066D_4f5d_97D2_96AC42B10531" name="epo:hasOtherCountriesReceivedTenders" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="The amount of Tenders received from countries other than that of the Buyer.&#xA;&#xA;WG approval 02/05/2024"/>
 						<model ea_localid="2398" ea_guid="{4FC750AC-066D-4f5d-97D2-96AC42B10531}"/>
 						<properties type="xsd:integer" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -22635,7 +23715,7 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -22754,9 +23834,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" xmi:type="uml:Class" name="epo:SubmissionTerm" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="949" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="949" ea_eleType="element"/>
 				<properties documentation="Conditions and stipulations defining particularities of submitting Documents to the Buyer. &#xA;&#xA;Additional Information: &#xA;These Documents can be Tenders, Request To Participate and expressions of interest.&#xA;&#xA;WG Approval 14/07/2020" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2019-02-13 10:58:28" modified="2024-03-18 12:28:08" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2019-02-13 10:58:28" modified="2024-07-23 13:18:11" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -22870,7 +23950,7 @@
 					</attribute>
 					<attribute xmi:idref="EAID_FE9E9688_0EC4_4a22_8340_EA2FAF94B78F" name="epo:hasReceiptPreliminaryMarketConsultationDeadline" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="The time limit until which answers to the Preliminary Market Consultation can be received.&#xA;&#xA;WG approval 02/05/2024"/>
 						<model ea_localid="2404" ea_guid="{FE9E9688-0EC4-4a22-8340-EA2FAF94B78F}"/>
 						<properties type="xsd:dateTime" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -22879,7 +23959,7 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -22900,7 +23980,7 @@
 					</attribute>
 					<attribute xmi:idref="EAID_B48EEE40_ED5C_48cf_AFC4_3D5FB5EE6906" name="epo:hasReceiptParticipationRequestDeadline" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="The time limit until which requests to participate can be received.&#xA;&#xA;WG approval 02/05/2024&#xA;"/>
 						<model ea_localid="2405" ea_guid="{B48EEE40-ED5C-48cf-AFC4-3D5FB5EE6906}"/>
 						<properties type="xsd:dateTime" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -22909,7 +23989,7 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -22930,7 +24010,7 @@
 					</attribute>
 					<attribute xmi:idref="EAID_C91BA594_4948_4ee3_BA84_B73B538B8AC5" name="epo:hasReceiptTenderDeadline" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="The time limit until which the Tenders can be received.&#xA;&#xA;WG approval 02/05/2024"/>
 						<model ea_localid="2406" ea_guid="{C91BA594-4948-4ee3-BA84-B73B538B8AC5}"/>
 						<properties type="xsd:dateTime" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -22939,7 +24019,7 @@
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -22976,9 +24056,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_DC5A8DC6_4D0A_4432_B667_CE2C1E6D5A96" xmi:type="uml:Class" name="epo:System" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="950" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="950" ea_eleType="element"/>
 				<properties documentation="Software application used for performing Procurement activities. &#xA;&#xA;WG Approval 28/04/2020&#xA;&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="jrevenga" version="1.0" phase="1.0" created="2020-02-06 10:55:36" modified="2024-03-18 12:26:43" complexity="1" status="Proposed"/>
+				<project author="jrevenga" version="1.0" phase="1.0" created="2020-02-06 10:55:36" modified="2024-07-23 11:55:02" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -23007,9 +24087,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_CADD27F3_86EF_483f_A036_7DF4251EE09C" xmi:type="uml:Class" name="epo:TaxInformationProvider" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1330" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1330" ea_eleType="element"/>
 				<properties documentation="A Role of an Agent  responsible for providing information concerning the general regulatory framework for taxes." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 11:34:45" modified="2024-03-18 12:27:10" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 11:34:45" modified="2024-07-23 13:17:36" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -23020,9 +24100,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_FB996CB7_0FB9_4a30_8AA0_0ABAC3D0F2BD" xmi:type="uml:Class" name="epo:TechnicalAbilitySummary" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="2945" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-05-02 16:36:10" modified="2024-03-18 12:49:27" complexity="1" status="Proposed"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="2945" ea_eleType="element"/>
+				<properties documentation="Overview of the expertise required for the economic operator to execute the contract.&#xA;&#xA;WG approval 19/03/2024&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-05-02 16:36:10" modified="2024-07-23 13:19:02" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -23033,9 +24113,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_F5AE8AA9_91EE_4cb3_AE98_14D4AF1A77C1" xmi:type="uml:Class" name="epo:TechnicalSpecification" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="951" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="951" ea_eleType="element"/>
 				<properties documentation="A set of documented Requirements applicable to the object of the Procurement.&#xA;Additional Information: &#xA;A specification often includes technical standards.&#xA;WG approval: 20/04/2021" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2018-03-25 11:41:18" modified="2024-03-18 12:54:16" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2018-03-25 11:41:18" modified="2024-07-23 13:20:35" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -23046,9 +24126,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_3780AA50_D898_4068_B300_47B46651CA0A" xmi:type="uml:Class" name="epo:Technique" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="953" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="953" ea_eleType="element"/>
 				<properties documentation="Method used for conducting Procurement Procedures.&#xA;&#xA;Addtional information:&#xA;This corresponds in eForms to BG-706 Techniques.&#xA;&#xA;Several Techniques can be combined in one single Procurement Procedure (e.g. eAuction can be carried out in a Framework Agreement or DPS).&#xA;&#xA;WG Approval 19/09/2019 &#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="mfontsan" version="1.0" phase="1.0" created="2018-06-25 18:32:43" modified="2024-03-18 12:51:51" complexity="1" status="Proposed"/>
+				<project author="mfontsan" version="1.0" phase="1.0" created="2018-06-25 18:32:43" modified="2024-07-23 13:19:20" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -23082,9 +24162,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B" xmi:type="uml:Class" name="epo:TenderAwardOutcome" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1370" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1370" ea_eleType="element"/>
 				<properties documentation="Result concerning the Tender attributed by the Awarder." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 15:44:17" modified="2024-03-18 12:53:58" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 15:44:17" modified="2024-07-23 13:19:28" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -23115,9 +24195,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" xmi:type="uml:Class" name="epo:Tenderer" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="956" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="956" ea_eleType="element"/>
 				<properties documentation="A Role of an Agent that has submitted a Tender.&#xA;&#xA;Additional Information:&#xA;A Tenderer is an Economic Operator or group of Economic Operators that has submitted a Tender.&#xA;WG approval 05/08/2021" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2018-05-16 11:29:44" modified="2024-03-18 12:27:10" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2018-05-16 11:29:44" modified="2024-07-23 13:17:36" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -23131,9 +24211,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_FD0308FC_9EDA_4a54_A4B6_FBCE76BF76A2" xmi:type="uml:Class" name="epo:TenderProcessor" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1344" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1344" ea_eleType="element"/>
 				<properties documentation="A Role of an Agent  responsible for processing Tenders." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 12:07:08" modified="2024-03-18 12:27:10" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 12:07:08" modified="2024-07-23 13:17:36" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -23145,9 +24225,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_73C42C68_C5D6_4b6c_AA94_2CA27746393B" xmi:type="uml:Class" name="epo:TenderReceiver" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1343" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1343" ea_eleType="element"/>
 				<properties documentation="A Role of an Agent  responsible for receiving Tenders." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 12:06:50" modified="2024-03-18 12:27:10" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 12:06:50" modified="2024-07-23 13:17:36" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -23159,9 +24239,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" xmi:type="uml:Class" name="epo:Term" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1368" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1368" ea_eleType="element"/>
 				<properties documentation="A governing condition or stipulation." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 15:40:59" modified="2024-03-18 12:37:26" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 15:40:59" modified="2024-07-23 13:18:29" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -23176,9 +24256,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0" xmi:type="uml:Class" name="epo:VehicleInformation" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="3084" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-07-03 18:51:44" modified="2024-03-18 12:51:40" complexity="1" status="Proposed"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="3084" ea_eleType="element"/>
+				<properties documentation="Information related to clean vehicles legislation.&#xA;&#xA;Additional information:&#xA;In the European Union, the legislation concerned is the European Parliament and Council 2009/33/EC (Clean Vehicles Directive – CVD). &#xA;&#xA;WG approval 07/05/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-07-03 18:51:44" modified="2024-07-23 13:19:08" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -23187,7 +24267,7 @@
 				<attributes>
 					<attribute xmi:idref="EAID_5B166BB3_0A29_4594_97B0_16D705A9F927" name="epo:hasTotalVehicles" scope="Public">
 						<initial/>
-						<documentation value="The number of all vehicles (regardless of whether clean or not) that have either been purchased, leased, rented, hired-purchased or their use has been contractually committed to for the provision of a purchased service.&#xA;&#xA;Additional Information&#xA;&#xA;In the European Union, the legal requirements and scope for the provision of these vehicles or services are covered by Directive 2009/33/EC.&#xA;&#xA;WG Approval 28/07/2020&#xA;"/>
+						<documentation value="The number of all vehicles (regardless of whether clean or not) that have either been purchased, leased, rented, hired-purchased or their use has been contractually committed to for the provision of a purchased service.&#xA;&#xA;Additional Information:&#xA;In the European Union, the legal requirements and scope for the provision of these vehicles or services are covered by Directive 2009/33/EC.&#xA;&#xA;WG Approval 28/07/2020&#xA;"/>
 						<model ea_localid="1796" ea_guid="{5B166BB3-0A29-4594-97B0-16D705A9F927}"/>
 						<properties type="xsd:integer" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
@@ -23202,7 +24282,7 @@
 					</attribute>
 					<attribute xmi:idref="EAID_79CEE53B_719C_42c2_8AE2_8FB4C6159B75" name="epo:hasZeroEmissionVehicles" scope="Public">
 						<initial/>
-						<documentation value="The number of all zero-emission heavy-duty vehicles that have either been purchased, leased, rented, hired-purchased or their use has been contractually committed to for the provision of a purchased service.&#xA;&#xA;Additional Information&#xA;&#xA;In the European Union, the legal requirements and scope for the provision of these vehicles or services are covered by Directive 2009/33/EC.&#xA;&#xA;WG Approval 28/07/2020&#xA;"/>
+						<documentation value="The number of all zero-emission heavy-duty vehicles that have either been purchased, leased, rented, hired-purchased or their use has been contractually committed to for the provision of a purchased service.&#xA;&#xA;Additional Information:&#xA;In the European Union, the legal requirements and scope for the provision of these vehicles or services are covered by Directive 2009/33/EC.&#xA;&#xA;WG Approval 28/07/2020&#xA;"/>
 						<model ea_localid="1799" ea_guid="{79CEE53B-719C-42c2-8AE2-8FB4C6159B75}"/>
 						<properties type="xsd:integer" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
@@ -23217,7 +24297,7 @@
 					</attribute>
 					<attribute xmi:idref="EAID_9437602D_8F8F_47f4_A458_A53DAE08FDF0" name="epo:hasCleanVehicles" scope="Public">
 						<initial/>
-						<documentation value="The number of all clean vehicles that have either been purchased, leased, rented, hired-purchased or their use has been contractually committed to for the provision of a purchased service.&#xA;&#xA;Additional Information&#xA;In the European Union, the legal requirements and scope for the provision of these vehicles or services are covered by Directive 2009/33/EC.&#xA;&#xA;WG Approval 28/07/2020&#xA;"/>
+						<documentation value="The number of all clean vehicles that have either been purchased, leased, rented, hired-purchased or their use has been contractually committed to for the provision of a purchased service.&#xA;&#xA;Additional Information:&#xA;In the European Union, the legal requirements and scope for the provision of these vehicles or services are covered by Directive 2009/33/EC.&#xA;&#xA;WG Approval 28/07/2020&#xA;"/>
 						<model ea_localid="1800" ea_guid="{9437602D-8F8F-47f4-A458-A53DAE08FDF0}"/>
 						<properties type="xsd:integer" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
@@ -23238,9 +24318,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3" xmi:type="uml:Class" name="epo:Winner" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="962" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="962" ea_eleType="element"/>
 				<properties documentation="A Role of an Agent  to whom a Lot is awarded.&#xA;WG approval 05/08/2021 (revised 26/10/2021)" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2018-05-08 11:33:13" modified="2024-03-18 12:27:10" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2018-05-08 11:33:13" modified="2024-07-23 13:17:36" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -23254,9 +24334,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" xmi:type="uml:Class" name="foaf:Agent" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="852" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="852" ea_eleType="element"/>
 				<properties documentation="A  Person, an Organisation, or a System that acts in Procurement or have the power to act in Procurement.&#xA;&#xA;WG Approval 28/04/2020" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2020-01-14 12:03:18" modified="2024-03-18 12:26:43" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2020-01-14 12:03:18" modified="2024-07-23 11:55:02" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -23304,9 +24384,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" xmi:type="uml:Class" name="foaf:Person" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1902" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1902" ea_eleType="element"/>
 				<properties documentation="The Person class represents people. Something is a Person if it is a Person. We don't nitpick about whether they're alive, dead, real, or imaginary. The Person class is a sub-class of the Agent class, since all people are considered 'Agents' in FOAF." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-05-25 15:22:29" modified="2024-03-18 12:26:43" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-05-25 15:22:29" modified="2024-07-23 11:55:02" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -23320,9 +24400,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_29678A10_6473_461a_BE84_76269B5BBD68" xmi:type="uml:Class" name="locn:Address" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="851" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="851" ea_eleType="element"/>
 				<properties documentation="The particulars of the place where a Person or an Organisation is located.&#xA;&#xA;WG Approval 28/04/2020&#xA;&#xA;Additional Information:&#xA;An &quot;Address Representation&quot; as conceptually defined by the INSPIRE Address Representation data type: &quot;Representation of an address spatial object for use in external application schemas that need to include the basic, address information in a readable way.&quot;.&#xA;&#xA;&#xA;The representation of Addresses varies widely from one country's postal System to another. Even within countries, there are almost always examples of Addresses that do not conform to the stated national standard. At the time of publication, work is progressing on ISO 19160-1 that defines a method through which different Addresses can be converted from one conceptual model to another.&#xA;&#xA;&#xA;This specification was heavily based on the INSPIRE Address Representation data type. It is noteworthy that if an Address is provided using the detailed breakdown suggested by the properties for this class, then it will be INSPIRE-conformant. To this very granular set of properties, we add two further properties:&#xA;&#xA;- full address (the complete address as a formatted string)&#xA;- addressID (a unique identifier for the address)&#xA;The first of these allows publishers to simply provide the complete Address as one string, with or without formatting. This is analogous to vCard's label property.&#xA;&#xA;The addressID is part of the INSPIRE guidelines and provides a hook that can be used to link the Address to an alternative representation, such as vCard or OASIS xAL." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="jseguraf" version="1.0" phase="1.0" created="2018-12-04 17:02:22" modified="2024-03-18 12:27:32" complexity="1" status="Proposed"/>
+				<project author="jseguraf" version="1.0" phase="1.0" created="2018-12-04 17:02:22" modified="2024-07-23 13:17:45" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -23478,9 +24558,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_2424C22E_B54F_4b6f_BA47_E78DE21C76DE" xmi:type="uml:Class" name="locn:Geometry" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="1483" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="1483" ea_eleType="element"/>
 				<properties documentation="The Geometry class provides the means to identify a Location as a point, line, polygon, etc. expressed using coordinates in some coordinate reference System.&#xA;&#xA;Additional Information:&#xA;This class defines the notion of &quot;Geometry&quot; at the conceptual level, and it shall be encoded by using different formats (see usage note of the locn:geometry property). We also refer to the Examples section of this specification for a number of different Geometry examples expressed in different formats." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-01-03 11:43:48" modified="2024-03-18 12:27:32" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-01-03 11:43:48" modified="2024-07-23 13:17:45" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -23538,9 +24618,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" xmi:type="uml:Class" name="org:Organization" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="913" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="913" ea_eleType="element"/>
 				<properties documentation="A collection of people organized together into a community or other social, commercial or political structure. The group has some common purpose or reason for existence which goes beyond the set of people belonging to it and can act as an Agent. Organisations are often decomposable into hierarchical structures.&#xA;&#xA;(WG approval 23/11/2018).&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2020-01-14 12:03:10" modified="2024-03-18 12:26:43" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2020-01-14 12:03:10" modified="2024-07-23 11:55:02" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -23648,9 +24728,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" xmi:type="uml:Class" name="person:Person" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="0" ea_localid="916" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="916" ea_eleType="element"/>
 				<properties documentation="A individual human being who may be dead or alive, but not imaginary.&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2020-01-14 12:03:33" modified="2024-03-18 12:26:43" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2020-01-14 12:03:33" modified="2024-07-23 11:55:02" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -23772,10 +24852,23 @@
 					<Association xmi:id="EAID_E3D7352D_80E6_41e6_B85A_672AACE795E2" start="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896" end="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225"/>
 				</links>
 			</element>
+			<element xmi:idref="EAID_F8F2DEF8_6045_44d5_93B9_E57CE8023BE9" xmi:type="uml:Class" name="time:Duration" scope="public">
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="0" ea_localid="3252" ea_eleType="element"/>
+				<properties documentation="Duration of a temporal extent expressed as a number scaled by a temporal unit." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-10-27 16:13:49" modified="2024-07-23 13:21:12" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="classes"/>
+				<links>
+					<Generalization xmi:id="EAID_9501DE7B_F539_4409_8D54_7B950268D75C" start="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" end="EAID_F8F2DEF8_6045_44d5_93B9_E57CE8023BE9"/>
+				</links>
+			</element>
 			<element xmi:idref="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" xmi:type="uml:Class" name="epo:AwardDecision" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="1" ea_localid="854" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="1" ea_localid="854" ea_eleType="element"/>
 				<properties documentation="Resolution of the Buyer as to the result of the Procurement Procedure.&#xA;&#xA;WG approval 14/11/2018" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2018-03-21 18:12:07" modified="2024-03-18 12:54:16" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2018-03-21 18:12:07" modified="2024-07-23 13:20:35" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -23824,9 +24917,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" xmi:type="uml:Class" name="epo:ProcurementObject" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="2" ea_localid="1717" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="2" ea_localid="1717" ea_eleType="element"/>
 				<properties documentation="The whole or a division of goods, services or works to be procured.&#xA;&#xA;Additional Information:&#xA;Anything that can specify the procurement content (i.e. goods, services, work) is a Procurement Object. &#xA;In a sense, such an &quot;object&quot; can constitute the &quot;object of a Contract&quot;.&#xA;To test whether something is a Procedure Object check if it can have a Purpose and/or CPV classification (&lt;i&gt;The CPV establishes a single classification system for public procurement aimed at standardising the references used by Contracting Authorities and entities to describe the subject of Procurement Contracts.&lt;/i&gt;).&#xA;&#xA;Note:&#xA;Procedure, seems to be an exception from this rule. Because it is a conflated term: it carries process properties and &quot;purpose&quot; properties. " isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-04-15 16:12:26" modified="2024-03-18 12:26:26" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-04-15 16:12:26" modified="2024-07-23 11:54:54" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -23925,7 +25018,7 @@
 					</attribute>
 					<attribute xmi:idref="EAID_9D9B9980_E3C9_4487_8DC0_2F870FD3CE34" name="epo:hasLegalBasisDescription" scope="Public">
 						<initial/>
-						<documentation/>
+						<documentation value="Explanatory text about the legal basis.&#xA;&#xA;WG approval 02/05/2024"/>
 						<model ea_localid="2348" ea_guid="{9D9B9980-E3C9-4487-8DC0-2F870FD3CE34}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
@@ -23934,7 +25027,7 @@
 						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
@@ -23957,9 +25050,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" xmi:type="uml:Class" name="epo:Lot" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="3" ea_localid="906" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="3" ea_localid="906" ea_eleType="element"/>
 				<properties documentation="A qualitative, quantitative or strategic subdivision of the goods, services or works to be procured, allowing the award of one or more Contracts.&#xA;&#xA;WG approval 12/09/2018" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="mfontsan" version="2.0.1" phase="1.0" created="2018-02-06 17:38:11" modified="2024-03-18 12:26:26" complexity="1" status="Proposed"/>
+				<project author="mfontsan" version="2.0.1" phase="1.0" created="2018-02-06 17:38:11" modified="2024-07-23 11:54:54" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -23979,17 +25072,19 @@
 					<Association xmi:id="EAID_53A06CD6_3F60_4e8f_A32A_669CA4829E33" start="EAID_71373AFD_6871_4946_B921_97A716439257" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
 					<Association xmi:id="EAID_55B64699_B98C_49f8_AAA8_01BAEEF0DD49" start="EAID_17662AEF_1321_446a_AE42_0583F7417A79" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
 					<Association xmi:id="EAID_56C46ECB_7950_4db1_AA23_2C9AD7E8E999" start="EAID_92AE6E92_3A20_4642_A531_93ABFC476500" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
+					<Association xmi:id="EAID_6AE31D37_FF1B_42a0_838A_8319D03108B2" start="EAID_30DD6891_71FE_4f87_832B_477790550BBC" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
 					<Association xmi:id="EAID_6CDB7A9B_1395_4587_9F41_FE45FA8A0605" start="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
 					<Association xmi:id="EAID_7355842B_BD0C_4fab_8681_C210E308328D" start="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
 					<Association xmi:id="EAID_7B7715A6_6B94_492e_9116_A734400E6358" start="EAID_1062E1ED_D094_425e_B51B_9E700090C968" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
 					<Association xmi:id="EAID_96BA801A_E8C8_4628_94BC_1C90816E0487" start="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
+					<Association xmi:id="EAID_A959BE8D_107A_4aaf_BE64_567414A2ABCC" start="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
 					<Association xmi:id="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" xmi:type="uml:Class" name="epo:PlannedProcurementPart" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="4" ea_localid="917" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="4" ea_localid="917" ea_eleType="element"/>
 				<properties documentation="A subdivision of a Planned Procurement that may later become one or more Lots or a self-standing Procedure. A Lot or a Procedure can also cover one or more parts of the Planned Procurement.&#xA;&#xA;WG Approval 20/06/2019" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2019-06-18 15:07:23" modified="2024-03-18 12:26:26" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2019-06-18 15:07:23" modified="2024-07-23 11:54:54" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -24007,9 +25102,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C" xmi:type="uml:Class" name="epo:CertificationLabel" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="5" ea_localid="1948" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="5" ea_localid="1948" ea_eleType="element"/>
 				<properties documentation="Concept that stands for a set of norms, expectations, standards and policies.&#xA;&#xA;Additional Information:&#xA;Such standards may relate to social, ethical and quality etc.&#xA;&#xA;WG approval 26/07/2022&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-07-11 20:37:03" modified="2024-03-18 12:49:27" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-07-11 20:37:03" modified="2024-07-23 13:19:02" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -24039,9 +25134,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" xmi:type="uml:Class" name="epo:Procedure" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="5" ea_localid="922" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="5" ea_localid="922" ea_eleType="element"/>
 				<properties documentation="A legally defined set of administrative activities conducted  to conclude one or more Contracts.&#xA;&#xA;Additional Information&#xA;The Procedure is categorised in the law according to different rules determining whether the Procedure is Open, Restricted, Negotiated with or without  publicity, etc. (see Procedure Type).&#xA;&#xA;WG Approval 20/08/2019&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="mfontsan" version="1.0" phase="1.0" created="2018-02-02 12:19:21" modified="2024-03-18 12:26:26" complexity="1" status="Proposed"/>
+				<project author="mfontsan" version="1.0" phase="1.0" created="2018-02-02 12:19:21" modified="2024-07-23 11:54:54" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -24133,11 +25228,13 @@
 					<Association xmi:id="EAID_D01E7677_5AC2_42b1_AA17_2A8EC003CCFE" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
 					<Association xmi:id="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
 					<Association xmi:id="EAID_DB9BB27E_7F36_41c3_8166_36C3538F2F3A" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D"/>
+					<Association xmi:id="EAID_110A81E5_E1CC_45be_BCFD_56F87C51B05A" start="EAID_30DD6891_71FE_4f87_832B_477790550BBC" end="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
 					<Association xmi:id="EAID_5A6933BC_AE5B_4536_B67E_B79F177247C7" start="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" end="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
 					<Association xmi:id="EAID_A5762169_952E_4db0_9FE7_6B4A895F2AF1" start="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" end="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
 					<Association xmi:id="EAID_ABA2D6DE_6BD5_49b4_9900_A82C2C734195" start="EAID_1062E1ED_D094_425e_B51B_9E700090C968" end="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
 					<Association xmi:id="EAID_AEF23C3F_F74B_434a_AA2D_59AF706E79E6" start="EAID_71373AFD_6871_4946_B921_97A716439257" end="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
 					<Association xmi:id="EAID_B1307E49_0838_4569_819E_D05D699E0983" start="EAID_D847D616_70DB_473a_A2A4_6665F938474C" end="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
+					<Association xmi:id="EAID_DDF623FF_98AA_460a_A33E_F3B7832B7132" start="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11" end="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
 					<Association xmi:id="EAID_E69DD4EA_847D_4a36_96C4_9709B72BA620" start="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" end="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
 					<Association xmi:id="EAID_F365A241_4CD0_4009_A42F_041D198E70E4" start="EAID_17662AEF_1321_446a_AE42_0583F7417A79" end="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
 					<Association xmi:id="EAID_F5AC099A_F1E0_4926_9F7B_6C2B6C33321B" start="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" end="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
@@ -24145,9 +25242,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1" xmi:type="uml:Class" name="epo:Certifier" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="6" ea_localid="1951" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="6" ea_localid="1951" ea_eleType="element"/>
 				<properties documentation="The role of an agent who issues a certificate. &#xA;&#xA;Additional Information:&#xA;The certifier is responsible for verifying and confirming the conformance of the instance of the concept to a defined set of criteria.&#xA;&#xA;WG approval 16/05/2023" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-07-13 13:21:25" modified="2024-03-18 12:27:10" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-07-13 13:21:25" modified="2024-07-23 13:17:36" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -24159,9 +25256,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" xmi:type="uml:Class" name="epo:LotGroup" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="6" ea_localid="907" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="6" ea_localid="907" ea_eleType="element"/>
 				<properties documentation="Combination of several Lots to conduct comparative assessment of the Tenders.&#xA;&#xA;Additional Information:&#xA;&#xA;The comparative assessment may refer to the Selection Criteria, Award and Value that apply to several Lots.&#xA;&#xA;Pending of discussion with eForms&#xA;&#xA;&#xA;&#xA;Member States may provide that, where more than one lot may be awarded to the same tenderer, contracting authorities may award contracts combining several or all lots where they have specified in the contract notice or in the invitation to confirm interest that they reserve the possibility of doing so and indicate the lots or groups of lots that may be combined." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="jseguraf" version="1.0" phase="1.0" created="2018-12-10 12:28:49" modified="2024-03-18 12:26:26" complexity="1" status="Proposed"/>
+				<project author="jseguraf" version="1.0" phase="1.0" created="2018-12-10 12:28:49" modified="2024-07-23 11:54:54" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -24198,9 +25295,25 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
+					<attribute xmi:idref="EAID_EA7396EC_86FC_4bd3_B6B9_2F35805804F8" name="epo:isSMESuitable" scope="Public">
+						<initial/>
+						<documentation/>
+						<model ea_localid="2638" ea_guid="{EA7396EC-86FC-4bd3-B6B9-2F35805804F8}"/>
+						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="2"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
 				</attributes>
 				<links>
 					<Association xmi:id="EAID_20732599_332F_4f0e_BFE6_593632EDB11F" start="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
+					<Association xmi:id="EAID_505234FB_4CE0_475f_A94B_6552B0F5A59A" start="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
 					<Association xmi:id="EAID_55771AD3_C775_4324_AEBA_EA277D05F7E8" start="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
 					<Association xmi:id="EAID_608CC8C6_3A48_4541_8467_9DDA71E8D534" start="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
 					<Association xmi:id="EAID_72A7614C_D179_4558_8F62_2FA41A99DF74" start="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
@@ -24211,6 +25324,7 @@
 					<Association xmi:id="EAID_4B36ABDE_C6FC_4a8d_93CA_CC7ACC63568D" start="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" end="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
 					<Association xmi:id="EAID_7B5EC3B7_635F_49aa_B61D_661F42799A98" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
 					<Association xmi:id="EAID_896CC936_0C78_48b9_A44A_1D010626BE9B" start="EAID_17662AEF_1321_446a_AE42_0583F7417A79" end="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
+					<Association xmi:id="EAID_9FA89CC9_D9FD_4f2e_9237_C215D347E620" start="EAID_30DD6891_71FE_4f87_832B_477790550BBC" end="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
 					<Association xmi:id="EAID_BCCB407C_08A7_467b_8826_322D82AB6DB0" start="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" end="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
 					<Association xmi:id="EAID_C6F18DD0_9007_48f0_9959_5EE6A49DDD1B" start="EAID_D847D616_70DB_473a_A2A4_6665F938474C" end="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
 					<Association xmi:id="EAID_D6AB3946_257D_4382_A283_8978FB00BD51" start="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" end="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
@@ -24218,9 +25332,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" xmi:type="uml:Class" name="epo:ProcurementElement" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="7" ea_localid="2078" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="7" ea_localid="2078" ea_eleType="element"/>
 				<properties documentation="Gathering class for critical/central elements in the Procurement Process.&#xA;&#xA;TODO: add definition&#xA;Additional information:&#xA;Alias: ProcurementComponent" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-10-04 14:50:07" modified="2024-03-18 12:26:26" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-10-04 14:50:07" modified="2024-07-23 11:54:54" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -24268,9 +25382,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07" xmi:type="uml:Class" name="epo:Purpose" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="8" ea_localid="933" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="8" ea_localid="933" ea_eleType="element"/>
 				<properties documentation="The description of the objectives related to a Procurement. &#xA;&#xA;Additional information:&#xA;&#xA;The description of the objectives includes the Subject Matter and Quantities.&#xA;&#xA;&#xA;The quantification of the objectives related to a procurement.&#xA;&#xA;To be re-reviewed by the WG the soonest.&#xA;&#xA;(WG to be discussed, this was pointed out on the 09/04/2019 14:38:25 WG Meeting)&#xA;&#xA;The old definition read as follows:&#xA;&#xA;The description of the objectives related to a procurement.&#xA;&#xA;(WG approval 05/12/2018)&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2018-03-21 17:18:32" modified="2024-03-18 12:26:26" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2018-03-21 17:18:32" modified="2024-07-23 11:54:54" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -24285,9 +25399,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" xmi:type="uml:Class" name="epo:Certificate" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="9" ea_localid="1952" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="9" ea_localid="1952" ea_eleType="element"/>
 				<properties documentation="Proof of conformance of the instance of the concept to a defined set of criteria. &#xA;&#xA;Additional Information:&#xA;Certificates provide assurance of credibility, trust, and transparency in the procurement process. &#xA;&#xA;WG approval 16/05/2023&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-07-13 13:35:53" modified="2024-03-18 12:49:27" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-07-13 13:35:53" modified="2024-07-23 13:19:02" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -24321,9 +25435,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" xmi:type="uml:Class" name="epo:Tender" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="9" ea_localid="958" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="9" ea_localid="958" ea_eleType="element"/>
 				<properties documentation="Information submitted by the Economic Operator to specify its Offer regarding a specific Lot, in response to the call for Tender.&#xA;&#xA;(WG approval 03/05/2022)&#xA;&#xA;&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2019-05-29 11:20:26" modified="2024-03-18 12:54:16" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2019-05-29 11:20:26" modified="2024-07-23 13:20:35" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -24373,15 +25487,16 @@
 					<Association xmi:id="EAID_D7964CE9_B09A_4855_B489_34E46CFF8E24" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
 					<Association xmi:id="EAID_E026EBD4_4329_4e57_9F78_AF7887C44E46" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53"/>
 					<Association xmi:id="EAID_E453F729_4B4E_44c9_AD20_DD8131AF4BEF" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370"/>
+					<Association xmi:id="EAID_ED09AA70_1480_4e41_8F94_BA9A89E0B960" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7"/>
 					<Association xmi:id="EAID_00497249_92E0_435e_9C45_B9A2F9CBFE43" start="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B" end="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
 					<Association xmi:id="EAID_688D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5" start="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" end="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
 					<Association xmi:id="EAID_EEE75552_13BB_48c2_A5D7_18A876BF10CF" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" xmi:type="uml:Class" name="epo:TenderGroup" scope="public">
-				<model package="EAPK_9F33B88E_AF7E_4b3c_8F43_BC60E53D640E" tpos="10" ea_localid="1685" ea_eleType="element"/>
+				<model package="EAPK_B583795A_4207_48be_8D99_A257C58911C6" tpos="10" ea_localid="1685" ea_eleType="element"/>
 				<properties documentation="Specific Offer in response to a Lot Group.&#xA;&#xA;Additional Information:&#xA;This class is generally used to provide the Monetary Value in response to a Lot Group.&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-03-29 16:18:37" modified="2024-03-18 12:26:26" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-03-29 16:18:37" modified="2024-07-23 11:54:54" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -24426,485 +25541,8 @@
 					<Association xmi:id="EAID_D6AB3946_257D_4382_A283_8978FB00BD51" start="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" end="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
 				</links>
 			</element>
-			<element xmi:idref="EAPK_715C5E37_AD21_40eb_91D0_A082D4C6829E" xmi:type="uml:Package" name="empirical types" scope="public">
-				<model package2="EAID_715C5E37_AD21_40eb_91D0_A082D4C6829E" package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="15" ea_localid="141" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-04-01 16:49:14" modified="2022-05-13 11:10:08" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
-				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
-				<tags/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology"/>
-				<packageproperties version="1.0" tpos="15"/>
-				<paths/>
-				<times created="2022-04-01 16:49:14" modified="2022-05-13 11:10:08"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
-			</element>
-			<element xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" xmi:type="uml:Class" name="adms:Identifier" scope="public">
-				<model package="EAPK_715C5E37_AD21_40eb_91D0_A082D4C6829E" tpos="0" ea_localid="1020" ea_eleType="element"/>
-				<properties documentation="A character string to identify and distinguish uniquely, one instance of an object in an identification scheme from all other objects in the same scheme together with relevant supplementary information." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="mfontsan" version="1.0" phase="1.0" created="2018-10-22 10:56:42" modified="2023-04-24 01:14:57" complexity="1" status="Proposed"/>
-				<code product_name="Java" gentype="Java"/>
-				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
-				<tags/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="empirical types"/>
-				<attributes>
-					<attribute xmi:idref="EAID_DD21A105_2536_4ae0_A606_3868B9A27714" name="skos:notation" scope="Public">
-						<initial/>
-						<documentation value="The literal identifying an entity, like a person or an object."/>
-						<model ea_localid="1907" ea_guid="{DD21A105-2536-4ae0-A606-3868B9A27714}"/>
-						<properties type="rdf:PlainLiteral" derived="0" precision="0" collection="false" length="0" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="0"/>
-						<stereotype/>
-						<bounds lower="1" upper="1"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_EC13F7E5_C9A2_45ce_A2E4_3AFC67778C5B" name="adms:schemaAgency" scope="Public">
-						<initial/>
-						<documentation value="The name of the agency that issued the identifier."/>
-						<model ea_localid="1909" ea_guid="{EC13F7E5-C9A2-45ce-A2E4-3AFC67778C5B}"/>
-						<properties type="rdf:PlainLiteral" derived="0" precision="0" collection="false" length="0" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="2"/>
-						<stereotype/>
-						<bounds lower="0" upper="*"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_291D3917_532F_4950_B4BF_22835EC1F3E6" name="epo:hasScheme" scope="Public">
-						<initial/>
-						<documentation value="The name of the identification scheme."/>
-						<model ea_localid="1912" ea_guid="{291D3917-532F-4950-B4BF-22835EC1F3E6}"/>
-						<properties type="rdf:PlainLiteral" derived="0" precision="0" collection="false" length="0" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="5"/>
-						<stereotype/>
-						<bounds lower="0" upper="*"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_34EA5DFD_574A_4a69_9F19_59FCED4CCEFC" name="epo:hasSchemeVersion" scope="Public">
-						<initial/>
-						<documentation value="The version of the identification scheme."/>
-						<model ea_localid="1914" ea_guid="{34EA5DFD-574A-4a69-9F19-59FCED4CCEFC}"/>
-						<properties type="rdf:PlainLiteral" derived="0" precision="0" collection="false" length="0" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="7"/>
-						<stereotype/>
-						<bounds lower="0" upper="*"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-				</attributes>
-				<links>
-					<Association xmi:id="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_0BDB5E69_CB31_4e1e_B095_115C894CFE58" start="EAID_A8D775E4_EEB9_4502_B8A1_C1DD5D555864" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_11702782_CA5B_4035_84B7_1E5035469B29" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_12549564_CE07_4367_8550_00BC16191558" start="EAID_025C0172_297F_4458_9268_2B10478B6736" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_15464872_BFB6_40bb_84F1_8A3969FE662E" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_1BEBAC59_19C6_4908_B93C_EED975A6974F" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_20A26F01_4C0B_48e1_A688_6DFFDE0D20A5" start="EAID_905EBE80_E994_48ec_B0A6_4F3CEC5EEDC0" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_23CC2B92_731F_4428_B333_8582A36D1244" start="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_319F106B_6066_4ba7_B084_12D7110FE9E0" start="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_31D80540_9E04_44d6_B0B4_339ED74111CC" start="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_3AA2C83C_532C_460c_99CE_63F041A42F06" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_4A4FE890_B03B_430a_A719_E1852BEECBEE" start="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_51A6863A_1079_4af7_AE53_091E3E0514AF" start="EAID_C215EC75_82FD_45d3_832A_B3989A897692" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_527F57B4_08F1_4183_A0A9_C1CCAB84A53A" start="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_55771AD3_C775_4324_AEBA_EA277D05F7E8" start="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_5A707B7A_A266_46a0_9CA9_EBF5B2C9D483" start="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_605B2EA3_201D_47cb_BCF7_9C5A5DD40C4B" start="EAID_3E3C6304_E823_43a1_8914_2046342E8F96" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_608CC8C6_3A48_4541_8467_9DDA71E8D534" start="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_63091EE9_B21F_4dae_99AF_66217D43BDA9" start="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_67F11C76_D909_4610_841A_BB8035525574" start="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_6F3635F3_387D_467a_95E2_ACDA293AE181" start="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_774EE008_B895_41f1_B319_1174DD83D564" start="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_77553B39_DB4D_4388_9D1B_8C8E24EB522C" start="EAID_9E80131F_7D1C_452d_98B2_308983569ECB" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_7DD90B0C_4D89_4d64_AC1D_F32A308572D4" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_7F56C70D_D0B9_4ad4_9CB4_9A6821D5E3E1" start="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_84490705_94B3_445f_ACA6_A903591C3651" start="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_95FB9493_C207_456a_A0EF_B68899832EE8" start="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_96C5B633_908F_48e5_82F6_C10FBDBF1DE3" start="EAID_3C8EEF69_1346_4dbe_B505_7C2D920B97B9" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_9843F34E_C9D3_471a_9622_B002A7A25EA7" start="EAID_8374872A_B283_4698_9E00_72FD255BAFCB" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_9F290187_06CC_4af8_83C9_F475091E0C14" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_A489FF3B_9E63_4b65_9418_542A437B67E4" start="EAID_9E80131F_7D1C_452d_98B2_308983569ECB" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_AA0E8762_9556_4ad9_8F4A_5A66B59C8A95" start="EAID_3124967E_D23F_4c3b_9B72_E02C23A08D68" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_ACCA405B_7FF7_41ad_9ACB_A1015C643C97" start="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_BBC722BA_3236_4fcb_B51A_14A66F3D627C" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_C6F7D14A_11BF_430e_ABED_4C9AC22FFF2A" start="EAID_29678A10_6473_461a_BE84_76269B5BBD68" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_C7C433B7_9297_4921_9069_80DF68AD408A" start="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_CEDC5261_E7FF_4ca6_8255_6B2812DC1B0C" start="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044" start="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_D42B1380_78A6_4579_B0FD_C3609EBD8AFD" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_D56DDC19_B837_4e3f_B996_A8D529DA32A2" start="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_D9C75333_AC70_477b_AA0D_15C3CB11CC0C" start="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_DA6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D" start="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_E507D198_1A41_4b43_873A_F9E88411186D" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_EC04B8A5_6281_4f14_8017_204CCE05A2CC" start="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_ECEFDC69_19B4_47d7_A201_D8391B5C67DF" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_ED25B2CF_BC4D_44e9_957C_60FF1C08941F" start="EAID_495BBB92_468A_4f08_9330_A0C75730B97A" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_F0951C5B_94E2_4a5f_BF21_25D103CB3656" start="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_F3CD32F8_8180_4939_A987_53BA66264912" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" xmi:type="uml:Class" name="epo:Duration" scope="public">
-				<model package="EAPK_715C5E37_AD21_40eb_91D0_A082D4C6829E" tpos="0" ea_localid="1698" ea_eleType="element"/>
-				<properties documentation="The length of time in which a concept occurs." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-04-01 17:00:17" modified="2022-05-27 07:44:00" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
-				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
-				<tags/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="empirical types"/>
-				<links>
-					<Generalization xmi:id="EAID_9501DE7B_F539_4409_8D54_7B950268D75C" start="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" end="EAID_F8F2DEF8_6045_44d5_93B9_E57CE8023BE9"/>
-					<Association xmi:id="EAID_1EA9C84A_C46F_456b_A355_DA9CD314CBA0" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
-					<Association xmi:id="EAID_45B983F5_7502_49f2_984C_17FF6E47F8F9" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
-					<Association xmi:id="EAID_A01E8ADE_1698_4353_BEDB_63334B745ECB" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
-					<Association xmi:id="EAID_C741BADB_0CAC_40d5_A730_696A39D2224E" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
-					<Association xmi:id="EAID_EB2AC560_378D_4c18_9647_0E2E150D7463" start="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
-					<Association xmi:id="EAID_EFDCE7F5_7EC7_4537_B26B_232F5FB37A9C" start="EAID_3F572668_3AED_4090_BAB3_9047B4874154" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
-					<Generalization xmi:id="EAID_F8285143_A232_43ae_AFC8_89D40A9529FD" start="EAID_7D0E71D7_D624_4144_8134_2500CE9AB392" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
-					<Generalization xmi:id="EAID_FE0B0FB5_E0B6_41e2_AA82_ECF06C845021" start="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_7D0E71D7_D624_4144_8134_2500CE9AB392" xmi:type="uml:Class" name="epo:IndefiniteDuration" scope="public">
-				<model package="EAPK_715C5E37_AD21_40eb_91D0_A082D4C6829E" tpos="0" ea_localid="2060" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-08-26 11:34:16" modified="2022-08-26 11:34:25" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
-				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
-				<tags/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="empirical types"/>
-				<links>
-					<Generalization xmi:id="EAID_F8285143_A232_43ae_AFC8_89D40A9529FD" start="EAID_7D0E71D7_D624_4144_8134_2500CE9AB392" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" xmi:type="uml:Class" name="epo:MonetaryValue" scope="public">
-				<model package="EAPK_715C5E37_AD21_40eb_91D0_A082D4C6829E" tpos="0" ea_localid="960" ea_eleType="element"/>
-				<properties documentation="A number of monetary units specified using a given unit of currency.&#xA;&#xA;Additional information:&#xA;In the pre-award phase of the procurement, all monetary values are considered to exclude VAT based on the Directive 2014/24/EU.&#xA;&#xA;WG approval 13/04/2021&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="estaromi" version="1.0" phase="1.0" created="2019-05-24 15:35:35" modified="2023-06-05 12:43:59" complexity="1" status="Proposed"/>
-				<code product_name="Java" gentype="Java"/>
-				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
-				<tags/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="empirical types"/>
-				<attributes>
-					<attribute xmi:idref="EAID_2C82F10F_E6DC_49ee_8B5D_E915D4361E9C" name="epo:hasAmountValue" scope="Public">
-						<initial/>
-						<documentation value="The numeric value of the amount, including decimals."/>
-						<model ea_localid="1906" ea_guid="{2C82F10F-E6DC-49ee-8B5D-E915D4361E9C}"/>
-						<properties type="xsd:decimal" derived="0" precision="0" collection="false" length="0" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="2"/>
-						<stereotype/>
-						<bounds lower="1" upper="1"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_B53ED566_A1AF_4a19_A650_4A057D5FB465" name="epo:hasCurrencyCodeListAgencyID" scope="Public">
-						<initial/>
-						<documentation value="Identifier of the agency that maintains the currency code list used.&#xA;WG approval 13/04/2021"/>
-						<model ea_localid="1929" ea_guid="{B53ED566-A1AF-4a19-A650-4A057D5FB465}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="2"/>
-						<stereotype/>
-						<bounds lower="0" upper="*"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_9BDDFF77_87A2_428c_A675_CD62FC2FF951" name="epo:hasCurrencyCodeListAgencyName" scope="Public">
-						<initial/>
-						<documentation value="Name of the agency that maintains the currency code list used.&#xA;WG approval 13/04/2021"/>
-						<model ea_localid="1930" ea_guid="{9BDDFF77-87A2-428c-A675-CD62FC2FF951}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="3"/>
-						<stereotype/>
-						<bounds lower="0" upper="*"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_81C9CD14_9DC4_4cbd_8A9D_15BCC4606424" name="epo:hasCurrencyCodeListID" scope="Public">
-						<initial/>
-						<documentation value="Concept scheme URI used for the currency code list.&#xA;WG approval 13/04/2021"/>
-						<model ea_localid="1931" ea_guid="{81C9CD14-9DC4-4cbd-8A9D-15BCC4606424}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="4"/>
-						<stereotype/>
-						<bounds lower="0" upper="*"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-				</attributes>
-				<links>
-					<Dependency xmi:id="EAID_E9E2A1B8_A705_4847_8FE6_3B40BD241A4B" start="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" end="EAID_FBD046CD_CD18_4d96_99E0_63CAC8A5D594"/>
-					<Association xmi:id="EAID_01B7EE24_F987_4c92_B06C_0EA23C9FD1C7" start="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_079E96B7_4324_4eba_B071_A8B833BDA1EF" start="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_1E87247C_598C_4f96_8D8A_71BD69D25161" start="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_202AF5A1_B4FE_48a4_91D4_F6387465413F" start="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_2729D2D0_C843_497f_B19D_1727246FC1BD" start="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_29D3C49F_AF44_49ad_8519_B199CADD080B" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_2C64F9E7_B02B_4433_AB2C_0A6E23A8559E" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_2E9FE66A_E025_4563_9A59_461990838D96" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_3127E296_9886_44bc_86E7_B4E433F87208" start="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_3220FB6D_76C7_486a_9953_EA1E6D255A89" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_3284019D_3E6C_424a_AACD_8319D1389BB9" start="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_470D1B16_C07B_4868_91B2_799578663395" start="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_5009F883_10B2_4e9c_96A3_A1F92BE8EA63" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_510F8DDB_DB12_48df_92AE_A27F7DFCCAC3" start="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_516CC611_B255_4c67_AAF8_2E19960E553F" start="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_547A511C_F377_4405_82EA_14ABA20458B6" start="EAID_E7437025_771F_4143_BE33_620A29646687" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_55AE269D_7874_4515_A52E_6EBA9F23871A" start="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_569C582B_2F50_4a11_B7B6_50CA2F0A9B94" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_653ADA02_9DFC_48b4_A935_786F35AF2AFB" start="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_6D0F07D8_06B8_43e0_AB80_8F686D5C488E" start="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_72A6C38F_77C6_4480_A13E_A5E9A66D9379" start="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_72A7614C_D179_4558_8F62_2FA41A99DF74" start="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_77A962A1_6ADC_4a69_9C87_1543CFCC17D9" start="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_7A92C123_93F7_4d51_A677_A1E36D3B53C0" start="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_7AAF3614_44A0_4944_8E1A_EF574D760E6F" start="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_87123434_C2AD_43de_925D_13E9A7667A18" start="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_8DBBB829_4470_4b0d_A142_494C41C8807D" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_8E7619CE_95A4_4f77_A6DC_62DFC84C122D" start="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_91D18452_424C_4f36_8E1E_BF993F4D765A" start="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_949017B7_0159_4fe1_8469_562A93DEF12E" start="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_98D513D4_9622_4217_94D7_26E6E451AF0C" start="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_9BF032E2_6893_45df_95FE_A08E92EA8618" start="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_A110770D_19E8_400c_A438_44EEAB172389" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_A13D1892_1403_4dcc_B7C6_33C21269E183" start="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_AB852C7E_4390_46da_9255_1C4C8BE7B02F" start="EAID_C215EC75_82FD_45d3_832A_B3989A897692" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_AE377F2A_EF0B_4bd7_8D4A_95B9DD217458" start="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC" start="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_C35EEDCE_0633_482d_BA4A_4553057B7C23" start="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_C3F576CC_0DFC_40d6_86C4_6F47177DB0C6" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_C753CDC6_88B6_449b_B44C_0F56A31472A7" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_C8D53635_0827_4589_A374_A1CFC018D076" start="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_CBE972DE_D8B8_42a5_A6A1_F386873985BC" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_D257E7B8_BA32_4888_BB1A_167306D6B16C" start="EAID_E7437025_771F_4143_BE33_620A29646687" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_D7964CE9_B09A_4855_B489_34E46CFF8E24" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_EBC0DED2_0415_4ef8_A495_71F8920238AD" start="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_F78CF3B1_3FB3_43b9_B9AB_1FE660C3663F" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" xmi:type="uml:Class" name="epo:Period" scope="public">
-				<model package="EAPK_715C5E37_AD21_40eb_91D0_A082D4C6829E" tpos="0" ea_localid="915" ea_eleType="element"/>
-				<properties documentation="A time interval or a Duration.&#xA;&#xA;WG approval 28/04/2020&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="lbotapor" version="1.0" phase="1.0" created="2018-03-21 21:32:49" modified="2024-03-12 16:04:37" complexity="1" status="Proposed"/>
-				<code product_name="Java" gentype="Java"/>
-				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
-				<tags/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="empirical types"/>
-				<attributes>
-					<attribute xmi:idref="EAID_C6A0334F_7F34_4839_ADEB_482CEC470A98" name="epo:hasBeginning" scope="Public">
-						<initial/>
-						<documentation value="The date and time on which this period begins."/>
-						<model ea_localid="1696" ea_guid="{C6A0334F-7F34-4839-ADEB-482CEC470A98}"/>
-						<properties type="xsd:dateTime" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="0"/>
-						<stereotype/>
-						<bounds lower="0" upper="1"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_D3F00005_AF7C_45ab_927B_B38B2CEBC0D5" name="epo:hasEnd" scope="Public">
-						<initial/>
-						<documentation value="The date and time at which this period ends."/>
-						<model ea_localid="1700" ea_guid="{D3F00005-AF7C-45ab-927B-B38B2CEBC0D5}"/>
-						<properties type="xsd:dateTime" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="4"/>
-						<stereotype/>
-						<bounds lower="0" upper="1"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-				</attributes>
-				<links>
-					<Dependency xmi:id="EAID_007A256B_E0B5_4a62_B8D7_2BC14F331BE5" start="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" end="EAID_5A01D361_6509_447f_B318_F20F23FBF81F"/>
-					<Association xmi:id="EAID_11C78626_167C_4c06_AF8A_1D37420731A9" start="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-					<Association xmi:id="EAID_1864913C_FE85_48db_829F_004DFE769A97" start="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-					<Association xmi:id="EAID_33FC7129_7479_45ab_AECD_F356DB6C1872" start="EAID_A8D775E4_EEB9_4502_B8A1_C1DD5D555864" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-					<Association xmi:id="EAID_6D569FED_815F_45f4_87EA_C0E83DC5C9AF" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-					<Association xmi:id="EAID_89C3F218_90EF_42ed_B918_7EEB88718C50" start="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-					<Association xmi:id="EAID_8FF88923_D9FB_4937_B866_FABECBC1DB55" start="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-					<Association xmi:id="EAID_9EDDC1AB_FC05_462d_A479_433862DD01D8" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-					<Association xmi:id="EAID_B2FBB3C3_8542_4cd9_8B7E_A25D4A6C9048" start="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-					<Association xmi:id="EAID_D07B06AA_2E5B_4fa1_B0EA_CB49790C2AAD" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-					<Association xmi:id="EAID_D77EAC2F_A434_424a_8ECC_D32EF06886BB" start="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-					<Association xmi:id="EAID_DCA21CBC_3D4F_480a_B24B_49A69CC51624" start="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-					<Association xmi:id="EAID_DE5098A6_B134_4261_8994_841365A27FAB" start="EAID_3780AA50_D898_4068_B300_47B46651CA0A" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-					<Association xmi:id="EAID_ED4865EB_995F_486e_A7A9_407855E7F1B8" start="EAID_6966846F_842F_4149_A95B_AE374D603608" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-					<Association xmi:id="EAID_FAA22183_A73E_42a1_854B_9995087470E4" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" xmi:type="uml:Class" name="epo:Quantity" scope="public">
-				<model package="EAPK_715C5E37_AD21_40eb_91D0_A082D4C6829E" tpos="0" ea_localid="1022" ea_eleType="element"/>
-				<properties documentation="A counted number of non-monetary units possibly including fractions.&#xA;" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="mfontsan" version="1.0" phase="1.0" created="2018-10-22 10:56:42" modified="2022-04-01 16:49:48" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
-				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
-				<tags/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="empirical types"/>
-				<attributes>
-					<attribute xmi:idref="EAID_439A021A_4789_4775_8650_9C585138E43E" name="epo:hasQuantityValue" scope="Public">
-						<initial/>
-						<documentation value="The numeric value of the quantity, including decimals."/>
-						<model ea_localid="1917" ea_guid="{439A021A-4789-4775-8650-9C585138E43E}"/>
-						<properties type="xsd:decimal" derived="0" precision="0" collection="false" length="0" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="0"/>
-						<stereotype/>
-						<bounds lower="1" upper="1"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_27144131_8BB5_4491_A8AD_C3C93FA46553" name="epo:hasUnitDescription" scope="Public">
-						<initial/>
-						<documentation value="A narrative explanation defining the units of items being counted&#xA;&#xA;Additional information: This could be for example individual items or pack or two.&#xA;&#xA;WG Approval 09/11/2021"/>
-						<model ea_localid="1922" ea_guid="{27144131-8BB5-4491-A8AD-C3C93FA46553}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="5"/>
-						<stereotype/>
-						<bounds lower="0" upper="*"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-				</attributes>
-				<links>
-					<Dependency xmi:id="EAID_30CBA4D5_2CA0_4043_A8BC_8FBCF102380D" start="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" end="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3"/>
-					<Association xmi:id="EAID_0167DB54_9519_42f6_BD3B_F46B589F376C" start="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_05490F76_8D40_4d74_97D4_F3871039E80A" start="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_0AC5D04E_7364_4118_9D94_CE93A68B3CF9" start="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_0F1AB34D_EA8C_44fb_B232_AA4B138F066B" start="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_11D3CF7A_4949_410c_A7E5_91AB91646B43" start="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_1F622DE3_2DEE_491f_A5F1_B592E89F9030" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_2ECAEC7F_2186_4280_A2C0_6DC585D1EE96" start="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_3D54F6F9_658D_40fe_9D16_D79F46DB945C" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_45480564_D6B2_41da_8694_DC63D52825C1" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_4BA4CF11_20FC_48b0_A739_471F732B8482" start="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_55AE0CEF_3CD9_464a_82E7_387507253B10" start="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_5C5BD66A_585D_4646_9A7B_894EA99DED44" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_65E8EC44_CB4C_4aa9_8218_75D01ED44538" start="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_75378C4F_ABAD_440f_8E1B_502A7CDA0486" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_76005691_B905_4be3_99BF_394E56A591CE" start="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_770594A4_09FD_4b6e_8D27_8D44BA5CA36A" start="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_838E60F9_C54C_4c80_88A3_D705701F1971" start="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_87C6E00F_DAEB_4e79_8340_AC2FC83206DA" start="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_87DEA454_B158_4e44_91D6_F1D258049A37" start="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_8C56C81B_B46D_49ef_B3BF_333FDA416F39" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_95D24239_8F4D_44c8_97D1_1C26296607DA" start="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_9EA3B8C3_695C_4b42_8481_D40EEC904171" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_A0FABF7A_1814_4dd4_BD97_28BD0C9F2F49" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_B1577190_0947_4041_ACDC_BC0C377734AF" start="EAID_BB1AAA4C_E66B_4fde_A0B6_1A30FC13503B" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_B4F0448C_1741_4b38_9973_F506CB883BA2" start="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_B9C9C412_36FA_46d5_AA00_34CA1CC60CA2" start="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_C5E4577A_5BDB_4176_9418_BB9B2E957222" start="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_E93A74BB_614F_4b1c_AE59_F45CD626BB7A" start="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_F475E438_48A3_41f5_A736_268C91FF8AF2" start="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_F70CA1D5_5E5E_4028_8583_6B810BB672CD" start="EAID_BB1AAA4C_E66B_4fde_A0B6_1A30FC13503B" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_F93A2AAD_C014_4fa4_88EE_23DE2339DB3C" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_F9F5CFA7_D31A_4c48_80EF_346FB3152195" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Association xmi:id="EAID_FA2388C8_1471_4d6b_9B9F_2E0BBE858668" start="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C" xmi:type="uml:Class" name="epo:SpecificDuration" scope="public">
-				<model package="EAPK_715C5E37_AD21_40eb_91D0_A082D4C6829E" tpos="0" ea_localid="2059" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-08-26 11:34:06" modified="2022-08-26 11:34:13" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
-				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
-				<tags/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="empirical types"/>
-				<attributes>
-					<attribute xmi:idref="EAID_443A0D12_FC67_4252_86EC_D1E5C696FA85" name="time:numericDuration" scope="Public">
-						<initial/>
-						<documentation value="Value of a temporal extent expressed as a number."/>
-						<model ea_localid="2026" ea_guid="{443A0D12-FC67-4252-86EC-D1E5C696FA85}"/>
-						<properties type="xsd:decimal" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="0"/>
-						<stereotype/>
-						<bounds lower="1" upper="1"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-				</attributes>
-				<links>
-					<Dependency xmi:id="EAID_90566F74_64BC_49c8_8076_1ECB982268EE" start="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C" end="EAID_EDCD6F3A_F86A_46ca_ACD1_13C3E1A4B7F9"/>
-					<Generalization xmi:id="EAID_FE0B0FB5_E0B6_41e2_AA82_ECF06C845021" start="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_F8F2DEF8_6045_44d5_93B9_E57CE8023BE9" xmi:type="uml:Class" name="time:Duration" scope="public">
-				<model package="EAPK_715C5E37_AD21_40eb_91D0_A082D4C6829E" tpos="0" ea_localid="3252" ea_eleType="element"/>
-				<properties documentation="Duration of a temporal extent expressed as a number scaled by a temporal unit." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-10-27 16:13:49" modified="2023-10-27 16:14:40" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
-				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
-				<tags/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="empirical types"/>
-				<links>
-					<Generalization xmi:id="EAID_9501DE7B_F539_4409_8D54_7B950268D75C" start="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" end="EAID_F8F2DEF8_6045_44d5_93B9_E57CE8023BE9"/>
-				</links>
-			</element>
 			<element xmi:idref="EAPK_CE5E556D_E033_494e_BC8F_925DAAC7560E" xmi:type="uml:Package" name="controlled vocabularies" scope="public">
-				<model package2="EAID_CE5E556D_E033_494e_BC8F_925DAAC7560E" package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="16" ea_localid="113" ea_eleType="package"/>
+				<model package2="EAID_CE5E556D_E033_494e_BC8F_925DAAC7560E" package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="3" ea_localid="113" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
 				<project author="lps" version="1.0" phase="1.0" created="2022-01-18 11:46:56" modified="2022-01-18 11:46:56" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
@@ -24912,7 +25550,7 @@
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="eProcurementOntology"/>
-				<packageproperties version="1.0" tpos="16"/>
+				<packageproperties version="1.0" tpos="3"/>
 				<paths/>
 				<times created="2022-01-18 11:46:56" modified="2022-01-18 11:46:56"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
@@ -24999,8 +25637,8 @@
 			</element>
 			<element xmi:idref="EAID_1FF5173E_4940_44db_A1A0_C190337F6440" xmi:type="uml:Enumeration" name="at-voc:communication-justification" scope="public">
 				<model package="EAPK_CE5E556D_E033_494e_BC8F_925DAAC7560E" tpos="0" ea_localid="967" ea_eleType="element"/>
-				<properties documentation="This table provides the justification for restricting access rights to resources within the context of Public Procurement" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="jseguraf" version="1.0" phase="1.0" created="2019-03-05 14:57:14" modified="2023-03-22 12:27:42" complexity="1" status="Proposed"/>
+				<properties documentation="This table provides the justification for restricting access rights to resources within the context of Public Procurement." isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="jseguraf" version="1.0" phase="1.0" created="2019-03-05 14:57:14" modified="2024-06-14 14:18:14" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -25247,6 +25885,7 @@
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="controlled vocabularies"/>
 				<links>
+					<Dependency xmi:id="EAID_08E68AE5_54CB_40f5_8E56_373B9F10194E" start="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11" end="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90"/>
 					<Dependency xmi:id="EAID_6A9FC4EC_D843_4ffe_84A8_24E86C3ED8AF" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90"/>
 					<Dependency xmi:id="EAID_AE14EF0F_919C_4aec_8978_C24718C1AAA2" start="EAID_8374872A_B283_4698_9E00_72FD255BAFCB" end="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90"/>
 					<Dependency xmi:id="EAID_AF2EA1D0_30FA_474c_BA0E_2B284F62AB15" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90"/>
@@ -25265,9 +25904,11 @@
 				<links>
 					<Realisation xmi:id="EAID_062347E1_F78F_43d5_ADE7_07C48E1E600D" start="EAID_89668AB6_A244_441e_B851_9289BD4E15F3" end="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66"/>
 					<Dependency xmi:id="EAID_2FC633C9_64DB_4b46_9190_197D4A4F4C63" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66"/>
+					<Realisation xmi:id="EAID_3452502E_9900_4175_9794_D484025607E7" start="EAID_C0E81714_CC78_4bd5_B8F5_31F967E74257" end="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66"/>
 					<Dependency xmi:id="EAID_3561E9C9_899A_4ca7_9CF4_9285C5C0CCEC" start="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" end="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66"/>
 					<Realisation xmi:id="EAID_3AC3215E_68C1_470f_880A_9FAE9B53D8B9" start="EAID_F89732E3_0046_41b6_B90C_EF55511242C8" end="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66"/>
 					<Dependency xmi:id="EAID_3BC5D7DE_3CD8_46c6_9B27_A7A4C7B70604" start="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" end="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66"/>
+					<Realisation xmi:id="EAID_4F2CCAB3_E0D4_434a_869E_D874CC918E17" start="EAID_64AA7AC6_F248_4162_BC6F_4434B8DC0F67" end="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66"/>
 					<Realisation xmi:id="EAID_8E647BBA_AE2A_4ca3_9144_41548E3A43AB" start="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" end="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66"/>
 					<Realisation xmi:id="EAID_D3C680D4_3CB0_40f5_9D98_ED0E9C28B950" start="EAID_6C334A58_89F2_4d3e_98F6_902667A49E71" end="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66"/>
 					<Realisation xmi:id="EAID_E2227EB0_964E_4ca5_99FE_413E8655E126" start="EAID_D6079364_9DE2_45de_9BAC_BE9D74F34B72" end="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66"/>
@@ -25732,145 +26373,2244 @@
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="datatype"/>
-			</element>
-			<element xmi:idref="EAID_BC8C5B04_CF84_427e_886D_61CE716EB9F4" xmi:type="uml:DataType" name="xsd:date" scope="public">
-				<model package="EAPK_352BAC9B_7F50_4450_B942_C2EA10533C7F" tpos="0" ea_localid="1824" ea_eleType="element"/>
-				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:25:19" modified="2022-04-29 20:25:22" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
-				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+			<element xmi:idref="EAID_BC8C5B04_CF84_427e_886D_61CE716EB9F4" xmi:type="uml:DataType" name="xsd:date" scope="public">
+				<model package="EAPK_352BAC9B_7F50_4450_B942_C2EA10533C7F" tpos="0" ea_localid="1824" ea_eleType="element"/>
+				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:25:19" modified="2022-04-29 20:25:22" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+			<element xmi:idref="EAID_841CF99B_9E5E_413e_8D07_F9B65E072116" xmi:type="uml:DataType" name="xsd:dateTime" scope="public">
+				<model package="EAPK_352BAC9B_7F50_4450_B942_C2EA10533C7F" tpos="0" ea_localid="1825" ea_eleType="element"/>
+				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:25:26" modified="2022-04-29 20:25:30" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+			<element xmi:idref="EAID_57156083_C85E_409d_9C6D_C045D1243765" xmi:type="uml:DataType" name="xsd:decimal" scope="public">
+				<model package="EAPK_352BAC9B_7F50_4450_B942_C2EA10533C7F" tpos="0" ea_localid="1827" ea_eleType="element"/>
+				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:25:42" modified="2022-04-29 20:25:57" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+			<element xmi:idref="EAID_44875764_5D12_4111_BD8B_ACB95D3A83DC" xmi:type="uml:DataType" name="xsd:integer" scope="public">
+				<model package="EAPK_352BAC9B_7F50_4450_B942_C2EA10533C7F" tpos="0" ea_localid="1826" ea_eleType="element"/>
+				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:25:33" modified="2022-04-29 20:25:38" complexity="1" status="Proposed"/>
+				<code gentype="Java"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+		</elements>
+		<connectors>
+			<connector xmi:idref="EAID_EF2C4645_6C41_4c39_9F95_185806E2B6E1">
+				<source xmi:idref="EAID_9776729F_9284_46c1_AB77_BA5692ADE213">
+					<model ea_localid="2083" type="ProxyConnector" name="ProxyConnector"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_1B056616_B822_4add_84D3_1D36186827ED">
+					<model ea_localid="2084" type="ProxyConnector" name="ProxyConnector"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3346"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_9512B0DA_565A_4051_A589_525053877046">
+				<source xmi:idref="EAID_75629D1B_E406_4b38_82BA_5525819A470C">
+					<model ea_localid="2085" type="ProxyConnector" name="ProxyConnector"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_F0EE8667_674A_4286_AEE4_319B6DD14F24">
+					<model ea_localid="2086" type="ProxyConnector" name="ProxyConnector"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3347"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_3C3D734E_D8F1_460f_934C_F1F1D556AA5A">
+				<source xmi:idref="EAID_98639C30_5207_4cc7_B47E_50C11AD87033">
+					<model ea_localid="3061" type="Note"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC">
+					<model ea_localid="1811" type="Class" name="epo:ChangeInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4687"/>
+				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_5259FE9C_CECB_4b18_A4A4_D1B45AFE4BED">
+				<source xmi:idref="EAID_AFD1E4C5_9D57_4c0a_B916_E199FA70A0DC">
+					<model ea_localid="3570" type="Note"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_7D0E71D7_D624_4144_8134_2500CE9AB392">
+					<model ea_localid="2060" type="Class" name="epo:IndefiniteDuration"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5303"/>
+				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_016185BE_FF6A_41c6_A77B_474BD1F071E0">
+				<source xmi:idref="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D">
+					<model ea_localid="3601" type="Class" name="epo-inv:CreditTransferInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-inv:hasPaymentAccountIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5344"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="A unique identifier of the financial payment account, at a payment service provider, to which payment should be made.&#xA;&#xA;WG approval 11/07/2024&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo-inv:hasPaymentAccountIdentifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6">
+				<source xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+					<model ea_localid="913" type="Class" name="org:Organization"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo:hasLegalIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4117"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo:hasLegalIdentifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_0BDB5E69_CB31_4e1e_B095_115C894CFE58">
+				<source xmi:idref="EAID_A8D775E4_EEB9_4502_B8A1_C1DD5D555864">
+					<model ea_localid="3505" type="Class" name="cccev:EvidenceType"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5243"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Links a resource to an adms:Identifier class."/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+adms:identifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_11702782_CA5B_4035_84B7_1E5035469B29">
+				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
+					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3984"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Links a resource to an adms:Identifier class."/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+adms:identifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_12549564_CE07_4367_8550_00BC16191558">
+				<source xmi:idref="EAID_025C0172_297F_4458_9268_2B10478B6736">
+					<model ea_localid="3243" type="Class" name="epo-cat:CatalogueResponseLine"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo:hasUUID" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4907"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="A universally unique identifier for an instance of this document.&#xA;&#xA;WG Approval 12/05/2020&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo:hasUUID"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_15464872_BFB6_40bb_84F1_8A3969FE662E">
+				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
+					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo:hasItemStandardID" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3020"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The general identifier assigned to the concept based on a standard scheme.&#8203;&#xA;&#xA;Additional information: &#xA;For example the GTIN scheme (Global Trade Item Number).&#xA;&#xA;WG approval 16/05/2023"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo:hasItemStandardID"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_1BEBAC59_19C6_4908_B93C_EED975A6974F">
+				<source xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
+					<model ea_localid="878" type="Class" name="epo:Document"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo:hasUUID" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3013"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="A universally unique identifier for an instance of this document.&#xA;&#xA;WG Approval 12/05/2020"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:hasUUID"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_20A26F01_4C0B_48e1_A688_6DFFDE0D20A5">
+				<source xmi:idref="EAID_905EBE80_E994_48ec_B0A6_4F3CEC5EEDC0">
+					<model ea_localid="3253" type="Class" name="eli:LegalResourceSubdivision"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="eli:uri_schema" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4942"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Schema describing the URI of an ELI instance. ELI uses URI template specifications (IETF RFC 6570). Schemes should be associated with member states and will be published in a registry.&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+eli:uri_schema"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_23CC2B92_731F_4428_B333_8582A36D1244">
+				<source xmi:idref="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9">
+					<model ea_localid="3466" type="Class" name="epo-sub:NationalPreQualificationData"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-sub:providesOrganisationPreQualificationListingIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5181"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The identifier assigned to an economic operator in a national pre-qualification system or official list.&#xA;&#xA;WG approval 05/03/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-sub:providesOrganisationPreQualificationListi"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_27A758A5_D658_4005_919F_992C4207B974">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-inv:hasInvoicedObjectIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5349"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="An identifier for an object on which the invoice is based, given by the Seller."/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:hasInvoicedObjectIdentifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_319F106B_6066_4ba7_B084_12D7110FE9E0">
+				<source xmi:idref="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1">
+					<model ea_localid="852" type="Class" name="foaf:Agent"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3011"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Links a resource to an adms:Identifier class."/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+adms:identifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_31D80540_9E04_44d6_B0B4_339ED74111CC">
+				<source xmi:idref="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD">
+					<model ea_localid="1605" type="Class" name="epo-cat:Manufacturer"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo:hasManufacturerID" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3015"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The manufacturer's identifier for the item.&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:hasManufacturerID"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_36284C1D_C098_4082_BE39_99AFCAAF2C1F">
+				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
+					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-ful:hasDespatcherConsignmentID" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5393"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The identifier of the the Consignment given by the Despatcher.&#xA;&#xA;WG approval 10/06/2024&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-ful:hasDespatcherConsignmentID"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_3AA2C83C_532C_460c_99CE_63F041A42F06">
+				<source xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
+					<model ea_localid="878" type="Class" name="epo:Document"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3012"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Links a resource to an adms:Identifier class."/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+adms:identifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_4A4FE890_B03B_430a_A719_E1852BEECBEE">
+				<source xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7">
+					<model ea_localid="3072" type="Class" name="dct:Location"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4713"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Links a resource to an adms:Identifier class."/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+adms:identifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_4DC15699_2F72_40f6_B574_D054957B5730">
+				<source xmi:idref="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48">
+					<model ea_localid="3599" type="Class" name="epo-inv:PaymentInstructionsInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-inv:hasMandateIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5354"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="An unique identifier for referencing the direct debit mandate, assigned by the Payee.&#xA;&#xA;WG approval 11/07/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:hasMandateIdentifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_51A6863A_1079_4af7_AE53_091E3E0514AF">
+				<source xmi:idref="EAID_C215EC75_82FD_45d3_832A_B3989A897692">
+					<model ea_localid="2615" type="Class" name="epo-ful:GoodsItem"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-ful:hasTraceID" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4021"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The identifier used for tracking the Goods Item.&#xA;&#xA;Additional information:&#xA;An example is the EPC number used in RFID.&#xA;&#xA;WG approval 21/09/2023&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-ful:hasTraceID"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_527F57B4_08F1_4183_A0A9_C1CCAB84A53A">
+				<source xmi:idref="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC">
+					<model ea_localid="1896" type="Class" name="cccev:Requirement"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4797"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Links a resource to an adms:Identifier class."/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+adms:identifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_52CB7369_B0C2_4acc_A513_76150076F808">
+				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
+					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-inv:hasItemClassificationIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5423"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-inv:hasItemClassificationIdentifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_55771AD3_C775_4324_AEBA_EA277D05F7E8">
+				<source xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
+					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo:hasInternalIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4821"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo:hasInternalIdentifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_5A707B7A_A266_46a0_9CA9_EBF5B2C9D483">
+				<source xmi:idref="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA">
+					<model ea_localid="2570" type="Class" name="epo-ful:TransportEquipment"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4001"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+adms:identifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_605B2EA3_201D_47cb_BCF7_9C5A5DD40C4B">
+				<source xmi:idref="EAID_3E3C6304_E823_43a1_8914_2046342E8F96">
+					<model ea_localid="3085" type="Class" name="epo:NonPublishedInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo:relatesToEFormSectionIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4735"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1..*" rt="+epo:relatesToEFormSectionIdentifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_608CC8C6_3A48_4541_8467_9DDA71E8D534">
+				<source xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
+					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4688"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="A unique identifier of the instance of the concept.&#xA;&#xA;Additional Information&#xA;&#xA;For example, in the case of the Procurement Identifier, this could be the European Public Procurement Identifier, and/or any other identifier provided by the buyer, the service provider or any other stakeholder.&#xA;&#xA;WG Approval 12/11/2019"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+adms:identifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_63091EE9_B21F_4dae_99AF_66217D43BDA9">
+				<source xmi:idref="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6">
+					<model ea_localid="2573" type="Class" name="epo-ful:ShipmentStage"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4004"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+adms:identifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_67F11C76_D909_4610_841A_BB8035525574">
+				<source xmi:idref="EAID_93ACA540_2668_42d3_BE40_C921C05C776E">
+					<model ea_localid="1685" type="Class" name="epo:TenderGroup"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4822"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="A unique identifier of the instance of the concept.&#xA;&#xA;Additional Information&#xA;&#xA;For example, in the case of the Procurement Identifier, this could be the European Public Procurement Identifier, and/or any other identifier provided by the buyer, the service provider or any other stakeholder.&#xA;&#xA;WG Approval 12/11/2019&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+adms:identifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_6F3635F3_387D_467a_95E2_ACDA293AE181">
+				<source xmi:idref="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7">
+					<model ea_localid="2078" type="Class" name="epo:ProcurementElement"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo:hasInternalIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4663"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo:hasInternalIdentifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_774EE008_B895_41f1_B319_1174DD83D564">
+				<source xmi:idref="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7">
+					<model ea_localid="3086" type="Class" name="epo-con:ContractModificationInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo:relatesToEFormSectionIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4740"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:relatesToEFormSectionIdentifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_77553B39_DB4D_4388_9D1B_8C8E24EB522C">
+				<source xmi:idref="EAID_9E80131F_7D1C_452d_98B2_308983569ECB">
+					<model ea_localid="2575" type="Class" name="epo-ful:TransportMeans"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-ful:hasVehicleSegmentID" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4327"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The identifier of a part of the Transport Means.&#xA;&#xA;WG approval 25/06/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-ful:hasVehicleSegmentID"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_7DD90B0C_4D89_4d64_AC1D_F32A308572D4">
+				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
+					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-ful:hasFreightForwarderConsignmentID" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4034"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The identifier of the the Consignment given by the Freight Forwarder.&#xA;&#xA;WG approval 10/06/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-ful:hasFreightForwarderConsignmentID"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_7F56C70D_D0B9_4ad4_9CB4_9A6821D5E3E1">
+				<source xmi:idref="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9">
+					<model ea_localid="1966" type="Class" name="cccev:Evidence"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5244"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Links a resource to an adms:Identifier class."/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+adms:identifier"/>
+				<extendedProperties/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA">
+				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
+					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo:hasSellerItemID" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3019"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The general identifier assigned to the concept as defined by the Seller.&#8203;&#xA;&#xA;WG approval 16/05/2023&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:hasSellerItemID"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_84490705_94B3_445f_ACA6_A903591C3651">
+				<source xmi:idref="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC">
+					<model ea_localid="1811" type="Class" name="epo:ChangeInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo:relatesToEFormSectionIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4743"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1..*" rt="+epo:relatesToEFormSectionIdentifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_95FB9493_C207_456a_A0EF_B68899832EE8">
+				<source xmi:idref="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7">
+					<model ea_localid="2078" type="Class" name="epo:ProcurementElement"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3021"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="A unique identifier of the instance of the concept.&#xA;&#xA;Additional Information&#xA;&#xA;For example, in the case of the Procurement Identifier, this could be the European Public Procurement Identifier, and/or any other identifier provided by the buyer, the service provider or any other stakeholder.&#xA;&#xA;WG Approval 12/11/2019&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+adms:identifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_96C5B633_908F_48e5_82F6_C10FBDBF1DE3">
+				<source xmi:idref="EAID_3C8EEF69_1346_4dbe_B505_7C2D920B97B9">
+					<model ea_localid="2610" type="Class" name="epo-ful:TransportEquipmentSeal"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4000"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+adms:identifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_9843F34E_C9D3_471a_9622_B002A7A25EA7">
+				<source xmi:idref="EAID_8374872A_B283_4698_9E00_72FD255BAFCB">
+					<model ea_localid="3258" type="Class" name="eli:LegalExpression"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="eli:uri_schema" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4941"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Schema describing the URI of an ELI instance. ELI uses URI template specifications (IETF RFC 6570). Schemes should be associated with member states and will be published in a registry.&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+eli:uri_schema"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_9F290187_06CC_4af8_83C9_F475091E0C14">
+				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
+					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-ful:hasCarrierConsignmentID" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4250"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The identifier of the the Consignment given by the Carrier.&#xA;&#xA;WG approval 10/06/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-ful:hasCarrierConsignmentID"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_A489FF3B_9E63_4b65_9418_542A437B67E4">
+				<source xmi:idref="EAID_9E80131F_7D1C_452d_98B2_308983569ECB">
+					<model ea_localid="2575" type="Class" name="epo-ful:TransportMeans"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-ful:hasVehicleID" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4006"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The identifier of the Transport Means.&#xA;&#xA;WG approval 25/06/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo-ful:hasVehicleID"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_AA0E8762_9556_4ad9_8F4A_5A66B59C8A95">
+				<source xmi:idref="EAID_3124967E_D23F_4c3b_9B72_E02C23A08D68">
+					<model ea_localid="3506" type="Class" name="cccev:EvidenceTypeList"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5242"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Links a resource to an adms:Identifier class."/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+adms:identifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_ABF2C561_D263_44c6_A9E0_140763A1B061">
+				<source xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+					<model ea_localid="3581" type="Class" name="epo-inv:InvoiceLine"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-inv:hasInvoiceLineObjectIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5380"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="An identifier for an object on which the invoice line is based, given by the Seller.&#xA;&#xA;Additional Information:&#xA;It may be a subscription number, telephone number, meter point etc., as applicable. &#xA;&#xA;WG approval 26/06/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:hasInvoiceLineObjectIdentifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_ACCA405B_7FF7_41ad_9ACB_A1015C643C97">
+				<source xmi:idref="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E">
+					<model ea_localid="1632" type="Class" name="epo-cat:Batch"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo:hasBatchID" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3016"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The identifier assigned to a specific batch of the produced Item.&#xA;WG Approval 16/05/2023&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:hasBatchID"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_BBC722BA_3236_4fcb_B51A_14A66F3D627C">
+				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
+					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo:hasSerialID" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4374"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The identifier assigned to the specific instance of the produced concept.&#xA;WG Approval 16/05/2023&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:hasSerialID"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_C6F7D14A_11BF_430e_ABED_4C9AC22FFF2A">
+				<source xmi:idref="EAID_29678A10_6473_461a_BE84_76269B5BBD68">
+					<model ea_localid="851" type="Class" name="locn:Address"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="locn:addressID" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3024"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="A globally unique identifier for each instance of an Address.&#xA;&#xA;Additional Information:&#xA;The concept of adding a globally unique identifier for each instance of an address is a crucial part of the INSPIRE data spec. A number of EU countries have already implemented an ID (a UUID) in their Address Register/gazetteer, among them Denmark. OASIS xAL also includes an address identifier. It is the address Identifier that allows an address to be represented in a format other than INSPIRE whilst remaining conformant to the Core Vocabulary.&#xA;&#xA;The INSPIRE method of representing addresses is very detailed, designed primarily for use in databases of addresses. Whilst data that is published in full conformance with the INSPIRE data structure can be made available using the Location Core Vocabulary the reverse is not true since the Core Vocabulary allows much greater flexibility.&#xA;&#xA;Many datasets that include address data as one piece of information about something else are likely to have that data in simpler formats. These might be tailored to the specific need of the dataset, follow a national norm, or make use of a standard like vCard.&#xA;&#xA;To provide maximum flexibility in the Core Vocabulary, whilst remaining interoperable with INSPIRE Address Guidelines (which EU Member States are obliged to use), the Location Core Vocabulary provides the extra property of full address and makes use of INSPIRE's addressID."/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+locn:addressID"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_C7C433B7_9297_4921_9069_80DF68AD408A">
+				<source xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8">
+					<model ea_localid="2023" type="Class" name="epo-ful:ShipmentInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3419"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Links a resource to an adms:Identifier class."/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+adms:identifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_CEDC5261_E7FF_4ca6_8255_6B2812DC1B0C">
+				<source xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7">
+					<model ea_localid="3072" type="Class" name="dct:Location"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="locn:geographicIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4712"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="A URI that identifies the Location.&#xA;&#xA;Additional Information:&#xA;GeoNames.org provides stable, widely recognised identifiers for more than 10 million geographical names that can be used as links to further information. For example, http://sws.geonames.org/593116/ identifies the Lithuanian capital Vilnius. Unfortunately these URIs cannot easily be automatically deduced since the URI scheme uses simple numeric codes. Finding a GeoNames identifier for a Location is almost always a manual process. Where such identifiers are known or can be found, however, it is recommended that they be used.&#xA;&#xA;Where the Location Class is used to identify a country, if the geonames URI is not known, the recommendation is to use DBpedia URIs of the form http://dbpedia.org/resource/ISO_3166-1:XX where XX is the ISO 3166 two character code for the country.&#xA;&#xA;The EU's Publication Office diverges from ISO 3166-1 and uses EL and UK for Greece and the United Kingdom respectively. DBpedia sticks to the ISO codes and so the correct URIs for these countries are:&#xA;&#xA;- http://dbpedia.org/resource/ISO_3166-1:GR&#xA;- http://dbpedia.org/resource/ISO_3166-1:GB&#xA;even when the geographic name is given as EL or UK.&#xA;&#xA;The use of a URIs has added advantages:&#xA;&#xA;- it can be used by automated systems to look up additional data (linked data);&#xA;- a triple store may store only one copy of the URI, whereas if a string is used, a copy of that string is always stored for each and every person in the database. Thus, in large data sets, the saving on memory capacity and the improvement in transmission efficiency can be substantial.&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+locn:geographicIdentifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044">
+				<source xmi:idref="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7">
+					<model ea_localid="2584" type="Class" name="epo-cat:Line"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3998"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Links a resource to an adms:Identifier class."/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+adms:identifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_D42B1380_78A6_4579_B0FD_C3609EBD8AFD">
+				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
+					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-ord:hasSellerOrderID" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4929"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The identifier of the Order given by the Seller.&#xA;&#xA;Additional Information:&#xA;This identifier is different than the identifier of the Order given by the Buyer and it is useful for internal purposes.&#xA;&#xA;WG approval 12/10/2023"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-ord:hasSellerOrderID"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_D56DDC19_B837_4e3f_B996_A8D529DA32A2">
+				<source xmi:idref="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A">
+					<model ea_localid="2668" type="Class" name="cv:Channel"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo:hasEndpointIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4115"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo:hasEndpointIdentifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_D9C75333_AC70_477b_AA0D_15C3CB11CC0C">
+				<source xmi:idref="EAID_86057FC2_7717_4160_8952_6A9F572F43B2">
+					<model ea_localid="1968" type="Class" name="cccev:InformationConcept"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3218"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Links a resource to an adms:Identifier class."/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+adms:identifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_DA6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D">
+				<source xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD">
+					<model ea_localid="2621" type="Class" name="epo-ful:AbstractContainer"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4003"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Links a resource to an adms:Identifier class."/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+adms:identifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_E507D198_1A41_4b43_873A_F9E88411186D">
+				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
+					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo:hasManufacturerItemID" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3018"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The general identifier assigned to the concept as defined by the Manufacturer. &#8203;&#xA;&#xA;WG approval 16/05/2023&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:hasManufacturerItemID"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
 				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_E6E5075B_3605_44e1_9693_42DB89B5FE8A">
+				<source xmi:idref="EAID_A4229EE1_B41E_465f_8F97_80EFAD74A54D">
+					<model ea_localid="3601" type="Class" name="epo-inv:CreditTransferInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-inv:hasPaymentServiceProviderIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5345"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="An identifier for the payment service provider where a payment account is located.&#xA;&#xA;WG approval 11/07/2024&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:hasPaymentServiceProviderIdentifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="datatype"/>
-			</element>
-			<element xmi:idref="EAID_841CF99B_9E5E_413e_8D07_F9B65E072116" xmi:type="uml:DataType" name="xsd:dateTime" scope="public">
-				<model package="EAPK_352BAC9B_7F50_4450_B942_C2EA10533C7F" tpos="0" ea_localid="1825" ea_eleType="element"/>
-				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:25:26" modified="2022-04-29 20:25:30" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
-				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB">
+				<source xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+					<model ea_localid="913" type="Class" name="org:Organization"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo:hasTaxIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4118"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo:hasTaxIdentifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="datatype"/>
-			</element>
-			<element xmi:idref="EAID_57156083_C85E_409d_9C6D_C045D1243765" xmi:type="uml:DataType" name="xsd:decimal" scope="public">
-				<model package="EAPK_352BAC9B_7F50_4450_B942_C2EA10533C7F" tpos="0" ea_localid="1827" ea_eleType="element"/>
-				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:25:42" modified="2022-04-29 20:25:57" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
-				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_EBE8AC56_41A8_45f2_AE75_CB65D4939C94">
+				<source xmi:idref="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48">
+					<model ea_localid="3599" type="Class" name="epo-inv:PaymentInstructionsInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-inv:hasBankingIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5355"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="An unique banking reference identifier of the Payee or Seller, assigned by the Payee or Seller bank.&#xA;&#xA;WG approval 11/07/2024&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-inv:hasBankingIdentifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="datatype"/>
-			</element>
-			<element xmi:idref="EAID_44875764_5D12_4111_BD8B_ACB95D3A83DC" xmi:type="uml:DataType" name="xsd:integer" scope="public">
-				<model package="EAPK_352BAC9B_7F50_4450_B942_C2EA10533C7F" tpos="0" ea_localid="1826" ea_eleType="element"/>
-				<properties isSpecification="false" sType="DataType" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:25:33" modified="2022-04-29 20:25:38" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
-				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="datatype"/>
-			</element>
-		</elements>
-		<connectors>
-			<connector xmi:idref="EAID_EF2C4645_6C41_4c39_9F95_185806E2B6E1">
-				<source xmi:idref="EAID_9776729F_9284_46c1_AB77_BA5692ADE213">
-					<model ea_localid="2083" type="ProxyConnector" name="ProxyConnector"/>
+			</connector>
+			<connector xmi:idref="EAID_EC04B8A5_6281_4f14_8017_204CCE05A2CC">
+				<source xmi:idref="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4">
+					<model ea_localid="2635" type="Class" name="epo:Project"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1B056616_B822_4add_84D3_1D36186827ED">
-					<model ea_localid="2084" type="ProxyConnector" name="ProxyConnector"/>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4076"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="A unique identifier of the instance of the concept.&#xA;&#xA;Additional Information&#xA;&#xA;For example, in the case of the Procurement Identifier, this could be the European Public Procurement Identifier, and/or any other identifier provided by the buyer, the service provider or any other stakeholder.&#xA;&#xA;WG Approval 12/11/2019&#xA;&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+adms:identifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_ECEFDC69_19B4_47d7_A201_D8391B5C67DF">
+				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
+					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo:hasBuyerItemID" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3346"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<documentation/>
+				<model ea_localid="3522"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The general identifier assigned to the concept as defined by the Buyer.&#8203;&#xA;&#xA;WG approval 16/05/2023&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo:hasBuyerItemID"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9512B0DA_565A_4051_A589_525053877046">
-				<source xmi:idref="EAID_75629D1B_E406_4b38_82BA_5525819A470C">
-					<model ea_localid="2085" type="ProxyConnector" name="ProxyConnector"/>
+			<connector xmi:idref="EAID_ED25B2CF_BC4D_44e9_957C_60FF1C08941F">
+				<source xmi:idref="EAID_495BBB92_468A_4f08_9330_A0C75730B97A">
+					<model ea_localid="899" type="Class" name="epo:Fund"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F0EE8667_674A_4286_AEE4_319B6DD14F24">
-					<model ea_localid="2086" type="ProxyConnector" name="ProxyConnector"/>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3014"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Links a resource to an adms:Identifier class."/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+adms:identifier"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_F0951C5B_94E2_4a5f_BF21_25D103CB3656">
+				<source xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A">
+					<model ea_localid="2087" type="Class" name="epo-ord:DeliveryInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-ful:hasTrackingID" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3347"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="3982"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo-ful:hasTrackingID"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_3C3D734E_D8F1_460f_934C_F1F1D556AA5A">
-				<source xmi:idref="EAID_98639C30_5207_4cc7_B47E_50C11AD87033">
-					<model ea_localid="3061" type="Note"/>
+			<connector xmi:idref="EAID_F3CD32F8_8180_4939_A987_53BA66264912">
+				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
+					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC">
-					<model ea_localid="1811" type="Class" name="epo:ChangeInformation"/>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-ful:hasConsigneeConsignmentID" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4033"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The identifier of the the Consignment given by the Consignee.&#xA;&#xA;WG approval 10/06/2024&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-ful:hasConsigneeConsignmentID"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_F9E4B0C6_6B39_4211_B8F3_83FC71C1725E">
+				<source xmi:idref="EAID_A4C45D5B_3E8F_4416_A69C_3735046D0F48">
+					<model ea_localid="3599" type="Class" name="epo-inv:PaymentInstructionsInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
+					<role name="epo-inv:hasDebitedAccountIdentifier" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4687"/>
-				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<model ea_localid="5356"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
-				<documentation/>
+				<parameterSubstitutions/>
+				<documentation value="An identifier for the account to be debited by the direct debit.&#xA;&#xA;WG approval 11/07/2024&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo-inv:hasDebitedAccountIdentifier"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -26254,41 +28994,6 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7F56C70D_D0B9_4ad4_9CB4_9A6821D5E3E1">
-				<source xmi:idref="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9">
-					<model ea_localid="1966" type="Class" name="cccev:Evidence"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="5244"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="Links a resource to an adms:Identifier class."/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+adms:identifier"/>
-				<extendedProperties/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
 			<connector xmi:idref="EAID_8990AB87_7AAE_4276_AA04_83E4BB664FCB">
 				<source xmi:idref="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9">
 					<model ea_localid="1966" type="Class" name="cccev:Evidence"/>
@@ -26531,41 +29236,6 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D9C75333_AC70_477b_AA0D_15C3CB11CC0C">
-				<source xmi:idref="EAID_86057FC2_7717_4160_8952_6A9F572F43B2">
-					<model ea_localid="1968" type="Class" name="cccev:InformationConcept"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="3218"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="Links a resource to an adms:Identifier class."/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+adms:identifier"/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
 			<connector xmi:idref="EAID_4CC3B6CA_493A_4ff6_BB1B_A5C475115AB1">
 				<source xmi:idref="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC">
 					<model ea_localid="1896" type="Class" name="cccev:Requirement"/>
@@ -26670,6 +29340,41 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_110A81E5_E1CC_45be_BCFD_56F87C51B05A">
+				<source xmi:idref="EAID_30DD6891_71FE_4f87_832B_477790550BBC">
+					<model ea_localid="3185" type="Class" name="cccev:InformationRequirement"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
+					<model ea_localid="922" type="Class" name="epo:Procedure"/>
+					<role name="epo:concernsProcedure" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5398"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:concernsProcedure"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_6492D4E3_9631_45d4_9596_5EC3247529A2">
 				<source xmi:idref="EAID_30DD6891_71FE_4f87_832B_477790550BBC">
 					<model ea_localid="3185" type="Class" name="cccev:InformationRequirement"/>
@@ -26704,9 +29409,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_5715AB6B_F88D_4b3e_857E_2AD843DEF3DE">
-				<source xmi:idref="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC">
-					<model ea_localid="3467" type="Class" name="epo-sub:Response"/>
+			<connector xmi:idref="EAID_6AE31D37_FF1B_42a0_838A_8319D03108B2">
+				<source xmi:idref="EAID_30DD6891_71FE_4f87_832B_477790550BBC">
+					<model ea_localid="3185" type="Class" name="cccev:InformationRequirement"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -26716,9 +29421,44 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_30DD6891_71FE_4f87_832B_477790550BBC">
+				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
+					<model ea_localid="906" type="Class" name="epo:Lot"/>
+					<role name="epo:concernsLot" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5412"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo:concernsLot"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_9FA89CC9_D9FD_4f2e_9237_C215D347E620">
+				<source xmi:idref="EAID_30DD6891_71FE_4f87_832B_477790550BBC">
 					<model ea_localid="3185" type="Class" name="cccev:InformationRequirement"/>
-					<role name="epo-sub:answersQuestion" visibility="Public" targetScope="instance"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
+					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
+					<role name="epo:concernsLotGroup" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -26727,21 +29467,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="5189"/>
+				<model ea_localid="5413"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating that the Response replies to a question.&#xA;&#xA;WG approval 12/03/2024"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo-sub:answersQuestion"/>
+				<labels rb="0..*" rt="+epo:concernsLotGroup"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_1F14095E_1557_4ab2_9602_8ABBB64F4BF6">
-				<source xmi:idref="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC">
-					<model ea_localid="1896" type="Class" name="cccev:Requirement"/>
+			<connector xmi:idref="EAID_5715AB6B_F88D_4b3e_857E_2AD843DEF3DE">
+				<source xmi:idref="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC">
+					<model ea_localid="3467" type="Class" name="epo-sub:Response"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -26751,9 +29491,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_3124967E_D23F_4c3b_9B72_E02C23A08D68">
-					<model ea_localid="3506" type="Class" name="cccev:EvidenceTypeList"/>
-					<role name="cccev:hasEvidenceTypeList" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_30DD6891_71FE_4f87_832B_477790550BBC">
+					<model ea_localid="3185" type="Class" name="cccev:InformationRequirement"/>
+					<role name="epo-sub:answersQuestion" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -26762,19 +29502,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="5236"/>
+				<model ea_localid="5189"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Evidence Type List that specifies the Evidence Types that are needed to meet the Requirement.&#xA;&#xA;Additional Information:&#xA;One or several Lists of Evidence Types can support a Requirement. At least one of them must be satisfied by the response to the Requirement."/>
+				<documentation value="Relation indicating that the Response replies to a question.&#xA;&#xA;WG approval 12/03/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+cccev:hasEvidenceTypeList"/>
+				<labels rb="0..*" rt="+epo-sub:answersQuestion"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_527F57B4_08F1_4183_A0A9_C1CCAB84A53A">
+			<connector xmi:idref="EAID_1F14095E_1557_4ab2_9602_8ABBB64F4BF6">
 				<source xmi:idref="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC">
 					<model ea_localid="1896" type="Class" name="cccev:Requirement"/>
 					<role visibility="Public" targetScope="instance"/>
@@ -26786,10 +29526,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_3124967E_D23F_4c3b_9B72_E02C23A08D68">
+					<model ea_localid="3506" type="Class" name="cccev:EvidenceTypeList"/>
+					<role name="cccev:hasEvidenceTypeList" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -26797,13 +29537,13 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4797"/>
+				<model ea_localid="5236"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Links a resource to an adms:Identifier class."/>
+				<documentation value="Evidence Type List that specifies the Evidence Types that are needed to meet the Requirement.&#xA;&#xA;Additional Information:&#xA;One or several Lists of Evidence Types can support a Requirement. At least one of them must be satisfied by the response to the Requirement."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+adms:identifier"/>
+				<labels rb="0..*" rt="+cccev:hasEvidenceTypeList"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -27087,41 +29827,6 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D56DDC19_B837_4e3f_B996_A8D529DA32A2">
-				<source xmi:idref="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A">
-					<model ea_localid="2668" type="Class" name="cv:Channel"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo:hasEndpointIdentifier" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="4115"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasEndpointIdentifier"/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
 			<connector xmi:idref="EAID_2C904936_FC7D_45f3_AFEF_E5B428B672AA">
 				<source xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
 					<model ea_localid="1326" type="Class" name="epo:AgentInRole"/>
@@ -27294,41 +29999,6 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_4A4FE890_B03B_430a_A719_E1852BEECBEE">
-				<source xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7">
-					<model ea_localid="3072" type="Class" name="dct:Location"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="4713"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="Links a resource to an adms:Identifier class."/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+adms:identifier"/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
 			<connector xmi:idref="EAID_8A0DF9CA_F904_4d6e_850E_F68332FB1B0B">
 				<source xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7">
 					<model ea_localid="3072" type="Class" name="dct:Location"/>
@@ -27397,41 +30067,6 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_CEDC5261_E7FF_4ca6_8255_6B2812DC1B0C">
-				<source xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7">
-					<model ea_localid="3072" type="Class" name="dct:Location"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="locn:geographicIdentifier" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="4712"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="A URI that identifies the Location.&#xA;&#xA;Additional Information:&#xA;GeoNames.org provides stable, widely recognised identifiers for more than 10 million geographical names that can be used as links to further information. For example, http://sws.geonames.org/593116/ identifies the Lithuanian capital Vilnius. Unfortunately these URIs cannot easily be automatically deduced since the URI scheme uses simple numeric codes. Finding a GeoNames identifier for a Location is almost always a manual process. Where such identifiers are known or can be found, however, it is recommended that they be used.&#xA;&#xA;Where the Location Class is used to identify a country, if the geonames URI is not known, the recommendation is to use DBpedia URIs of the form http://dbpedia.org/resource/ISO_3166-1:XX where XX is the ISO 3166 two character code for the country.&#xA;&#xA;The EU's Publication Office diverges from ISO 3166-1 and uses EL and UK for Greece and the United Kingdom respectively. DBpedia sticks to the ISO codes and so the correct URIs for these countries are:&#xA;&#xA;- http://dbpedia.org/resource/ISO_3166-1:GR&#xA;- http://dbpedia.org/resource/ISO_3166-1:GB&#xA;even when the geographic name is given as EL or UK.&#xA;&#xA;The use of a URIs has added advantages:&#xA;&#xA;- it can be used by automated systems to look up additional data (linked data);&#xA;- a triple store may store only one copy of the URI, whereas if a string is used, a copy of that string is always stored for each and every person in the database. Thus, in large data sets, the saving on memory capacity and the improvement in transmission efficiency can be substantial.&#xA;"/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+locn:geographicIdentifier"/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
 			<connector xmi:idref="EAID_F48E8C16_CD7F_4664_8346_839CB32AF64E">
 				<source xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7">
 					<model ea_localid="3072" type="Class" name="dct:Location"/>
@@ -27634,7 +30269,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating the Location of the Despatch of the Goods Items to be delivered.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:specifiesPlaceOfDespatch"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -29051,6 +31686,40 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_0E005307_D7E7_4c2a_B693_817916BDFA4B">
+				<source xmi:idref="EAID_0D5BCA5B_42CB_4202_9453_012E0A141952">
+					<model ea_localid="3577" type="Class" name="epo-ful:NotificationReceiver"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5">
+					<model ea_localid="2111" type="Class" name="epo:AuxiliaryParty"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5319"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_0F5296C9_3949_4cbc_913E_EAEE25BEEAD8">
 				<source xmi:idref="EAID_CADD27F3_86EF_483f_A036_7DF4251EE09C">
 					<model ea_localid="1330" type="Class" name="epo:TaxInformationProvider"/>
@@ -30310,7 +32979,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Accepted by Buyer.&#xA;&#xA;WG approval 10/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="1..*" rt="+epo-ful:agreedByBuyer"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -30353,6 +33022,41 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_ADB3D05D_CE75_486d_B38A_27314A2F62B2">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750">
+					<model ea_localid="857" type="Class" name="epo:Buyer"/>
+					<role name="epo:specifiesBuyer" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5337"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo:specifiesBuyer"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_C00C71CA_F2D3_48ca_8D27_E3F34E3AF36B">
 				<source xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0">
 					<model ea_localid="1056" type="Class" name="epo-cat:Catalogue"/>
@@ -30623,7 +33327,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Includes Candidate.&#xA;&#xA;WG approval 14/05/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..*" rt="+epo:containsCandidate"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -30874,41 +33578,6 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_84490705_94B3_445f_ACA6_A903591C3651">
-				<source xmi:idref="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC">
-					<model ea_localid="1811" type="Class" name="epo:ChangeInformation"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo:relatesToEFormSectionIdentifier" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="4743"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1..*" rt="+epo:relatesToEFormSectionIdentifier"/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
 			<connector xmi:idref="EAID_B2FED202_9ACA_415c_B2AB_A1E3E26E726C">
 				<source xmi:idref="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC">
 					<model ea_localid="1811" type="Class" name="epo:ChangeInformation"/>
@@ -30969,7 +33638,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relates to Notice. &#xA;&#xA;WG approval 14/05/2024&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="1" rt="+epo:concernsNotice"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -32222,6 +34891,41 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_63923E1F_6373_4e4c_BC58_974BA33F469A">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
+					<role name="epo:refersToContract" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5332"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:refersToContract"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_7787587B_6BE4_4863_801D_DFF3EA946B55">
 				<source xmi:idref="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F">
 					<model ea_localid="3087" type="Class" name="epo-con:ContractAmendment"/>
@@ -32569,6 +35273,41 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_4347709B_D87B_4476_92B0_4EF65D96A0BA">
+				<source xmi:idref="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7">
+					<model ea_localid="871" type="Class" name="epo:Contractor"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7">
+					<model ea_localid="947" type="Class" name="epo:Subcontractor"/>
+					<role name="epo:hasSubcontractor" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5438"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:hasSubcontractor"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_910BFAB5_C09F_48c2_A281_70A523440BFB">
 				<source xmi:idref="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7">
 					<model ea_localid="871" type="Class" name="epo:Contractor"/>
@@ -32603,6 +35342,41 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_9E5B53CF_762F_4436_88E6_F386741960D6">
+				<source xmi:idref="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7">
+					<model ea_localid="871" type="Class" name="epo:Contractor"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7">
+					<model ea_localid="947" type="Class" name="epo:Subcontractor"/>
+					<role name="epo:foreseesSubcontractor" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5437"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:foreseesSubcontractor"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_BBA3014F_919D_4de3_BCF2_6CA4F71150CA">
 				<source xmi:idref="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7">
 					<model ea_localid="871" type="Class" name="epo:Contractor"/>
@@ -33389,41 +36163,6 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_1BEBAC59_19C6_4908_B93C_EED975A6974F">
-				<source xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo:hasUUID" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="3013"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="A universally unique identifier for an instance of this document.&#xA;&#xA;WG Approval 12/05/2020"/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasUUID"/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
 			<connector xmi:idref="EAID_39F3583F_0D40_4e9f_8018_10297955785C">
 				<source xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
 					<model ea_localid="878" type="Class" name="epo:Document"/>
@@ -33459,41 +36198,6 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_3AA2C83C_532C_460c_99CE_63F041A42F06">
-				<source xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="3012"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="Links a resource to an adms:Identifier class."/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+adms:identifier"/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
 			<connector xmi:idref="EAID_6A9FC4EC_D843_4ffe_84A8_24E86C3ED8AF">
 				<source xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
 					<model ea_localid="878" type="Class" name="epo:Document"/>
@@ -33897,7 +36601,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Is related to a Document.&#xA;&#xA;WG approval 06/10/2024&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasAssociatedDocument"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -33932,7 +36636,7 @@
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Is related to a Document.&#xA;&#xA;WG approval 06/10/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-ful:hasAssociatedDocument"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -34167,429 +36871,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2754"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
-				<documentation/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
-			<connector xmi:idref="EAID_DCD1791D_6597_41ef_AB35_766470760473">
-				<source xmi:idref="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11">
-					<model ea_localid="1028" type="Class" name="epo:ExpressionOfInterest"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="2744"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
-				<documentation/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
-			<connector xmi:idref="EAID_F547C226_B690_4b64_9C04_7ED2CC31BA99">
-				<source xmi:idref="EAID_F72FB743_EDB9_4511_9787_B6F389BACA6B">
-					<model ea_localid="1029" type="Class" name="epo:RequestForParticipation"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="2743"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
-				<documentation/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
-			<connector xmi:idref="EAID_F7CADBEA_BE8C_41f0_8070_7102E73439C9">
-				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
-					<role name="epo-cat:hasExternalSpecification" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="4364"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="URI reference to external item information or specifications, e.g. web address.&#xA;"/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo-cat:hasExternalSpecification"/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
-			<connector xmi:idref="EAID_4817E610_079C_4b0d_A7C8_604097CB9B2E">
-				<source xmi:idref="EAID_C06EA401_3F55_4448_B4FF_BB7EA510A155">
-					<model ea_localid="880" type="Class" name="epo:DynamicPurchaseSystemTechnique"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_3780AA50_D898_4068_B300_47B46651CA0A">
-					<model ea_localid="953" type="Class" name="epo:Technique"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="1565"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
-				<documentation/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
-			<connector xmi:idref="EAID_C3F5DF0E_730A_416e_9244_87A3BCAC0065">
-				<source xmi:idref="EAID_C06EA401_3F55_4448_B4FF_BB7EA510A155">
-					<model ea_localid="880" type="Class" name="epo:DynamicPurchaseSystemTechnique"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_20196F1A_F4F1_4faf_B4B3_B5CED1D24AF2">
-					<model ea_localid="972" type="Enumeration" name="at-voc:dps-usage"/>
-					<role name="epo:hasDPSScope" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation value="Explanation as to whether a dps is used and by whom.&#xA;WG Approval 09/11/2021&#xA;&#xA;The codelist to be used is at-voc:dps-usage which is available at http://publications.europa.eu/resource/dataset/dps-usage"/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="1452"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Explanation as to whether a dps is used and by whom.&#xA;&#xA;Additional Information:&#xA;This corresponds in eForms to BT-766 Dynamic Purchasing System.&#xA;WG Approval 09/11/2021&#xA;"/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasDPSScope"/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
-			<connector xmi:idref="EAID_E41E06F2_CE80_425f_996C_08130A9CC404">
-				<source xmi:idref="EAID_7D8A2312_4686_49e6_B174_97BCF34F4CE4">
-					<model ea_localid="881" type="Class" name="epo:EAuctionTechnique"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_3780AA50_D898_4068_B300_47B46651CA0A">
-					<model ea_localid="953" type="Class" name="epo:Technique"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="1563"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
-				<documentation/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
-			<connector xmi:idref="EAID_35039C01_2836_47b3_898F_14269D31CF88">
-				<source xmi:idref="EAID_E47E88D6_0393_469c_89FB_39DC4844FBCE">
-					<model ea_localid="2944" type="Class" name="epo:EconomicStandingSummary"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB">
-					<model ea_localid="2593" type="Class" name="epo:SelectionCriteriaSummary"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="4514"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
-				<documentation/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
-			<connector xmi:idref="EAID_D24BB7D7_DC9F_43ad_AB2C_BEEC4E3BED13">
-				<source xmi:idref="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E">
-					<model ea_localid="1650" type="Class" name="epo:SubcontractingEstimate"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897">
-					<model ea_localid="1648" type="Class" name="epo:Estimate"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="2787"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
-				<documentation/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
-			<connector xmi:idref="EAID_A33B86A9_4703_4a67_8335_7F9768E9C57B">
-				<source xmi:idref="EAID_0C735489_15DC_40a7_A94E_A9202738B188">
-					<model ea_localid="890" type="Class" name="epo:EvaluationTerm"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
-					<model ea_localid="1772" type="Class" name="epo:LotSpecificTerm"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="2974"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
-				<documentation/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
-			<connector xmi:idref="EAID_02B5CE74_9A08_4893_BAE1_E10B6A40FB7A">
-				<source xmi:idref="EAID_C7B390E7_9D78_49dc_8846_DAF686401728">
-					<model ea_localid="1468" type="Class" name="epo:SelectionEvaluationTerm"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_0C735489_15DC_40a7_A94E_A9202738B188">
-					<model ea_localid="890" type="Class" name="epo:EvaluationTerm"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="2527"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
-				<documentation/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
-			<connector xmi:idref="EAID_B158E1D7_3CC5_4e64_8D25_C40F0E038224">
-				<source xmi:idref="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90">
-					<model ea_localid="892" type="Class" name="epo:ExclusionGround"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD">
-					<model ea_localid="2951" type="Class" name="epo:QualificationCriterion"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="3053"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
-				<documentation/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
-			<connector xmi:idref="EAID_3EE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8">
-				<source xmi:idref="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53">
-					<model ea_localid="956" type="Class" name="epo:Tenderer"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90">
-					<model ea_localid="892" type="Class" name="epo:ExclusionGround"/>
-					<role name="epo:substantiatesExclusionGround" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="1533"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2754"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:substantiatesExclusionGround"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_08EBA2FE_CCEA_4eec_B375_3B680C3FD97A">
-				<source xmi:idref="EAID_AE22E69E_F035_4a34_A84F_629922B88DE1">
-					<model ea_localid="2592" type="Class" name="epo:ExclusionGroundsSummary"/>
+			<connector xmi:idref="EAID_DCD1791D_6597_41ef_AB35_766470760473">
+				<source xmi:idref="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11">
+					<model ea_localid="1028" type="Class" name="epo:ExpressionOfInterest"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -34599,8 +36894,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89">
-					<model ea_localid="2950" type="Class" name="epo:QualificationCriteriaSummary"/>
+				<target xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
+					<model ea_localid="878" type="Class" name="epo:Document"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -34610,7 +36905,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3975"/>
+				<model ea_localid="2744"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -34621,57 +36916,56 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A96B5FDE_85B9_4435_B7E7_D176E6996280">
-				<source xmi:idref="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029">
-					<model ea_localid="896" type="Class" name="epo:FrameworkAgreement"/>
+			<connector xmi:idref="EAID_F547C226_B690_4b64_9C04_7ED2CC31BA99">
+				<source xmi:idref="EAID_F72FB743_EDB9_4511_9787_B6F389BACA6B">
+					<model ea_localid="1029" type="Class" name="epo:RequestForParticipation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A">
-					<model ea_localid="1371" type="Class" name="epo:LotAwardOutcome"/>
-					<role name="epo:resultsFromLotAwardOutcome" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
+					<model ea_localid="878" type="Class" name="epo:Document"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2837"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2743"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:resultsFromLotAwardOutcome"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D68065CA_2D18_479d_95EB_23D106ED6921">
-				<source xmi:idref="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8">
-					<model ea_localid="932" type="Class" name="epo:PurchaseContract"/>
+			<connector xmi:idref="EAID_F7CADBEA_BE8C_41f0_8070_7102E73439C9">
+				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
+					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029">
-					<model ea_localid="896" type="Class" name="epo:FrameworkAgreement"/>
-					<role name="epo:followsRulesSetBy" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
+					<model ea_localid="878" type="Class" name="epo:Document"/>
+					<role name="epo-cat:hasExternalSpecification" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -34679,21 +36973,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1527"/>
+				<model ea_localid="4364"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="URI reference to external item information or specifications, e.g. web address.&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:followsRulesSetBy"/>
+				<labels rb="0..*" rt="+epo-cat:hasExternalSpecification"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D1D7983F_8387_4c3b_9950_CE4378AD01B0">
-				<source xmi:idref="EAID_D2862D88_92C5_4206_B142_36CDBA0095B8">
-					<model ea_localid="897" type="Class" name="epo:FrameworkAgreementTechnique"/>
+			<connector xmi:idref="EAID_9501DE7B_F539_4409_8D54_7B950268D75C">
+				<source xmi:idref="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969">
+					<model ea_localid="1698" type="Class" name="epo:Duration"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -34703,8 +36997,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_3780AA50_D898_4068_B300_47B46651CA0A">
-					<model ea_localid="953" type="Class" name="epo:Technique"/>
+				<target xmi:idref="EAID_F8F2DEF8_6045_44d5_93B9_E57CE8023BE9">
+					<model ea_localid="3252" type="Class" name="time:Duration"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -34714,7 +37008,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1525"/>
+				<model ea_localid="4930"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -34725,43 +37019,44 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_6591B482_9D9E_4650_897A_253ACD64FC8A">
-				<source xmi:idref="EAID_FA070646_D88B_493f_96AB_8417E2069155">
-					<model ea_localid="898" type="Class" name="epo:FrameworkAgreementTerm"/>
+			<connector xmi:idref="EAID_1EA9C84A_C46F_456b_A355_DA9CD314CBA0">
+				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
+					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD">
-					<model ea_localid="1773" type="Class" name="epo:ProcedureSpecificTerm"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969">
+					<model ea_localid="1698" type="Class" name="epo:Duration"/>
+					<role name="epo:hasTenderValidityDuration" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2983"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4801"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo:hasTenderValidityDuration"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_B02CD525_7AD7_45d7_B20C_514E7B961066">
-				<source xmi:idref="EAID_FA070646_D88B_493f_96AB_8417E2069155">
-					<model ea_localid="898" type="Class" name="epo:FrameworkAgreementTerm"/>
+			<connector xmi:idref="EAID_45B983F5_7502_49f2_984C_17FF6E47F8F9">
+				<source xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
+					<model ea_localid="1831" type="Class" name="epo-cat:Price"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -34771,64 +37066,67 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_2EEC390D_B44F_4505_8179_765B845FE27F">
-					<model ea_localid="1007" type="Enumeration" name="at-voc:framework-agreement"/>
-					<role name="epo:hasFrameworkAgreementType" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969">
+					<model ea_localid="1698" type="Class" name="epo:Duration"/>
+					<role name="epo-cat:hasExpectedDeliveryTime" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation/>
+					<documentation value="&#xA;"/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1521"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The form of framework agreement used in a procurement procedure.&#xA;&#xA;Addition information:&#xA;&#xA;A concept to distinguish the different types of framework agreement, which are: &#xA;1. Framework agreement without reopening of competition,&#xA;2. Framework agreement with reopening of competition, or &#xA;3. Framework agreement partly without reopening of competition.&#xA;&#xA;WG Approval 19/09/2019 &#xA;&#xA;"/>
+				<model ea_localid="3058"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The expected amount of time between the order and delivery of an item. &#xA;&#xA;WG approval 26/07/2022"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:hasFrameworkAgreementType"/>
+				<labels rb="0..1" rt="+epo-cat:hasExpectedDeliveryTime"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F9E99464_DED7_437a_98F9_263E29761C37">
-				<source xmi:idref="EAID_FA070646_D88B_493f_96AB_8417E2069155">
-					<model ea_localid="898" type="Class" name="epo:FrameworkAgreementTerm"/>
+			<connector xmi:idref="EAID_EB2AC560_378D_4c18_9647_0E2E150D7463">
+				<source xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A">
+					<model ea_localid="917" type="Class" name="epo:PlannedProcurementPart"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
-					<model ea_localid="1772" type="Class" name="epo:LotSpecificTerm"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969">
+					<model ea_localid="1698" type="Class" name="epo:Duration"/>
+					<role name="epo:hasPlannedDuration" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2980"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="2891"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo:hasPlannedDuration"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_3C2D8165_83BF_498f_B03B_E256F94C76B5">
-				<source xmi:idref="EAID_495BBB92_468A_4f08_9330_A0C75730B97A">
-					<model ea_localid="899" type="Class" name="epo:Fund"/>
+			<connector xmi:idref="EAID_EFDCE7F5_7EC7_4537_B26B_232F5FB37A9C">
+				<source xmi:idref="EAID_3F572668_3AED_4090_BAB3_9047B4874154">
+					<model ea_localid="909" type="Class" name="epo:MultipleStageProcedureTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -34838,9 +37136,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_62AEA02F_28F9_411d_9AF4_B6398F78199C">
-					<model ea_localid="2903" type="Enumeration" name="at-voc:EU-programme"/>
-					<role name="epo:hasFundProgramme" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969">
+					<model ea_localid="1698" type="Class" name="epo:Duration"/>
+					<role name="epo:hasQualificationSystemDuration" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -34849,122 +37147,123 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4449"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="3315"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasFundProgramme"/>
+				<labels rb="0..1" rt="+epo:hasQualificationSystemDuration"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_ED25B2CF_BC4D_44e9_957C_60FF1C08941F">
-				<source xmi:idref="EAID_495BBB92_468A_4f08_9330_A0C75730B97A">
-					<model ea_localid="899" type="Class" name="epo:Fund"/>
+			<connector xmi:idref="EAID_F8285143_A232_43ae_AFC8_89D40A9529FD">
+				<source xmi:idref="EAID_7D0E71D7_D624_4144_8134_2500CE9AB392">
+					<model ea_localid="2060" type="Class" name="epo:IndefiniteDuration"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969">
+					<model ea_localid="1698" type="Class" name="epo:Duration"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3014"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3318"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="Links a resource to an adms:Identifier class."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+adms:identifier"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_0F625CFF_139F_4712_8BB6_681888ACB178">
-				<source xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
-					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
+			<connector xmi:idref="EAID_FE0B0FB5_E0B6_41e2_AA82_ECF06C845021">
+				<source xmi:idref="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C">
+					<model ea_localid="2059" type="Class" name="epo:SpecificDuration"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_495BBB92_468A_4f08_9330_A0C75730B97A">
-					<model ea_localid="899" type="Class" name="epo:Fund"/>
-					<role name="epo:isFundedBy" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969">
+					<model ea_localid="1698" type="Class" name="epo:Duration"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1617"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3317"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="Funding is provided either completely or partially by a Fund.&#xA;&#xA;Additional information:&#xA;This corresponds in eForms to BG - 61 EU Funds (specified per Lot) and to BG - 611 Contract EU Funds (applied per Contract lot)&#xA;Funds may change between the lot and the contract, for example in the case of an emergency crisis, a contract may be financed by a budget that was not foreseen in the call.&#xA;&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:isFundedBy"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_6AA28D6E_E3E3_40d8_A409_4F5F708BC856">
-				<source xmi:idref="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4">
-					<model ea_localid="900" type="Class" name="epo:GreenProcurement"/>
+			<connector xmi:idref="EAID_4817E610_079C_4b0d_A7C8_604097CB9B2E">
+				<source xmi:idref="EAID_C06EA401_3F55_4448_B4FF_BB7EA510A155">
+					<model ea_localid="880" type="Class" name="epo:DynamicPurchaseSystemTechnique"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_B81500F4_C78F_4431_A0DA_EA1E43E5C728">
-					<model ea_localid="3081" type="Enumeration" name="at-voc:green-public-procurement-criteria"/>
-					<role name="epo:fulfillsRequirement" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_3780AA50_D898_4068_B300_47B46651CA0A">
+					<model ea_localid="953" type="Class" name="epo:Technique"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4729"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The requirement to which the concept meets.&#xA;WG Approval 09/11/2021&#xA;"/>
+				<model ea_localid="1565"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:fulfillsRequirement"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9E45040E_9573_4ec2_971F_0407E27D9413">
-				<source xmi:idref="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4">
-					<model ea_localid="900" type="Class" name="epo:GreenProcurement"/>
+			<connector xmi:idref="EAID_C3F5DF0E_730A_416e_9244_87A3BCAC0065">
+				<source xmi:idref="EAID_C06EA401_3F55_4448_B4FF_BB7EA510A155">
+					<model ea_localid="880" type="Class" name="epo:DynamicPurchaseSystemTechnique"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -34974,30 +37273,30 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_BF1B4E2A_7D4A_4247_8B45_5AD2427938E3">
-					<model ea_localid="974" type="Enumeration" name="at-voc:environmental-impact"/>
-					<role name="epo:fulfillsRequirement" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_20196F1A_F4F1_4faf_B4B3_B5CED1D24AF2">
+					<model ea_localid="972" type="Enumeration" name="at-voc:dps-usage"/>
+					<role name="epo:hasDPSScope" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation/>
+					<documentation value="Explanation as to whether a dps is used and by whom.&#xA;WG Approval 09/11/2021&#xA;&#xA;The codelist to be used is at-voc:dps-usage which is available at http://publications.europa.eu/resource/dataset/dps-usage"/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1515"/>
+				<model ea_localid="1452"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The requirement to which the concept meets.&#xA;WG Approval 09/11/2021&#xA;&#xA;"/>
+				<documentation value="Explanation as to whether a dps is used and by whom.&#xA;&#xA;Additional Information:&#xA;This corresponds in eForms to BT-766 Dynamic Purchasing System.&#xA;WG Approval 09/11/2021&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:fulfillsRequirement"/>
+				<labels rb="0..1" rt="+epo:hasDPSScope"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C15E132C_206B_4dd4_976E_204541847F5F">
-				<source xmi:idref="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4">
-					<model ea_localid="900" type="Class" name="epo:GreenProcurement"/>
+			<connector xmi:idref="EAID_E41E06F2_CE80_425f_996C_08130A9CC404">
+				<source xmi:idref="EAID_7D8A2312_4686_49e6_B174_97BCF34F4CE4">
+					<model ea_localid="881" type="Class" name="epo:EAuctionTechnique"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -35007,8 +37306,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA">
-					<model ea_localid="945" type="Class" name="epo:StrategicProcurement"/>
+				<target xmi:idref="EAID_3780AA50_D898_4068_B300_47B46651CA0A">
+					<model ea_localid="953" type="Class" name="epo:Technique"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -35018,7 +37317,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1516"/>
+				<model ea_localid="1563"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -35029,44 +37328,43 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_0BE43E48_CB11_4fae_87F3_C0ACAEAF591C">
-				<source xmi:idref="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0">
-					<model ea_localid="3084" type="Class" name="epo:VehicleInformation"/>
+			<connector xmi:idref="EAID_35039C01_2836_47b3_898F_14269D31CF88">
+				<source xmi:idref="EAID_E47E88D6_0393_469c_89FB_39DC4844FBCE">
+					<model ea_localid="2944" type="Class" name="epo:EconomicStandingSummary"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4">
-					<model ea_localid="900" type="Class" name="epo:GreenProcurement"/>
-					<role name="epo:concernsGreenProcurement" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB">
+					<model ea_localid="2593" type="Class" name="epo:SelectionCriteriaSummary"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4733"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4514"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:concernsGreenProcurement"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_ADB72D59_DC72_465e_97A2_B2C5B93B0F80">
-				<source xmi:idref="EAID_EC3D2F66_1FC6_4b4c_AAD2_04A3726B2332">
-					<model ea_localid="901" type="Class" name="epo:InnovativeProcurement"/>
+			<connector xmi:idref="EAID_D24BB7D7_DC9F_43ad_AB2C_BEEC4E3BED13">
+				<source xmi:idref="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E">
+					<model ea_localid="1650" type="Class" name="epo:SubcontractingEstimate"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -35076,8 +37374,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA">
-					<model ea_localid="945" type="Class" name="epo:StrategicProcurement"/>
+				<target xmi:idref="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897">
+					<model ea_localid="1648" type="Class" name="epo:Estimate"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -35087,7 +37385,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1514"/>
+				<model ea_localid="2787"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -35098,182 +37396,180 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F362F8D3_4A45_4dc9_AC9E_9CBFCA6E5549">
-				<source xmi:idref="EAID_EC3D2F66_1FC6_4b4c_AAD2_04A3726B2332">
-					<model ea_localid="901" type="Class" name="epo:InnovativeProcurement"/>
+			<connector xmi:idref="EAID_A33B86A9_4703_4a67_8335_7F9768E9C57B">
+				<source xmi:idref="EAID_0C735489_15DC_40a7_A94E_A9202738B188">
+					<model ea_localid="890" type="Class" name="epo:EvaluationTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_6C0716CF_8E33_4ea7_972F_AB425AA26120">
-					<model ea_localid="975" type="Enumeration" name="at-voc:innovative-acquisition"/>
-					<role name="epo:fulfillsRequirement" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
+					<model ea_localid="1772" type="Class" name="epo:LotSpecificTerm"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1513"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The requirement to which the concept meets.&#xA;WG Approval 09/11/2021&#xA;&#xA;"/>
+				<model ea_localid="2974"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:fulfillsRequirement"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_E3D7352D_80E6_41e6_B85A_672AACE795E2">
-				<source xmi:idref="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896">
-					<model ea_localid="3042" type="Class" name="epo:JuryMember"/>
+			<connector xmi:idref="EAID_02B5CE74_9A08_4893_BAE1_E10B6A40FB7A">
+				<source xmi:idref="EAID_C7B390E7_9D78_49dc_8846_DAF686401728">
+					<model ea_localid="1468" type="Class" name="epo:SelectionEvaluationTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225">
-					<model ea_localid="916" type="Class" name="person:Person"/>
-					<role name="epo:playedBy" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_0C735489_15DC_40a7_A94E_A9202738B188">
+					<model ea_localid="890" type="Class" name="epo:EvaluationTerm"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4666"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2527"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:playedBy"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_1E87247C_598C_4f96_8D8A_71BD69D25161">
-				<source xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A">
-					<model ea_localid="1371" type="Class" name="epo:LotAwardOutcome"/>
+			<connector xmi:idref="EAID_B158E1D7_3CC5_4e64_8D25_C40F0E038224">
+				<source xmi:idref="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90">
+					<model ea_localid="892" type="Class" name="epo:ExclusionGround"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:hasFrameworkAgreementMaximumValue" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD">
+					<model ea_localid="2951" type="Class" name="epo:QualificationCriterion"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4680"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3053"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasFrameworkAgreementMaximumValue"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_8E7619CE_95A4_4f77_A6DC_62DFC84C122D">
-				<source xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A">
-					<model ea_localid="1371" type="Class" name="epo:LotAwardOutcome"/>
+			<connector xmi:idref="EAID_3EE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8">
+				<source xmi:idref="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53">
+					<model ea_localid="956" type="Class" name="epo:Tenderer"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:hasApproximateFrameworkAgreementValue" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90">
+					<model ea_localid="892" type="Class" name="epo:ExclusionGround"/>
+					<role name="epo:substantiatesExclusionGround" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4683"/>
+				<model ea_localid="1533"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The estimated value to be spent within the Framework Agreement(s).&#xA;&#xA;Additional information:&#xA;In the case of an Award Decision for a Lot, this relation represents the estimated value for the awarded Framework Agreement. &#xA;In the case of a Notice, this relation represents the estimated value for all Framework Agreements covered by the Notice.&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasApproximateFrameworkAgreementValue"/>
+				<labels rb="0..1" rt="+epo:substantiatesExclusionGround"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_96BA801A_E8C8_4628_94BC_1C90816E0487">
-				<source xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A">
-					<model ea_localid="1371" type="Class" name="epo:LotAwardOutcome"/>
+			<connector xmi:idref="EAID_08EBA2FE_CCEA_4eec_B375_3B680C3FD97A">
+				<source xmi:idref="EAID_AE22E69E_F035_4a34_A84F_629922B88DE1">
+					<model ea_localid="2592" type="Class" name="epo:ExclusionGroundsSummary"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
-					<model ea_localid="906" type="Class" name="epo:Lot"/>
-					<role name="epo:concernsLot" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89">
+					<model ea_localid="2950" type="Class" name="epo:QualificationCriteriaSummary"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2501"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3975"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="Relates to Lot."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:concernsLot"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_01B7EE24_F987_4c92_B06C_0EA23C9FD1C7">
-				<source xmi:idref="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2">
-					<model ea_localid="1654" type="Class" name="epo:LotGroupAwardInformation"/>
+			<connector xmi:idref="EAID_08E68AE5_54CB_40f5_8E56_373B9F10194E">
+				<source xmi:idref="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11">
+					<model ea_localid="1028" type="Class" name="epo:ExpressionOfInterest"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -35283,10 +37579,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:hasGroupFrameworkAgreementMaximumValue" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90">
+					<model ea_localid="976" type="Enumeration" name="at-voc:language"/>
+					<role name="epo:hasPreferredLanguageForProcurementDocument" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -35294,21 +37590,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2803"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="This corresponds to BT-156 in the eForms."/>
+				<model ea_localid="5311"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasGroupFrameworkAgreementMaximumValue"/>
+				<labels rb="0..*" rt="+epo:hasPreferredLanguageForProcurementDocument"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_4B36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
-				<source xmi:idref="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2">
-					<model ea_localid="1654" type="Class" name="epo:LotGroupAwardInformation"/>
+			<connector xmi:idref="EAID_81FE8191_9E68_4e72_AA85_FA3686506D94">
+				<source xmi:idref="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11">
+					<model ea_localid="1028" type="Class" name="epo:ExpressionOfInterest"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -35318,10 +37612,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
-					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
-					<role name="epo:describesLotGroup" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
+					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
+					<role name="epo:specifiesEconomicOperator" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -35329,21 +37623,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2811"/>
+				<model ea_localid="5309"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:describesLotGroup"/>
+				<labels rb="0..*" rt="+epo:specifiesEconomicOperator"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_0A7EDA02_3460_4960_8D22_F25373156526">
-				<source xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C">
-					<model ea_localid="1076" type="Class" name="epo-not:DirectAwardPrenotificationNotice"/>
+			<connector xmi:idref="EAID_DDF623FF_98AA_460a_A33E_F3B7832B7132">
+				<source xmi:idref="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11">
+					<model ea_localid="1028" type="Class" name="epo:ExpressionOfInterest"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -35353,10 +37647,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2">
-					<model ea_localid="1654" type="Class" name="epo:LotGroupAwardInformation"/>
-					<role name="epo:announcesLotGroupAwardInformation" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
+					<model ea_localid="922" type="Class" name="epo:Procedure"/>
+					<role name="epo:concernsProcedure" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -35364,21 +37658,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4644"/>
+				<model ea_localid="5306"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:announcesLotGroupAwardInformation"/>
+				<labels rb="1" rt="+epo:concernsProcedure"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9C6B2F1A_EF51_458e_A7C0_67100DC0E58E">
-				<source xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524">
-					<model ea_localid="1079" type="Class" name="epo-not:CompletionNotice"/>
+			<connector xmi:idref="EAID_A96B5FDE_85B9_4435_B7E7_D176E6996280">
+				<source xmi:idref="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029">
+					<model ea_localid="896" type="Class" name="epo:FrameworkAgreement"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -35388,9 +37682,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2">
-					<model ea_localid="1654" type="Class" name="epo:LotGroupAwardInformation"/>
-					<role name="epo:refersToLotGroupAwardInformation" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A">
+					<model ea_localid="1371" type="Class" name="epo:LotAwardOutcome"/>
+					<role name="epo:resultsFromLotAwardOutcome" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -35399,34 +37693,34 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4649"/>
+				<model ea_localid="2837"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:refersToLotGroupAwardInformation"/>
+				<labels rb="0..*" rt="+epo:resultsFromLotAwardOutcome"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_B6EB9836_FFEC_4652_9501_AB53057BAF53">
-				<source xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257">
-					<model ea_localid="1078" type="Class" name="epo-not:ContractModificationNotice"/>
+			<connector xmi:idref="EAID_D68065CA_2D18_479d_95EB_23D106ED6921">
+				<source xmi:idref="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8">
+					<model ea_localid="932" type="Class" name="epo:PurchaseContract"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2">
-					<model ea_localid="1654" type="Class" name="epo:LotGroupAwardInformation"/>
-					<role name="epo:refersToLotGroupAwardInformation" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029">
+					<model ea_localid="896" type="Class" name="epo:FrameworkAgreement"/>
+					<role name="epo:followsRulesSetBy" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -35434,56 +37728,55 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4657"/>
+				<model ea_localid="1527"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:refersToLotGroupAwardInformation"/>
+				<labels rb="0..1" rt="+epo:followsRulesSetBy"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_FA76DFA8_9FC1_4db0_86FF_2CE55FF62AB6">
-				<source xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2">
-					<model ea_localid="1077" type="Class" name="epo-not:ResultNotice"/>
+			<connector xmi:idref="EAID_D1D7983F_8387_4c3b_9950_CE4378AD01B0">
+				<source xmi:idref="EAID_D2862D88_92C5_4206_B142_36CDBA0095B8">
+					<model ea_localid="897" type="Class" name="epo:FrameworkAgreementTechnique"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2">
-					<model ea_localid="1654" type="Class" name="epo:LotGroupAwardInformation"/>
-					<role name="epo:announcesLotGroupAwardInformation" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_3780AA50_D898_4068_B300_47B46651CA0A">
+					<model ea_localid="953" type="Class" name="epo:Technique"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2808"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1525"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:announcesLotGroupAwardInformation"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A96EE97A_4EB7_40ad_BB96_01E8B1F3E49F">
-				<source xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
-					<model ea_localid="1772" type="Class" name="epo:LotSpecificTerm"/>
+			<connector xmi:idref="EAID_6591B482_9D9E_4650_897A_253ACD64FC8A">
+				<source xmi:idref="EAID_FA070646_D88B_493f_96AB_8417E2069155">
+					<model ea_localid="898" type="Class" name="epo:FrameworkAgreementTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -35493,8 +37786,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D">
-					<model ea_localid="1368" type="Class" name="epo:Term"/>
+				<target xmi:idref="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD">
+					<model ea_localid="1773" type="Class" name="epo:ProcedureSpecificTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -35504,7 +37797,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2965"/>
+				<model ea_localid="2983"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -35515,43 +37808,42 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_2EFFE2EC_6B27_4d48_B910_6C37C39CAAFC">
-				<source xmi:idref="EAID_E13C8393_D02E_4800_B8D5_38C02E2C8998">
-					<model ea_localid="941" type="Class" name="epo:SecurityClearanceTerm"/>
+			<connector xmi:idref="EAID_B02CD525_7AD7_45d7_B20C_514E7B961066">
+				<source xmi:idref="EAID_FA070646_D88B_493f_96AB_8417E2069155">
+					<model ea_localid="898" type="Class" name="epo:FrameworkAgreementTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
-					<model ea_localid="1772" type="Class" name="epo:LotSpecificTerm"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_2EEC390D_B44F_4505_8179_765B845FE27F">
+					<model ea_localid="1007" type="Enumeration" name="at-voc:framework-agreement"/>
+					<role name="epo:hasFrameworkAgreementType" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2973"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="1521"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The form of framework agreement used in a procurement procedure.&#xA;&#xA;Addition information:&#xA;&#xA;A concept to distinguish the different types of framework agreement, which are: &#xA;1. Framework agreement without reopening of competition,&#xA;2. Framework agreement with reopening of competition, or &#xA;3. Framework agreement partly without reopening of competition.&#xA;&#xA;WG Approval 19/09/2019 &#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="1" rt="+epo:hasFrameworkAgreementType"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_41D43466_5575_4752_B3BF_0CA7ADD341E4">
-				<source xmi:idref="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366">
-					<model ea_localid="1477" type="Class" name="epo:ParticipationRequestTerm"/>
+			<connector xmi:idref="EAID_F9E99464_DED7_437a_98F9_263E29761C37">
+				<source xmi:idref="EAID_FA070646_D88B_493f_96AB_8417E2069155">
+					<model ea_localid="898" type="Class" name="epo:FrameworkAgreementTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -35572,7 +37864,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2975"/>
+				<model ea_localid="2980"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -35583,146 +37875,143 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7DEB98FB_35C4_4015_80BE_9C778A0BA2A5">
-				<source xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
-					<model ea_localid="906" type="Class" name="epo:Lot"/>
+			<connector xmi:idref="EAID_3C2D8165_83BF_498f_B03B_E256F94C76B5">
+				<source xmi:idref="EAID_495BBB92_468A_4f08_9330_A0C75730B97A">
+					<model ea_localid="899" type="Class" name="epo:Fund"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
-					<model ea_localid="1772" type="Class" name="epo:LotSpecificTerm"/>
-					<role name="epo:isSubjectToLotSpecificTerm" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_62AEA02F_28F9_411d_9AF4_B6398F78199C">
+					<model ea_localid="2903" type="Enumeration" name="at-voc:EU-programme"/>
+					<role name="epo:hasFundProgramme" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2976"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
+				<model ea_localid="4449"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:isSubjectToLotSpecificTerm"/>
+				<labels rb="0..1" rt="+epo:hasFundProgramme"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_85E14E41_3BA7_4783_A633_615CD23835C1">
-				<source xmi:idref="EAID_82AA47D1_6939_4328_8108_0018817C75BD">
-					<model ea_localid="912" type="Class" name="epo:OpeningTerm"/>
+			<connector xmi:idref="EAID_0F625CFF_139F_4712_8BB6_681888ACB178">
+				<source xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
+					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
-					<model ea_localid="1772" type="Class" name="epo:LotSpecificTerm"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_495BBB92_468A_4f08_9330_A0C75730B97A">
+					<model ea_localid="899" type="Class" name="epo:Fund"/>
+					<role name="epo:isFundedBy" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2977"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="1617"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Funding is provided either completely or partially by a Fund.&#xA;&#xA;Additional information:&#xA;This corresponds in eForms to BG - 61 EU Funds (specified per Lot) and to BG - 611 Contract EU Funds (applied per Contract lot)&#xA;Funds may change between the lot and the contract, for example in the case of an emergency crisis, a contract may be financed by a budget that was not foreseen in the call.&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..*" rt="+epo:isFundedBy"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_8DB5DB8D_4E96_4679_A104_F62859765981">
-				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
-					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
+			<connector xmi:idref="EAID_6AA28D6E_E3E3_40d8_A409_4F5F708BC856">
+				<source xmi:idref="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4">
+					<model ea_localid="900" type="Class" name="epo:GreenProcurement"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
-					<model ea_localid="1772" type="Class" name="epo:LotSpecificTerm"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_B81500F4_C78F_4431_A0DA_EA1E43E5C728">
+					<model ea_localid="3081" type="Enumeration" name="at-voc:green-public-procurement-criteria"/>
+					<role name="epo:fulfillsRequirement" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2968"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="4729"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The requirement to which the concept meets.&#xA;WG Approval 09/11/2021&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..*" rt="+epo:fulfillsRequirement"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_AE27FB70_7F60_4b0a_84EA_F015F6FE1271">
-				<source xmi:idref="EAID_BA1BBA64_88B1_420e_8141_092908A95E2B">
-					<model ea_localid="3064" type="Class" name="epo:NonDisclosureAgreementTerm"/>
+			<connector xmi:idref="EAID_9E45040E_9573_4ec2_971F_0407E27D9413">
+				<source xmi:idref="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4">
+					<model ea_localid="900" type="Class" name="epo:GreenProcurement"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
-					<model ea_localid="1772" type="Class" name="epo:LotSpecificTerm"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_BF1B4E2A_7D4A_4247_8B45_5AD2427938E3">
+					<model ea_localid="974" type="Enumeration" name="at-voc:environmental-impact"/>
+					<role name="epo:fulfillsRequirement" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4692"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="1515"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The requirement to which the concept meets.&#xA;WG Approval 09/11/2021&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..*" rt="+epo:fulfillsRequirement"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_B3295353_448F_433c_921A_A4E96D0B2738">
-				<source xmi:idref="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8">
-					<model ea_localid="3090" type="Class" name="epo:ReviewTerm"/>
+			<connector xmi:idref="EAID_C15E132C_206B_4dd4_976E_204541847F5F">
+				<source xmi:idref="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4">
+					<model ea_localid="900" type="Class" name="epo:GreenProcurement"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -35732,8 +38021,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
-					<model ea_localid="1772" type="Class" name="epo:LotSpecificTerm"/>
+				<target xmi:idref="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA">
+					<model ea_localid="945" type="Class" name="epo:StrategicProcurement"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -35743,7 +38032,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4754"/>
+				<model ea_localid="1516"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -35754,78 +38043,78 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_EA8BA09A_3CC1_4c02_A5CD_27AE1D84CDDE">
-				<source xmi:idref="EAID_3F572668_3AED_4090_BAB3_9047B4874154">
-					<model ea_localid="909" type="Class" name="epo:MultipleStageProcedureTerm"/>
+			<connector xmi:idref="EAID_0BE43E48_CB11_4fae_87F3_C0ACAEAF591C">
+				<source xmi:idref="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0">
+					<model ea_localid="3084" type="Class" name="epo:VehicleInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
-					<model ea_localid="1772" type="Class" name="epo:LotSpecificTerm"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4">
+					<model ea_localid="900" type="Class" name="epo:GreenProcurement"/>
+					<role name="epo:concernsGreenProcurement" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2970"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4733"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relates to Green Procurement.&#xA;&#xA;WG approval 07/05/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo:concernsGreenProcurement"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_1605A6CC_6F4E_42f1_80CD_0C45E80E9AEE">
-				<source xmi:idref="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D">
-					<model ea_localid="923" type="Class" name="epo:ProcedureTerm"/>
+			<connector xmi:idref="EAID_ADB72D59_DC72_465e_97A2_B2C5B93B0F80">
+				<source xmi:idref="EAID_EC3D2F66_1FC6_4b4c_AAD2_04A3726B2332">
+					<model ea_localid="901" type="Class" name="epo:InnovativeProcurement"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_A312F200_1050_451d_97BB_07EBCE11D45C">
-					<model ea_localid="908" type="Class" name="epo:Mediator"/>
-					<role name="epo:definesMediator" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA">
+					<model ea_localid="945" type="Class" name="epo:StrategicProcurement"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2512"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1514"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating a ProcedureTerm has a Mediator."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:definesMediator"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_0EF2D4DC_7ED0_457c_8310_43761AC8295C">
-				<source xmi:idref="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5">
-					<model ea_localid="3009" type="Class" name="epo:MiniCompetitionAwardOutcome"/>
+			<connector xmi:idref="EAID_F362F8D3_4A45_4dc9_AC9E_9CBFCA6E5549">
+				<source xmi:idref="EAID_EC3D2F66_1FC6_4b4c_AAD2_04A3726B2332">
+					<model ea_localid="901" type="Class" name="epo:InnovativeProcurement"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -35835,10 +38124,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_6966846F_842F_4149_A95B_AE374D603608">
-					<model ea_localid="3006" type="Class" name="epo:SelectedCandidateList"/>
-					<role name="epo:resultsFromUsingCandidateList" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_6C0716CF_8E33_4ea7_972F_AB425AA26120">
+					<model ea_localid="975" type="Enumeration" name="at-voc:innovative-acquisition"/>
+					<role name="epo:fulfillsRequirement" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -35846,21 +38135,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4605"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="1513"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The requirement to which the concept meets.&#xA;WG Approval 09/11/2021&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:resultsFromUsingCandidateList"/>
+				<labels rb="0..*" rt="+epo:fulfillsRequirement"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_FF75C037_BE4C_49d2_A743_BAD5FFBD3003">
-				<source xmi:idref="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8">
-					<model ea_localid="932" type="Class" name="epo:PurchaseContract"/>
+			<connector xmi:idref="EAID_E3D7352D_80E6_41e6_B85A_672AACE795E2">
+				<source xmi:idref="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896">
+					<model ea_localid="3042" type="Class" name="epo:JuryMember"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -35870,9 +38157,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5">
-					<model ea_localid="3009" type="Class" name="epo:MiniCompetitionAwardOutcome"/>
-					<role name="epo:resultsFromMiniCompetitionAwardOutcome" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225">
+					<model ea_localid="916" type="Class" name="person:Person"/>
+					<role name="epo:playedBy" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -35881,21 +38168,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4603"/>
+				<model ea_localid="4666"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:resultsFromMiniCompetitionAwardOutcome"/>
+				<labels rb="0..1" rt="+epo:playedBy"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_EFDCE7F5_7EC7_4537_B26B_232F5FB37A9C">
-				<source xmi:idref="EAID_3F572668_3AED_4090_BAB3_9047B4874154">
-					<model ea_localid="909" type="Class" name="epo:MultipleStageProcedureTerm"/>
+			<connector xmi:idref="EAID_1E87247C_598C_4f96_8D8A_71BD69D25161">
+				<source xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A">
+					<model ea_localid="1371" type="Class" name="epo:LotAwardOutcome"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -35905,9 +38192,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969">
-					<model ea_localid="1698" type="Class" name="epo:Duration"/>
-					<role name="epo:hasQualificationSystemDuration" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:hasFrameworkAgreementMaximumValue" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -35916,21 +38203,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3315"/>
+				<model ea_localid="4680"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasQualificationSystemDuration"/>
+				<labels rb="0..1" rt="+epo:hasFrameworkAgreementMaximumValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_3FEA813D_50A9_4b54_8B7C_0A19B505F52F">
-				<source xmi:idref="EAID_3E3C6304_E823_43a1_8914_2046342E8F96">
-					<model ea_localid="3085" type="Class" name="epo:NonPublishedInformation"/>
+			<connector xmi:idref="EAID_32F239DB_02BC_456a_934F_BBF695929296">
+				<source xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A">
+					<model ea_localid="1371" type="Class" name="epo:LotAwardOutcome"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -35940,10 +38227,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
-					<model ea_localid="910" type="Class" name="epo:Notice"/>
-					<role name="epo:concernsNotice" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA">
+					<model ea_localid="945" type="Class" name="epo:StrategicProcurement"/>
+					<role name="epo:fulfillsStrategicProcurement" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -35951,21 +38238,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4734"/>
+				<model ea_localid="5475"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:concernsNotice"/>
+				<labels rb="0..*" rt="+epo:fulfillsStrategicProcurement"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_605B2EA3_201D_47cb_BCF7_9C5A5DD40C4B">
-				<source xmi:idref="EAID_3E3C6304_E823_43a1_8914_2046342E8F96">
-					<model ea_localid="3085" type="Class" name="epo:NonPublishedInformation"/>
+			<connector xmi:idref="EAID_8E7619CE_95A4_4f77_A6DC_62DFC84C122D">
+				<source xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A">
+					<model ea_localid="1371" type="Class" name="epo:LotAwardOutcome"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -35975,10 +38262,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo:relatesToEFormSectionIdentifier" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:hasApproximateFrameworkAgreementValue" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -35986,21 +38273,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4735"/>
+				<model ea_localid="4683"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The estimated value to be spent within the Framework Agreement(s).&#xA;&#xA;Additional information:&#xA;In the case of an Award Decision for a Lot, this relation represents the estimated value for the awarded Framework Agreement. &#xA;In the case of a Notice, this relation represents the estimated value for all Framework Agreements covered by the Notice.&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1..*" rt="+epo:relatesToEFormSectionIdentifier"/>
+				<labels rb="0..1" rt="+epo:hasApproximateFrameworkAgreementValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_632541C4_7CDB_4357_B46D_C59F2C5DFB96">
-				<source xmi:idref="EAID_3E3C6304_E823_43a1_8914_2046342E8F96">
-					<model ea_localid="3085" type="Class" name="epo:NonPublishedInformation"/>
+			<connector xmi:idref="EAID_96BA801A_E8C8_4628_94BC_1C90816E0487">
+				<source xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A">
+					<model ea_localid="1371" type="Class" name="epo:LotAwardOutcome"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36010,9 +38297,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_0164D322_9C4D_4db0_BDC4_2A3D0BC53931">
-					<model ea_localid="982" type="Enumeration" name="at-voc:non-publication-justification"/>
-					<role name="epo:hasNonPublicationJustification" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
+					<model ea_localid="906" type="Class" name="epo:Lot"/>
+					<role name="epo:concernsLot" visibility="Public" targetScope="instance"/>
 					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -36021,19 +38308,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4736"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The reason why data is not published. &#xA;WG Approval 11/06/2020 &#xA;"/>
+				<model ea_localid="2501"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Relates to Lot."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:hasNonPublicationJustification"/>
+				<labels rb="1" rt="+epo:concernsLot"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF">
-				<source xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
-					<model ea_localid="910" type="Class" name="epo:Notice"/>
+			<connector xmi:idref="EAID_01B7EE24_F987_4c92_B06C_0EA23C9FD1C7">
+				<source xmi:idref="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2">
+					<model ea_localid="1654" type="Class" name="epo:LotGroupAwardInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36043,10 +38332,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
-					<model ea_localid="906" type="Class" name="epo:Lot"/>
-					<role name="epo:refersToLot" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:hasGroupFrameworkAgreementMaximumValue" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -36054,21 +38343,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4691"/>
+				<model ea_localid="2803"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="This corresponds to BT-156 in the eForms."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1..*" rt="+epo:refersToLot"/>
+				<labels rb="0..1" rt="+epo:hasGroupFrameworkAgreementMaximumValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_3561E9C9_899A_4ca7_9CF4_9285C5C0CCEC">
-				<source xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
-					<model ea_localid="910" type="Class" name="epo:Notice"/>
+			<connector xmi:idref="EAID_4B36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
+				<source xmi:idref="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2">
+					<model ea_localid="1654" type="Class" name="epo:LotGroupAwardInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36078,10 +38367,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66">
-					<model ea_localid="977" type="Enumeration" name="at-voc:legal-basis"/>
-					<role name="epo:isBasedOnImplementingRegulation" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
+					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
+					<role name="epo:describesLotGroup" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -36089,19 +38378,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3049"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Indicates under which regulation a notice is created.&#xA;&#xA;WG Acceptance 06/09/2022"/>
+				<model ea_localid="2811"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:isBasedOnImplementingRegulation"/>
+				<labels rb="1" rt="+epo:describesLotGroup"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_3BC5D7DE_3CD8_46c6_9B27_A7A4C7B70604">
-				<source xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
-					<model ea_localid="910" type="Class" name="epo:Notice"/>
+			<connector xmi:idref="EAID_F890093A_076E_4f9b_9823_548DE5751CA7">
+				<source xmi:idref="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2">
+					<model ea_localid="1654" type="Class" name="epo:LotGroupAwardInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36111,10 +38402,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66">
-					<model ea_localid="977" type="Enumeration" name="at-voc:legal-basis"/>
-					<role name="epo:conformsToLegalBasis" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:hasApproximateGroupFrameworkAgreementValue" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -36122,19 +38413,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3050"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The Notice was designed in accordance with the given legal basis.&#xA;&#xA;Additional Information:&#xA;This Notice can be used for Procedures which do not have the same legal basis.&#xA;This holds for standard forms."/>
+				<model ea_localid="5445"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:conformsToLegalBasis"/>
+				<labels rb="0..1" rt="+epo:hasApproximateGroupFrameworkAgreementValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_6AA5ADDC_B303_41f6_A0B5_482CD2D1D30D">
-				<source xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
-					<model ea_localid="910" type="Class" name="epo:Notice"/>
+			<connector xmi:idref="EAID_0A7EDA02_3460_4960_8D22_F25373156526">
+				<source xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C">
+					<model ea_localid="1076" type="Class" name="epo-not:DirectAwardPrenotificationNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36144,10 +38437,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_C07688A9_AAC8_4f60_A2CC_FA90C006C282">
-					<model ea_localid="1096" type="Enumeration" name="at-voc:notice-type"/>
-					<role name="epo:hasNoticeType" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2">
+					<model ea_localid="1654" type="Class" name="epo:LotGroupAwardInformation"/>
+					<role name="epo:announcesLotGroupAwardInformation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -36155,32 +38448,34 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3051"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="4644"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:hasNoticeType"/>
+				<labels rb="0..*" rt="+epo:announcesLotGroupAwardInformation"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7EE70932_F57C_4861_BE52_91F3F7270840">
-				<source xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
-					<model ea_localid="910" type="Class" name="epo:Notice"/>
+			<connector xmi:idref="EAID_9C6B2F1A_EF51_458e_A7C0_67100DC0E58E">
+				<source xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524">
+					<model ea_localid="1079" type="Class" name="epo-not:CompletionNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
-					<model ea_localid="910" type="Class" name="epo:Notice"/>
-					<role name="epo:refersToNotice" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2">
+					<model ea_localid="1654" type="Class" name="epo:LotGroupAwardInformation"/>
+					<role name="epo:refersToLotGroupAwardInformation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -36188,21 +38483,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1598"/>
+				<model ea_localid="4649"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:refersToNotice"/>
+				<labels rb="0..*" rt="+epo:refersToLotGroupAwardInformation"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F337974A_F4B7_4be6_BD98_F885B35FD24B">
-				<source xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
-					<model ea_localid="910" type="Class" name="epo:Notice"/>
+			<connector xmi:idref="EAID_B6EB9836_FFEC_4652_9501_AB53057BAF53">
+				<source xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257">
+					<model ea_localid="1078" type="Class" name="epo-not:ContractModificationNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36212,10 +38507,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A">
-					<model ea_localid="1006" type="Enumeration" name="at-voc:form-type"/>
-					<role name="epo:hasFormType" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2">
+					<model ea_localid="1654" type="Class" name="epo:LotGroupAwardInformation"/>
+					<role name="epo:refersToLotGroupAwardInformation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -36223,19 +38518,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1451"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="A categorisation of the steps in which the Notice is used.&#xA;&#xA;WG Approval 12/05/2020&#xA;&#xA;"/>
+				<model ea_localid="4657"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasFormType"/>
+				<labels rb="0..*" rt="+epo:refersToLotGroupAwardInformation"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F955E894_651A_4a8b_A411_E8DA312BC449">
-				<source xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
-					<model ea_localid="910" type="Class" name="epo:Notice"/>
+			<connector xmi:idref="EAID_FA76DFA8_9FC1_4db0_86FF_2CE55FF62AB6">
+				<source xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2">
+					<model ea_localid="1077" type="Class" name="epo-not:ResultNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36245,10 +38542,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
-					<model ea_localid="922" type="Class" name="epo:Procedure"/>
-					<role name="epo:refersToProcedure" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2">
+					<model ea_localid="1654" type="Class" name="epo:LotGroupAwardInformation"/>
+					<role name="epo:announcesLotGroupAwardInformation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -36256,21 +38553,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4660"/>
+				<model ea_localid="2808"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:refersToProcedure"/>
+				<labels rb="0..*" rt="+epo:announcesLotGroupAwardInformation"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_05C9AA43_1AE1_4dbd_8080_CCC8C1824CB7">
-				<source xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257">
-					<model ea_localid="1078" type="Class" name="epo-not:ContractModificationNotice"/>
+			<connector xmi:idref="EAID_A96EE97A_4EB7_40ad_BB96_01E8B1F3E49F">
+				<source xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
+					<model ea_localid="1772" type="Class" name="epo:LotSpecificTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36280,8 +38577,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
-					<model ea_localid="910" type="Class" name="epo:Notice"/>
+				<target xmi:idref="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D">
+					<model ea_localid="1368" type="Class" name="epo:Term"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36291,7 +38588,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1773"/>
+				<model ea_localid="2965"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -36302,9 +38599,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_5217DA2B_F336_4793_85E1_6829959E93BB">
-				<source xmi:idref="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03">
-					<model ea_localid="3078" type="Class" name="epo-not:PreMarketConsultationNotice"/>
+			<connector xmi:idref="EAID_2EFFE2EC_6B27_4d48_B910_6C37C39CAAFC">
+				<source xmi:idref="EAID_E13C8393_D02E_4800_B8D5_38C02E2C8998">
+					<model ea_localid="941" type="Class" name="epo:SecurityClearanceTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36314,8 +38611,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
-					<model ea_localid="910" type="Class" name="epo:Notice"/>
+				<target xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
+					<model ea_localid="1772" type="Class" name="epo:LotSpecificTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36325,7 +38622,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4725"/>
+				<model ea_localid="2973"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -36336,9 +38633,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_95EED5E2_B9B4_4812_B1E5_07E432421C63">
-				<source xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524">
-					<model ea_localid="1079" type="Class" name="epo-not:CompletionNotice"/>
+			<connector xmi:idref="EAID_41D43466_5575_4752_B3BF_0CA7ADD341E4">
+				<source xmi:idref="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366">
+					<model ea_localid="1477" type="Class" name="epo:ParticipationRequestTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36348,8 +38645,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
-					<model ea_localid="910" type="Class" name="epo:Notice"/>
+				<target xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
+					<model ea_localid="1772" type="Class" name="epo:LotSpecificTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36359,7 +38656,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1774"/>
+				<model ea_localid="2975"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -36370,43 +38667,79 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9B54EEA9_42F0_4e42_A2F1_707153826314">
-				<source xmi:idref="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B">
-					<model ea_localid="1074" type="Class" name="epo-not:PlanningNotice"/>
+			<connector xmi:idref="EAID_505234FB_4CE0_475f_A94B_6552B0F5A59A">
+				<source xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
+					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
-					<model ea_localid="910" type="Class" name="epo:Notice"/>
+				<target xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
+					<model ea_localid="1772" type="Class" name="epo:LotSpecificTerm"/>
+					<role name="epo:isSubjectToLotSpecificTerm" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5476"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo:isSubjectToLotSpecificTerm"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_7DEB98FB_35C4_4015_80BE_9C778A0BA2A5">
+				<source xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
+					<model ea_localid="906" type="Class" name="epo:Lot"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
+					<model ea_localid="1772" type="Class" name="epo:LotSpecificTerm"/>
+					<role name="epo:isSubjectToLotSpecificTerm" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1769"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="2976"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..*" rt="+epo:isSubjectToLotSpecificTerm"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A87ED0E5_0C79_4015_8392_5BAE0E90B288">
-				<source xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2">
-					<model ea_localid="1077" type="Class" name="epo-not:ResultNotice"/>
+			<connector xmi:idref="EAID_85E14E41_3BA7_4783_A633_615CD23835C1">
+				<source xmi:idref="EAID_82AA47D1_6939_4328_8108_0018817C75BD">
+					<model ea_localid="912" type="Class" name="epo:OpeningTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36416,8 +38749,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
-					<model ea_localid="910" type="Class" name="epo:Notice"/>
+				<target xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
+					<model ea_localid="1772" type="Class" name="epo:LotSpecificTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36427,7 +38760,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1772"/>
+				<model ea_localid="2977"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -36438,9 +38771,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_AD106A36_48F1_47c9_A453_938579C970A7">
-				<source xmi:idref="EAID_17662AEF_1321_446a_AE42_0583F7417A79">
-					<model ea_localid="1075" type="Class" name="epo-not:CompetitionNotice"/>
+			<connector xmi:idref="EAID_8DB5DB8D_4E96_4679_A104_F62859765981">
+				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
+					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36450,8 +38783,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
-					<model ea_localid="910" type="Class" name="epo:Notice"/>
+				<target xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
+					<model ea_localid="1772" type="Class" name="epo:LotSpecificTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36461,7 +38794,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1770"/>
+				<model ea_localid="2968"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -36472,9 +38805,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_B825D1CD_744B_411b_A025_488C1781D353">
-				<source xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C">
-					<model ea_localid="1076" type="Class" name="epo-not:DirectAwardPrenotificationNotice"/>
+			<connector xmi:idref="EAID_AE27FB70_7F60_4b0a_84EA_F015F6FE1271">
+				<source xmi:idref="EAID_BA1BBA64_88B1_420e_8141_092908A95E2B">
+					<model ea_localid="3064" type="Class" name="epo:NonDisclosureAgreementTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36484,8 +38817,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
-					<model ea_localid="910" type="Class" name="epo:Notice"/>
+				<target xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
+					<model ea_localid="1772" type="Class" name="epo:LotSpecificTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36495,7 +38828,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1771"/>
+				<model ea_localid="4692"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -36506,79 +38839,77 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D3DD6F7E_CC4D_4861_963A_7FE0F57DA5D8">
-				<source xmi:idref="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB">
-					<model ea_localid="1664" type="Class" name="epo-acc:ESPDRequest"/>
+			<connector xmi:idref="EAID_B3295353_448F_433c_921A_A4E96D0B2738">
+				<source xmi:idref="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8">
+					<model ea_localid="3090" type="Class" name="epo:ReviewTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
-					<model ea_localid="910" type="Class" name="epo:Notice"/>
-					<role name="epo-acc:refersToNotice" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
+					<model ea_localid="1772" type="Class" name="epo:LotSpecificTerm"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4773"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4754"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="Reference to a Notice.&#xA;&#xA;WG approval 12/03/2024"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo-acc:refersToNotice"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_079E96B7_4324_4eba_B071_A8B833BDA1EF">
-				<source xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
-					<model ea_localid="1655" type="Class" name="epo:NoticeAwardInformation"/>
+			<connector xmi:idref="EAID_EA8BA09A_3CC1_4c02_A5CD_27AE1D84CDDE">
+				<source xmi:idref="EAID_3F572668_3AED_4090_BAB3_9047B4874154">
+					<model ea_localid="909" type="Class" name="epo:MultipleStageProcedureTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:hasMaximumFrameworkAgreementAwardedValue" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
+					<model ea_localid="1772" type="Class" name="epo:LotSpecificTerm"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2802"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2970"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="The maximum value which can be spent through all the framework agreements announced in this notice, including options and renewals of contracts.&#xA;&#xA;Additional information:&#xA;&#xA;The value provided is a threshold value that implicity means that it cannot be exceeded however it may not be reached during the execution of a contract.&#xA;&#xA;The Framework Agreements in a CAN are to be traced back and added to provide this value.&#xA;&#xA;This corresponds to the BT-118 in eForms.&#xA;&#xA;WG Approval 03/12/2019"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasMaximumFrameworkAgreementAwardedValue"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_38F70CB6_EA38_4786_82CF_5486AAD496C1">
-				<source xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
-					<model ea_localid="1655" type="Class" name="epo:NoticeAwardInformation"/>
+			<connector xmi:idref="EAID_1605A6CC_6F4E_42f1_80CD_0C45E80E9AEE">
+				<source xmi:idref="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D">
+					<model ea_localid="923" type="Class" name="epo:ProcedureTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36588,9 +38919,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C">
-					<model ea_localid="1076" type="Class" name="epo-not:DirectAwardPrenotificationNotice"/>
-					<role name="epo:describesDirectAwardPrenotificationNotice" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_A312F200_1050_451d_97BB_07EBCE11D45C">
+					<model ea_localid="908" type="Class" name="epo:Mediator"/>
+					<role name="epo:definesMediator" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -36599,21 +38930,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4640"/>
+				<model ea_localid="2512"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating a ProcedureTerm has a Mediator."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:describesDirectAwardPrenotificationNotice"/>
+				<labels rb="0..1" rt="+epo:definesMediator"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_510F8DDB_DB12_48df_92AE_A27F7DFCCAC3">
-				<source xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
-					<model ea_localid="1655" type="Class" name="epo:NoticeAwardInformation"/>
+			<connector xmi:idref="EAID_0EF2D4DC_7ED0_457c_8310_43761AC8295C">
+				<source xmi:idref="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5">
+					<model ea_localid="3009" type="Class" name="epo:MiniCompetitionAwardOutcome"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36623,9 +38954,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:hasProcurementHighestReceivedTenderValue" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_6966846F_842F_4149_A95B_AE374D603608">
+					<model ea_localid="3006" type="Class" name="epo:SelectedCandidateList"/>
+					<role name="epo:resultsFromUsingCandidateList" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -36634,21 +38965,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3179"/>
+				<model ea_localid="4605"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The highest received tender value for the procurement.&#xA;&#xA;Additional Information:&#xA;This corresponds to section II.1.7.3. according to Regulation (EU) 2015/1986."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasProcurementHighestReceivedTenderValue"/>
+				<labels rb="0..1" rt="+epo:resultsFromUsingCandidateList"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_59564C5C_30DE_429b_AE68_D4CA3CC6E260">
-				<source xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
-					<model ea_localid="1655" type="Class" name="epo:NoticeAwardInformation"/>
+			<connector xmi:idref="EAID_FF75C037_BE4C_49d2_A743_BAD5FFBD3003">
+				<source xmi:idref="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8">
+					<model ea_localid="932" type="Class" name="epo:PurchaseContract"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36658,9 +38989,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2">
-					<model ea_localid="1077" type="Class" name="epo-not:ResultNotice"/>
-					<role name="epo:describesResultNotice" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5">
+					<model ea_localid="3009" type="Class" name="epo:MiniCompetitionAwardOutcome"/>
+					<role name="epo:resultsFromMiniCompetitionAwardOutcome" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -36669,21 +39000,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2812"/>
+				<model ea_localid="4603"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:describesResultNotice"/>
+				<labels rb="0..1" rt="+epo:resultsFromMiniCompetitionAwardOutcome"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_653ADA02_9DFC_48b4_A935_786F35AF2AFB">
-				<source xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
-					<model ea_localid="1655" type="Class" name="epo:NoticeAwardInformation"/>
+			<connector xmi:idref="EAID_E9E2A1B8_A705_4847_8FE6_3B40BD241A4B">
+				<source xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36693,9 +39024,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:hasApproximateFrameworkAgreementValue" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_FBD046CD_CD18_4d96_99E0_63CAC8A5D594">
+					<model ea_localid="1034" type="Enumeration" name="at-voc:currency"/>
+					<role name="epo:hasCurrency" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -36704,19 +39035,17 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4682"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="The estimated value to be spent within the Framework Agreement(s).&#xA;&#xA;Additional information:&#xA;In the case of an Award Decision for a Lot, this relation represents the estimated value for the awarded Framework Agreement. &#xA;In the case of a Notice, this relation represents the estimated value for all Framework Agreements covered by the Notice.&#xA;"/>
+				<model ea_localid="1730"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The identifier of the currency as in the standard code list used. &#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasApproximateFrameworkAgreementValue"/>
+				<labels rb="0..1" rt="+epo:hasCurrency"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_949017B7_0159_4fe1_8469_562A93DEF12E">
+			<connector xmi:idref="EAID_079E96B7_4324_4eba_B071_A8B833BDA1EF">
 				<source xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
 					<model ea_localid="1655" type="Class" name="epo:NoticeAwardInformation"/>
 					<role visibility="Public" targetScope="instance"/>
@@ -36730,7 +39059,7 @@
 				</source>
 				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
 					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:hasProcurementLowestReceivedTenderValue" visibility="Public" targetScope="instance"/>
+					<role name="epo:hasMaximumFrameworkAgreementAwardedValue" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -36739,21 +39068,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3178"/>
+				<model ea_localid="2802"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The lowest received tender value for the procurement.&#xA;&#xA;Additional Information:&#xA;This corresponds to section II.1.7.2. according to Regulation (EU) 2015/1986."/>
+				<documentation value="The maximum value which can be spent through all the framework agreements announced in this notice, including options and renewals of contracts.&#xA;&#xA;Additional information:&#xA;&#xA;The value provided is a threshold value that implicity means that it cannot be exceeded however it may not be reached during the execution of a contract.&#xA;&#xA;The Framework Agreements in a CAN are to be traced back and added to provide this value.&#xA;&#xA;This corresponds to the BT-118 in eForms.&#xA;&#xA;WG Approval 03/12/2019"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasProcurementLowestReceivedTenderValue"/>
+				<labels rb="0..1" rt="+epo:hasMaximumFrameworkAgreementAwardedValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C8D53635_0827_4589_A374_A1CFC018D076">
-				<source xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
-					<model ea_localid="1655" type="Class" name="epo:NoticeAwardInformation"/>
+			<connector xmi:idref="EAID_11ACAC30_71BA_444b_B7E9_7062F4927536">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36765,8 +39094,8 @@
 				</source>
 				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
 					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:hasTotalAwardedValue" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<role name="epo-inv:hasTotalTaxAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -36774,21 +39103,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2801"/>
+				<model ea_localid="5367"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The awarded value of all lots announced in this notice, including options and renewals. &#xA;&#xA;Additional information:&#xA;The values of the individual Lots awarded under a framework agreement and mentioned in this notice are included.&#xA;&#xA;The values of the individual lots announced in a CAN are to be traced back and added to provide this value.&#xA;&#xA;This corresponds to the BT-161 in eForms.&#xA;&#xA;WG Approval 03/12/2019&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasTotalAwardedValue"/>
+				<labels rb="0..*" rt="+epo-inv:hasTotalTaxAmount"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_76074F10_F8BD_4e56_929F_478C3A0B8424">
-				<source xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C">
-					<model ea_localid="1076" type="Class" name="epo-not:DirectAwardPrenotificationNotice"/>
+			<connector xmi:idref="EAID_14B7672E_A531_45a7_BB29_EB9C02AF1551">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36798,10 +39127,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
-					<model ea_localid="1655" type="Class" name="epo:NoticeAwardInformation"/>
-					<role name="epo:announcesNoticeAwardInformation" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasPrepaidAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -36809,21 +39138,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4639"/>
+				<model ea_localid="5370"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:announcesNoticeAwardInformation"/>
+				<labels rb="0..*" rt="+epo-ord:hasPrepaidAmount"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9C96E83D_792B_44cd_BDF4_F589B6CAC7A1">
-				<source xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257">
-					<model ea_localid="1078" type="Class" name="epo-not:ContractModificationNotice"/>
+			<connector xmi:idref="EAID_202AF5A1_B4FE_48a4_91D4_F6387465413F">
+				<source xmi:idref="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1">
+					<model ea_localid="2041" type="Class" name="epo-ord:AllowanceChargeInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36833,9 +39162,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
-					<model ea_localid="1655" type="Class" name="epo:NoticeAwardInformation"/>
-					<role name="epo:refersToNoticeAwardInformation" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:isCalculatedOn" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -36844,21 +39173,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4655"/>
+				<model ea_localid="4245"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The monetary amount to which the multiplier factor is applied in calculating the amount of this allowance or charge.&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:refersToNoticeAwardInformation"/>
+				<labels rb="0..1" rt="+epo:isCalculatedOn"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_BBBA098A_C04A_4c7d_A8BE_2A965642DCD3">
-				<source xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524">
-					<model ea_localid="1079" type="Class" name="epo-not:CompletionNotice"/>
+			<connector xmi:idref="EAID_2729D2D0_C843_497f_B19D_1727246FC1BD">
+				<source xmi:idref="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F">
+					<model ea_localid="3087" type="Class" name="epo-con:ContractAmendment"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36868,9 +39197,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
-					<model ea_localid="1655" type="Class" name="epo:NoticeAwardInformation"/>
-					<role name="epo:refersToNoticeAwardInformation" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:updatesContractValue" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -36879,21 +39208,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4651"/>
+				<model ea_localid="4724"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:refersToNoticeAwardInformation"/>
+				<labels rb="0..1" rt="+epo:updatesContractValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F053A3B1_64BB_454a_8FCF_CE8415CE3F22">
-				<source xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2">
-					<model ea_localid="1077" type="Class" name="epo-not:ResultNotice"/>
+			<connector xmi:idref="EAID_29D3C49F_AF44_49ad_8519_B199CADD080B">
+				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
+					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36903,9 +39232,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
-					<model ea_localid="1655" type="Class" name="epo:NoticeAwardInformation"/>
-					<role name="epo:announcesNoticeAwardInformation" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasTotalTaxInclusiveAmount" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -36914,21 +39243,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2809"/>
+				<model ea_localid="4309"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:announcesNoticeAwardInformation"/>
+				<labels rb="0..1" rt="+epo-ord:hasTotalTaxInclusiveAmount"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_B44261EC_B8C1_4e5a_9174_C3DEEEA32848">
-				<source xmi:idref="EAID_C52C2B8E_EBBE_4a9a_A48C_B479107AD49E">
-					<model ea_localid="2626" type="Class" name="epo:OfferIssuer"/>
+			<connector xmi:idref="EAID_2C64F9E7_B02B_4433_AB2C_0A6E23A8559E">
+				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
+					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36938,10 +39267,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF">
-					<model ea_localid="2625" type="Class" name="epo:Offer"/>
-					<role name="epo:distributesOffer" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasTotalTaxExclusiveAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -36949,89 +39278,91 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4058"/>
+				<model ea_localid="4308"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:distributesOffer"/>
+				<labels rb="0..1" rt="+epo-ord:hasTotalTaxExclusiveAmount"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_199C3BDF_913A_42e4_A409_64CB2CE61248">
-				<source xmi:idref="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53">
-					<model ea_localid="956" type="Class" name="epo:Tenderer"/>
+			<connector xmi:idref="EAID_2E9FE66A_E025_4563_9A59_461990838D96">
+				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
+					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
-					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ful:hasConsignmentInvoiceValue" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1363"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4052"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Declared amount of the Consignment.&#xA;&#xA;Additional Information:&#xA;This is a logistics information needed for logistics, security measures, customs check, etc.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo-ful:hasConsignmentInvoiceValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_5729A98B_A925_4816_AEF4_9EBDE5851B98">
-				<source xmi:idref="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51">
-					<model ea_localid="2202" type="Class" name="epo:OtherEntity"/>
+			<connector xmi:idref="EAID_3127E296_9886_44bc_86E7_B4E433F87208">
+				<source xmi:idref="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A">
+					<model ea_localid="1544" type="Class" name="epo:SubmissionStatisticalInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
-					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:hasHighestReceivedTenderValue" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3523"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="2796"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Amount of the Tender with the highest value.&#xA;&#xA;Additional Information&#xA;The value must correspond to an admissible tender. For example, tenders compliant with the procurement document requirements, not having an abnormally low price or cost, etc. &#xA;&#xA;&#xA;WG Approval 12/12/2019&#xA;&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo:hasHighestReceivedTenderValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7775FD52_1FE1_445c_9B8B_96AA208D3134">
-				<source xmi:idref="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D">
-					<model ea_localid="3474" type="Class" name="epo-sub:LegalRepresentative"/>
+			<connector xmi:idref="EAID_357DB7CB_140F_4167_B4ED_129923676841">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -37041,10 +39372,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
-					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
-					<role name="epo:actsOnBehalfOf" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasTotalTaxExclusiveAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -37052,305 +39383,313 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="5262"/>
+				<model ea_localid="5365"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:actsOnBehalfOf"/>
+				<labels rb="1..*" rt="+epo-ord:hasTotalTaxExclusiveAmount"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7B0A44E0_63E1_4c30_AB83_DA8166C24C14">
-				<source xmi:idref="EAID_4E7C30BC_ABE6_4736_8E07_54ED87CB1179">
-					<model ea_localid="1046" type="Class" name="epo:ReviewRequester"/>
-					<role visibility="Public"/>
-					<type aggregation="none"/>
+			<connector xmi:idref="EAID_470D1B16_C07B_4868_91B2_799578663395">
+				<source xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4">
+					<model ea_localid="2818" type="Class" name="epo-ord:TaxInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="AllowDuplicates=0;Derived=0;Union=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
-					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
-					<role visibility="Public"/>
-					<type aggregation="none"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:isCalculatedOn" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="AllowDuplicates=0;Derived=0;Union=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1742"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4322"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The monetary amount to which the multiplier factor is applied in calculating the amount of this allowance or charge."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
-				<extendedProperties/>
+				<labels rb="0..1" rt="+epo:isCalculatedOn"/>
+				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A27A53B2_A6D1_4fdd_A43E_D33DC6607852">
-				<source xmi:idref="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7">
-					<model ea_localid="947" type="Class" name="epo:Subcontractor"/>
+			<connector xmi:idref="EAID_47E28283_E9BB_4790_9AB4_37A6F31DF36A">
+				<source xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
+					<model ea_localid="1831" type="Class" name="epo-cat:Price"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
-					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasGrossMonetaryValue" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1384"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="5422"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo-ord:hasGrossMonetaryValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A641D156_C668_4cc3_9877_03C8FEE30681">
-				<source xmi:idref="EAID_C52C2B8E_EBBE_4a9a_A48C_B479107AD49E">
-					<model ea_localid="2626" type="Class" name="epo:OfferIssuer"/>
+			<connector xmi:idref="EAID_5009F883_10B2_4e9c_96A3_A1F92BE8EA63">
+				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
+					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
-					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ful:hasConsignmentFreeOnBoardValue" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4057"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4254"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The Monetary Value of the Consignment when there is a transfer of liability for goods, damaged or destroyed, during shipping.&#xA;&#xA;at the exporter's customs frontier."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo-ful:hasConsignmentFreeOnBoardValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A88E2729_62D9_493c_8105_4D93D49DFA8A">
-				<source xmi:idref="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01">
-					<model ea_localid="2018" type="Class" name="epo-ord:Seller"/>
+			<connector xmi:idref="EAID_510F8DDB_DB12_48df_92AE_A27F7DFCCAC3">
+				<source xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
+					<model ea_localid="1655" type="Class" name="epo:NoticeAwardInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
-					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:hasProcurementHighestReceivedTenderValue" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3265"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="3179"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The highest received tender value for the procurement.&#xA;&#xA;Additional Information:&#xA;This corresponds to section II.1.7.3. according to Regulation (EU) 2015/1986."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo:hasProcurementHighestReceivedTenderValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_ACAE27B9_7F0D_4491_BDBC_A13B860A4535">
-				<source xmi:idref="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3">
-					<model ea_localid="2017" type="Class" name="epo-ful:Despatcher"/>
+			<connector xmi:idref="EAID_516CC611_B255_4c67_AAF8_2E19960E553F">
+				<source xmi:idref="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1">
+					<model ea_localid="2041" type="Class" name="epo-ord:AllowanceChargeInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
-					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-cat:hasAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3264"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="3213"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The predetermined monetary value charged in addition to the price.&#xA;&#xA;WG approval 26/07/2022"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="1" rt="+epo-cat:hasAmount"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D2C94CC0_A14F_4c9c_B4C0_912C9C11EC4E">
-				<source xmi:idref="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD">
-					<model ea_localid="1605" type="Class" name="epo-cat:Manufacturer"/>
+			<connector xmi:idref="EAID_55AE269D_7874_4515_A52E_6EBA9F23871A">
+				<source xmi:idref="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E">
+					<model ea_localid="1650" type="Class" name="epo:SubcontractingEstimate"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
-					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:hasSubcontractingEstimatedValue" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2725"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="1386"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The estimated value of a single subcontract.&#xA;&#xA;This relates to BT-553 in eForms.&#xA;&#xA;WG Approval 01/09/2020&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo:hasSubcontractingEstimatedValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_E4D55FF7_2180_4a21_A34C_23F9AB59E814">
-				<source xmi:idref="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3">
-					<model ea_localid="962" type="Class" name="epo:Winner"/>
+			<connector xmi:idref="EAID_569C582B_2F50_4a11_B7B6_50CA2F0A9B94">
+				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
+					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
-					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ful:hasConsignmentDeclaredStatisticsValue" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1358"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4253"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo-ful:hasConsignmentDeclaredStatisticsValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_15042E3E_B61C_4d75_BF56_83000481AB12">
-				<source xmi:idref="EAID_82AA47D1_6939_4328_8108_0018817C75BD">
-					<model ea_localid="912" type="Class" name="epo:OpeningTerm"/>
+			<connector xmi:idref="EAID_5A597CB9_3064_430b_A49F_DC0D80093AA3">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD">
-					<model ea_localid="1773" type="Class" name="epo:ProcedureSpecificTerm"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-inv:hasTotalAccountingCurrencyTaxAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4802"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="5368"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..*" rt="+epo-inv:hasTotalAccountingCurrencyTaxAmount"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A8CBD7C1_E82A_4979_98A5_58BD6A43131C">
-				<source xmi:idref="EAID_82AA47D1_6939_4328_8108_0018817C75BD">
-					<model ea_localid="912" type="Class" name="epo:OpeningTerm"/>
+			<connector xmi:idref="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8">
+				<source xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
+					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_29678A10_6473_461a_BE84_76269B5BBD68">
-					<model ea_localid="851" type="Class" name="locn:Address"/>
-					<role name="epo:definesOpeningPlace" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:hasLaunchFrameworkAgreementMaximumValue" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -37359,34 +39698,34 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1704"/>
+				<model ea_localid="2799"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The place where the tenders will be publicly opened.&#xA;&#xA;WG Approval 10-10-2019"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:definesOpeningPlace"/>
+				<labels rb="0..1" rt="+epo:hasLaunchFrameworkAgreementMaximumValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_0AA8BD10_946A_403c_B906_6DB183F74D9F">
-				<source xmi:idref="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D">
-					<model ea_localid="914" type="Class" name="epo:OrganisationGroup"/>
+			<connector xmi:idref="EAID_5EDC73B7_1ABC_4e6f_9003_79369EBD749D">
+				<source xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+					<model ea_localid="3581" type="Class" name="epo-inv:InvoiceLine"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
-					<model ea_localid="913" type="Class" name="org:Organization"/>
-					<role name="epo:hasMember" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-inv:hasNetAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -37394,68 +39733,69 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1447"/>
+				<model ea_localid="5381"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1..*" rt="+epo:hasMember"/>
+				<labels rb="1" rt="+epo-inv:hasNetAmount"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_881F7772_9A6C_4e5a_BB86_A2E25524B058">
-				<source xmi:idref="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D">
-					<model ea_localid="914" type="Class" name="epo:OrganisationGroup"/>
+			<connector xmi:idref="EAID_653ADA02_9DFC_48b4_A935_786F35AF2AFB">
+				<source xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
+					<model ea_localid="1655" type="Class" name="epo:NoticeAwardInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
-					<model ea_localid="913" type="Class" name="org:Organization"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:hasApproximateFrameworkAgreementValue" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3189"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4682"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The estimated value to be spent within the Framework Agreement(s).&#xA;&#xA;Additional information:&#xA;In the case of an Award Decision for a Lot, this relation represents the estimated value for the awarded Framework Agreement. &#xA;In the case of a Notice, this relation represents the estimated value for all Framework Agreements covered by the Notice.&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo:hasApproximateFrameworkAgreementValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F3F440DD_AB87_4730_A6DF_915A5FB0B3DB">
-				<source xmi:idref="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D">
-					<model ea_localid="914" type="Class" name="epo:OrganisationGroup"/>
+			<connector xmi:idref="EAID_6B579730_463A_4857_B85E_6B8274FE3291">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
-					<model ea_localid="913" type="Class" name="org:Organization"/>
-					<role name="epo:leadBy" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasTotalChargeAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -37463,21 +39803,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1446"/>
+				<model ea_localid="5363"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The epo:OrganisationGroup epo:leadBy org:Organization was implemented to be used in case of an Economic Operator Group."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:leadBy"/>
-				<extendedProperties/>
+				<labels rb="0..*" rt="+epo-ord:hasTotalChargeAmount"/>
+				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_976D38A5_94EF_4bae_941E_311C9FC4668A">
-				<source xmi:idref="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809">
-					<model ea_localid="2362" type="Class" name="epo-ord:OriginatorInformation"/>
+			<connector xmi:idref="EAID_6D0F07D8_06B8_43e0_AB80_8F686D5C488E">
+				<source xmi:idref="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC">
+					<model ea_localid="1543" type="Class" name="epo:ReviewRequest"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -37487,9 +39827,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_23E9784F_4AEE_4484_9BAC_28A7FEB05838">
-					<model ea_localid="2630" type="Class" name="epo:OriginatorRequest"/>
-					<role name="epo-ord:concernsOriginatorRequest" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:hasReviewRequestFee" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -37498,21 +39838,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4072"/>
+				<model ea_localid="2851"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Additional information:&#xA;This relation corresponds in eForms to BT-795	    Review Request Fee."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ord:concernsOriginatorRequest"/>
+				<labels rb="0..1" rt="+epo:hasReviewRequestFee"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_76DEFDDE_AF78_4e23_8B84_0C6E8B387AD5">
-				<source xmi:idref="EAID_432BFDAD_99CD_40ab_A159_824F0F6571E2">
-					<model ea_localid="2589" type="Class" name="epo:ParticipationCondition"/>
+			<connector xmi:idref="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7">
+				<source xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
+					<model ea_localid="1831" type="Class" name="epo-cat:Price"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -37522,77 +39862,80 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_B81F2C0E_31F9_4ec0_AC1E_A0960D618FE6">
-					<model ea_localid="991" type="Enumeration" name="at-voc:reserved-procurement"/>
-					<role name="epo:hasReservedProcurement" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-cat:hasNetMonetaryValue" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation/>
+					<documentation value="The price amount of an Item exclusive of taxes and after substracting price discounts. "/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1495"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Explanation as to whether a procurement may be reserved for the participation of certain types of organisation.&#xA;&#xA;Additional information:&#xA;This property corresponds in eForms to the BT-71&#xA;WG Approval 09/11/2021&#xA;"/>
+				<model ea_localid="3055"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasReservedProcurement"/>
+				<labels rb="1" rt="+epo-cat:hasNetMonetaryValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_E51D25BC_E9FB_423c_BFBF_00E3B99864B4">
-				<source xmi:idref="EAID_432BFDAD_99CD_40ab_A159_824F0F6571E2">
-					<model ea_localid="2589" type="Class" name="epo:ParticipationCondition"/>
+			<connector xmi:idref="EAID_72A7614C_D179_4558_8F62_2FA41A99DF74">
+				<source xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
+					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4">
-					<model ea_localid="924" type="Class" name="epo:ProcurementCriterion"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:hasEstimatedValue" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3974"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4820"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="A forecast of the value of the procurement before competition.&#xA;&#xA;Additional Information:&#xA;Different cases of estimated values may refer to a lot, the global value of the procedure, or of a combinatorial value of a group of lots.&#xA;The forecast is calculated by the buyer and covers all revenues  whether coming from the buyer or third parties.&#xA;See for example recital (19), Article 5 of Directive 2014/24/EU and other articles from the rest of Directives about procurement.&#xA;&#xA;In the case of framework agreements and dynamic purchasing systems this refers to the maximum estimated value.&#xA;&#xA;This property corresponds to BT-27 in eForms (for Lot and Procedure) and can be used for BT-157 (for LotGroup).&#xA;&lt;b&gt;&#xA;&lt;/b&gt;WG Approval 05/12/2019&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo:hasEstimatedValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_0EC24453_1D32_4b47_B797_31C56125A97E">
-				<source xmi:idref="EAID_44E6EE1C_AF22_4586_B990_EF3674BAE826">
-					<model ea_localid="2591" type="Class" name="epo:ParticipationConditionsSummary"/>
+			<connector xmi:idref="EAID_77A962A1_6ADC_4a69_9C87_1543CFCC17D9">
+				<source xmi:idref="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7">
+					<model ea_localid="2078" type="Class" name="epo:ProcurementElement"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_B81F2C0E_31F9_4ec0_AC1E_A0960D618FE6">
-					<model ea_localid="991" type="Enumeration" name="at-voc:reserved-procurement"/>
-					<role name="epo:hasReservedProcurement" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:hasEstimatedValue" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -37600,53 +39943,56 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4566"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Explanation as to whether a procurement may be reserved for the participation of certain types of organisation.&#xA;&#xA;Additional information:&#xA;This property corresponds in eForms to the BT-71&#xA;WG Approval 09/11/2021&#xA;"/>
+				<model ea_localid="1423"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="A forecast of the value of the procurement before competition.&#xA;&#xA;Additional Information:&#xA;Different cases of estimated values may refer to a lot, the global value of the procedure, or of a combinatorial value of a group of lots.&#xA;The forecast is calculated by the buyer and covers all revenues  whether coming from the buyer or third parties.&#xA;See for example recital (19), Article 5 of Directive 2014/24/EU and other articles from the rest of Directives about procurement.&#xA;&#xA;In the case of framework agreements and dynamic purchasing systems this refers to the maximum estimated value.&#xA;&#xA;This property corresponds to BT-27 in eForms (for Lot and Procedure) and can be used for BT-157 (for LotGroup).&#xA;&lt;b&gt;&#xA;&lt;/b&gt;&lt;b&gt;WG Approval 05/12/2019&lt;/b&gt;&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasReservedProcurement"/>
+				<labels rb="0..1" rt="+epo:hasEstimatedValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_EE3FD9AF_3712_4b11_9970_82968E7EB99F">
-				<source xmi:idref="EAID_44E6EE1C_AF22_4586_B990_EF3674BAE826">
-					<model ea_localid="2591" type="Class" name="epo:ParticipationConditionsSummary"/>
+			<connector xmi:idref="EAID_7A92C123_93F7_4d51_A677_A1E36D3B53C0">
+				<source xmi:idref="EAID_93ACA540_2668_42d3_BE40_C921C05C776E">
+					<model ea_localid="1685" type="Class" name="epo:TenderGroup"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D">
-					<model ea_localid="2590" type="Class" name="epo:ProcurementCriteriaSummary"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:hasTotalValue" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3976"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="2867"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo:hasTotalValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_5CFE789F_365A_4f79_AABC_E6BE700C4FCC">
-				<source xmi:idref="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366">
-					<model ea_localid="1477" type="Class" name="epo:ParticipationRequestTerm"/>
+			<connector xmi:idref="EAID_7AAF3614_44A0_4944_8E1A_EF574D760E6F">
+				<source xmi:idref="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31">
+					<model ea_localid="2905" type="Class" name="epo-con:Deliverable"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -37656,9 +40002,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_572B82B3_FF4C_43b8_9C2C_09AD5D3F4615">
-					<model ea_localid="1340" type="Class" name="epo:ParticipationRequestProcessor"/>
-					<role name="epo:definesParticipationRequestProcessor" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:hasTotalValue" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -37667,21 +40013,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2544"/>
+				<model ea_localid="4463"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating a ParticipationRequestTerm has a ParticipationRequestProcessor."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:definesParticipationRequestProcessor"/>
+				<labels rb="0..1" rt="+epo:hasTotalValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_255D53F4_253B_4698_B2EF_82E934FAC2F4">
-				<source xmi:idref="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366">
-					<model ea_localid="1477" type="Class" name="epo:ParticipationRequestTerm"/>
+			<connector xmi:idref="EAID_87123434_C2AD_43de_925D_13E9A7667A18">
+				<source xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4">
+					<model ea_localid="2818" type="Class" name="epo-ord:TaxInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -37691,9 +40037,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_9403AC67_80A3_4c77_9299_6171EF9D6788">
-					<model ea_localid="1341" type="Class" name="epo:ParticipationRequestReceiver"/>
-					<role name="epo:definesParticipationRequestReceiver" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-cat:hasAmount" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -37702,21 +40048,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2543"/>
+				<model ea_localid="4321"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating a ParticipationRequestTerm has a ParticipationRequestReceiver."/>
+				<documentation value="The predetermined monetary value charged in addition to the price.&#xA;&#xA;WG approval 26/07/2022&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:definesParticipationRequestReceiver"/>
+				<labels rb="0..1" rt="+epo-cat:hasAmount"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_EBC0DED2_0415_4ef8_A495_71F8920238AD">
-				<source xmi:idref="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496">
-					<model ea_localid="921" type="Class" name="epo:Prize"/>
+			<connector xmi:idref="EAID_8A3AB883_9FE4_42fd_AFC8_322B44CBDADD">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -37728,8 +40074,8 @@
 				</source>
 				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
 					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:hasPrizeValue" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<role name="epo-ord:hasAmountDueForPayment" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -37737,68 +40083,69 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2784"/>
+				<model ea_localid="5372"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The monetary value of a prize, if any, for the winner (or runners-up) of the design contest.&#xA;&#xA;Additional Information:&#xA;This corresponds to BT-644 in eForms.&#xA;&#xA;WG Approval 29/08/2019&#xA;&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasPrizeValue"/>
+				<labels rb="1" rt="+epo-ord:hasAmountDueForPayment"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A5B20E6A_8922_4f1d_9A94_0EFFDFC4B060">
-				<source xmi:idref="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD">
-					<model ea_localid="1773" type="Class" name="epo:ProcedureSpecificTerm"/>
+			<connector xmi:idref="EAID_8DBBB829_4470_4b0d_A142_494C41C8807D">
+				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
+					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D">
-					<model ea_localid="1368" type="Class" name="epo:Term"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasTotalLineAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2964"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4307"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="1" rt="+epo-ord:hasTotalLineAmount"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_1C8C734E_FD33_4153_9939_FA613CEB5D22">
-				<source xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
-					<model ea_localid="922" type="Class" name="epo:Procedure"/>
+			<connector xmi:idref="EAID_949017B7_0159_4fe1_8469_562A93DEF12E">
+				<source xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
+					<model ea_localid="1655" type="Class" name="epo:NoticeAwardInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD">
-					<model ea_localid="1773" type="Class" name="epo:ProcedureSpecificTerm"/>
-					<role name="epo:isSubjectToProcedureSpecificTerm" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:hasProcurementLowestReceivedTenderValue" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -37806,136 +40153,139 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1426"/>
+				<model ea_localid="3178"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The lowest received tender value for the procurement.&#xA;&#xA;Additional Information:&#xA;This corresponds to section II.1.7.2. according to Regulation (EU) 2015/1986."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1..*" rt="+epo:isSubjectToProcedureSpecificTerm"/>
+				<labels rb="0..1" rt="+epo:hasProcurementLowestReceivedTenderValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_4C36EE86_0569_4453_9E13_5EC63FC08031">
-				<source xmi:idref="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D">
-					<model ea_localid="923" type="Class" name="epo:ProcedureTerm"/>
+			<connector xmi:idref="EAID_98D513D4_9622_4217_94D7_26E6E451AF0C">
+				<source xmi:idref="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A">
+					<model ea_localid="1544" type="Class" name="epo:SubmissionStatisticalInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD">
-					<model ea_localid="1773" type="Class" name="epo:ProcedureSpecificTerm"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:hasLowestReceivedTenderValue" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2979"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="2795"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Amount of the Tender with the lowest value.&#xA;&#xA;Additional Information&#xA;The value must correspond to an admissible tender. For example, tenders compliant with the procurement document requirements, not having an abnormally low price or cost, etc. &#xA;&#xA;WG Approval 12/12/2019&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo:hasLowestReceivedTenderValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_6248DC7A_ACC5_4553_92ED_5A488B7D6FC6">
-				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
-					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
+			<connector xmi:idref="EAID_9BEABBA1_FA04_4d98_97DE_5E69567FADBC">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD">
-					<model ea_localid="1773" type="Class" name="epo:ProcedureSpecificTerm"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasTotalAllowanceAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3275"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="5362"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..*" rt="+epo-ord:hasTotalAllowanceAmount"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C7F7FABE_11B6_42f1_8310_BCB1832C647A">
-				<source xmi:idref="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8">
-					<model ea_localid="3090" type="Class" name="epo:ReviewTerm"/>
+			<connector xmi:idref="EAID_9BF032E2_6893_45df_95FE_A08E92EA8618">
+				<source xmi:idref="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9">
+					<model ea_localid="3466" type="Class" name="epo-sub:NationalPreQualificationData"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD">
-					<model ea_localid="1773" type="Class" name="epo:ProcedureSpecificTerm"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-sub:providesOrganisationFinancialCapability" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4831"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="5180"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="A monetary amount representing the financial capability of the Organization.&#xA;&#xA;Additional information:&#xA;Used to represent the general Turnover of the Organization (for statistical purposes).&#xA;&#xA;WG approval 05/03/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo-sub:providesOrganisationFinancialCapability"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
-				<tags/>
-			</connector>
-			<connector xmi:idref="EAID_44CFA3B0_EE66_4ace_9069_38D7A3B7A01C">
-				<source xmi:idref="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D">
-					<model ea_localid="923" type="Class" name="epo:ProcedureTerm"/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_A110770D_19E8_400c_A438_44EEAB172389">
+				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
+					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
-					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
-					<role name="epo:definesLotGroup" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasTotalAllowanceAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -37943,89 +40293,91 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1460"/>
+				<model ea_localid="4310"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating a ProcedureTerm has a LotGroup."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:definesLotGroup"/>
+				<labels rb="0..1" rt="+epo-ord:hasTotalAllowanceAmount"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_01F4D5D0_A9BC_466c_B263_41FB53AE1719">
-				<source xmi:idref="EAID_7D5A2915_BFCE_41da_BDCF_E7310A70B190">
-					<model ea_localid="1911" type="Class" name="epo:ProcessPlanningTerm"/>
+			<connector xmi:idref="EAID_A13D1892_1403_4dcc_B7C6_33C21269E183">
+				<source xmi:idref="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32">
+					<model ea_localid="1675" type="Class" name="epo:ReviewDecision"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D">
-					<model ea_localid="1368" type="Class" name="epo:Term"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:hasRemedyValue" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3102"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="2850"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Additional information:&#xA;This relation corresponds in eForms to BT-793	    Review Remedy Value."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo:hasRemedyValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_48B39F0F_A79C_4ac8_995B_59C79DE365BD">
-				<source xmi:idref="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89">
-					<model ea_localid="2950" type="Class" name="epo:QualificationCriteriaSummary"/>
+			<connector xmi:idref="EAID_A287E36F_7CEB_4668_B1A5_01DDEE025D3A">
+				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
+					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D">
-					<model ea_localid="2590" type="Class" name="epo:ProcurementCriteriaSummary"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ful:hasDeclaredStatisticalValue" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4518"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="5394"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The Monetary Value declared for statistical purposes.&#xA;&#xA;WG approval 10/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo-ful:hasDeclaredStatisticalValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_DB9BB27E_7F36_41c3_8166_36C3538F2F3A">
-				<source xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
-					<model ea_localid="922" type="Class" name="epo:Procedure"/>
+			<connector xmi:idref="EAID_AB852C7E_4390_46da_9255_1C4C8BE7B02F">
+				<source xmi:idref="EAID_C215EC75_82FD_45d3_832A_B3989A897692">
+					<model ea_localid="2615" type="Class" name="epo-ful:GoodsItem"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -38035,9 +40387,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D">
-					<model ea_localid="2590" type="Class" name="epo:ProcurementCriteriaSummary"/>
-					<role name="epo:specifiesProcurementCriteriaSummary" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ful:hasDeclaredStatisticalValue" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -38046,21 +40398,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2536"/>
+				<model ea_localid="4022"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:specifiesProcurementCriteriaSummary"/>
+				<labels rb="0..*" rt="+epo-ful:hasDeclaredStatisticalValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_277C636A_D943_484f_A80D_69ACBFA6147C">
-				<source xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4">
-					<model ea_localid="924" type="Class" name="epo:ProcurementCriterion"/>
+			<connector xmi:idref="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC">
+				<source xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
+					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -38070,9 +40422,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_D278CCD5_4E82_42f5_9A9B_C25371C94006">
-					<model ea_localid="985" type="Enumeration" name="at-voc:number-weight"/>
-					<role name="epo:hasWeightValueType" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:hasLaunchFrameworkAgreementMaximumValue" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -38081,19 +40433,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1693"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="No definition. Waiting on CCCEV alignment.&#xA;&#xA;&#xA;"/>
+				<model ea_localid="4681"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasWeightValueType"/>
+				<labels rb="0..1" rt="+epo:hasLaunchFrameworkAgreementMaximumValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_849B9DC8_4F7D_4023_8EA7_36C327FE63FE">
-				<source xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4">
-					<model ea_localid="924" type="Class" name="epo:ProcurementCriterion"/>
+			<connector xmi:idref="EAID_B20953AE_CF64_46a1_9C57_33B27067739D">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -38103,64 +40457,67 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_FAC84DE8_1A2E_4a6f_9F36_38EB360ACD58">
-					<model ea_localid="990" type="Enumeration" name="at-voc:requirement-stage"/>
-					<role name="epo:hasPerformingStaffQualificationInformation" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasRoundingAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation value="Explanation as to if and/or when information of the persons to carry out the contract is to be provided.&#xA;WG Approval 09/11/2021&#xA;&#xA;The codelist to be used is at-voc:requirement-stage which is available at http://publications.europa.eu/resource/dataset/requirement-stage&#xA;"/>
+					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1492"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="&#xA;Additional information: &#xA;&#xA;This relation corresponds in eForms to BT-79."/>
+				<model ea_localid="5371"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasPerformingStaffQualificationInformation"/>
+				<labels rb="0..1" rt="+epo-ord:hasRoundingAmount"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_03FC1FD2_BDF5_4ae5_8D8D_679E9486EE84">
-				<source xmi:idref="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD">
-					<model ea_localid="2951" type="Class" name="epo:QualificationCriterion"/>
+			<connector xmi:idref="EAID_BB64ED52_1D30_4395_ABC1_3473F1CBCDE7">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4">
-					<model ea_localid="924" type="Class" name="epo:ProcurementCriterion"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasTotalLineAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4519"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="5364"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="1..*" rt="+epo-ord:hasTotalLineAmount"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_18CF5F1B_45DD_4b29_9E28_8D741E0840F3">
-				<source xmi:idref="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB">
-					<model ea_localid="1664" type="Class" name="epo-acc:ESPDRequest"/>
+			<connector xmi:idref="EAID_C3F576CC_0DFC_40d6_86C4_6F47177DB0C6">
+				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
+					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -38170,10 +40527,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4">
-					<model ea_localid="924" type="Class" name="epo:ProcurementCriterion"/>
-					<role name="epo:specifiesProcurementCriterion" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasRoundingAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -38181,21 +40538,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4776"/>
+				<model ea_localid="4313"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1..*" rt="+epo:specifiesProcurementCriterion"/>
+				<labels rb="0..1" rt="+epo-ord:hasRoundingAmount"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4">
-				<source xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
-					<model ea_localid="906" type="Class" name="epo:Lot"/>
+			<connector xmi:idref="EAID_C753CDC6_88B6_449b_B44C_0F56A31472A7">
+				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
+					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -38205,10 +40562,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4">
-					<model ea_localid="924" type="Class" name="epo:ProcurementCriterion"/>
-					<role name="epo:specifiesProcurementCriterion" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasPrepaidAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -38216,21 +40573,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3063"/>
+				<model ea_localid="4312"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:specifiesProcurementCriterion"/>
+				<labels rb="0..1" rt="+epo-ord:hasPrepaidAmount"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_FC7073E1_3362_472f_B087_27A619B6C819">
-				<source xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
-					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
+			<connector xmi:idref="EAID_C8D53635_0827_4589_A374_A1CFC018D076">
+				<source xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
+					<model ea_localid="1655" type="Class" name="epo:NoticeAwardInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -38240,10 +40597,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4">
-					<model ea_localid="924" type="Class" name="epo:ProcurementCriterion"/>
-					<role name="epo:specifiesProcurementCriterion" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:hasTotalAwardedValue" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -38251,89 +40608,91 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3007"/>
+				<model ea_localid="2801"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The awarded value of all lots announced in this notice, including options and renewals. &#xA;&#xA;Additional information:&#xA;The values of the individual Lots awarded under a framework agreement and mentioned in this notice are included.&#xA;&#xA;The values of the individual lots announced in a CAN are to be traced back and added to provide this value.&#xA;&#xA;This corresponds to the BT-161 in eForms.&#xA;&#xA;WG Approval 03/12/2019&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:specifiesProcurementCriterion"/>
+				<labels rb="0..1" rt="+epo:hasTotalAwardedValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_4E94CD77_EB61_4a9e_A6A4_14096262384A">
-				<source xmi:idref="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB">
-					<model ea_localid="1664" type="Class" name="epo-acc:ESPDRequest"/>
+			<connector xmi:idref="EAID_CBE972DE_D8B8_42a5_A6A1_F386873985BC">
+				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
+					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3">
-					<model ea_localid="926" type="Class" name="epo:ProcurementDocument"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasAmountDueForPayment" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2817"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4314"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="1" rt="+epo-ord:hasAmountDueForPayment"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A00448A7_8270_497c_9895_20BF2C6316EF">
-				<source xmi:idref="EAID_F5AE8AA9_91EE_4cb3_AE98_14D4AF1A77C1">
-					<model ea_localid="951" type="Class" name="epo:TechnicalSpecification"/>
+			<connector xmi:idref="EAID_D7964CE9_B09A_4855_B489_34E46CFF8E24">
+				<source xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
+					<model ea_localid="958" type="Class" name="epo:Tender"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3">
-					<model ea_localid="926" type="Class" name="epo:ProcurementDocument"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:hasFinancialOfferValue" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1373"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="1361"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The value offered by the Tenderer for a Lot.&#xA;&#xA;Additional Information:&#xA;This value is normally the one awarded for a winning Tender Lot. In case of negotiated procedures the original financial value may be reviewed and the offer updated.&#xA;&#xA;This corresponds to BT-720 in eForms."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo:hasFinancialOfferValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7B7715A6_6B94_492e_9116_A734400E6358">
-				<source xmi:idref="EAID_1062E1ED_D094_425e_B51B_9E700090C968">
-					<model ea_localid="1946" type="Class" name="epo:ProcurementProcessInformation"/>
+			<connector xmi:idref="EAID_EBC0DED2_0415_4ef8_A495_71F8920238AD">
+				<source xmi:idref="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496">
+					<model ea_localid="921" type="Class" name="epo:Prize"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -38343,9 +40702,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
-					<model ea_localid="906" type="Class" name="epo:Lot"/>
-					<role name="epo:concernsLot" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:hasPrizeValue" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -38354,21 +40713,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3107"/>
+				<model ea_localid="2784"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relates to Lot."/>
+				<documentation value="The monetary value of a prize, if any, for the winner (or runners-up) of the design contest.&#xA;&#xA;Additional Information:&#xA;This corresponds to BT-644 in eForms.&#xA;&#xA;WG Approval 29/08/2019&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:concernsLot"/>
+				<labels rb="0..1" rt="+epo:hasPrizeValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_ABA2D6DE_6BD5_49b4_9900_A82C2C734195">
-				<source xmi:idref="EAID_1062E1ED_D094_425e_B51B_9E700090C968">
-					<model ea_localid="1946" type="Class" name="epo:ProcurementProcessInformation"/>
+			<connector xmi:idref="EAID_F78CF3B1_3FB3_43b9_B9AB_1FE660C3663F">
+				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
+					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -38378,9 +40737,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
-					<model ea_localid="922" type="Class" name="epo:Procedure"/>
-					<role name="epo:concernsProcedure" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasTotalChargeAmount" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -38389,21 +40748,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3111"/>
+				<model ea_localid="4311"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relates to Procedure."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:concernsProcedure"/>
+				<labels rb="0..1" rt="+epo-ord:hasTotalChargeAmount"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_28460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
-				<source xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
-					<model ea_localid="922" type="Class" name="epo:Procedure"/>
+			<connector xmi:idref="EAID_F8221739_F0D9_41f5_A179_C864AC960D8F">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -38413,10 +40772,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_49EC0F16_408C_4b28_B611_0048946DC070">
-					<model ea_localid="927" type="Class" name="epo:ProcurementServiceProvider"/>
-					<role name="epo:isExecutedByProcurementServiceProvider" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo-ord:hasTotalTaxInclusiveAmount" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -38424,89 +40783,89 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2510"/>
+				<model ea_localid="5366"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:isExecutedByProcurementServiceProvider"/>
+				<labels rb="1..*" rt="+epo-ord:hasTotalTaxInclusiveAmount"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A5FB826B_2F91_4a40_97ED_A515BDF3B98B">
-				<source xmi:idref="EAID_F6DB02CC_2D4E_4a02_B1E9_538EB3E24ED2">
-					<model ea_localid="3135" type="Note"/>
+			<connector xmi:idref="EAID_3FEA813D_50A9_4b54_8B7C_0A19B505F52F">
+				<source xmi:idref="EAID_3E3C6304_E823_43a1_8914_2046342E8F96">
+					<model ea_localid="3085" type="Class" name="epo:NonPublishedInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_49EC0F16_408C_4b28_B611_0048946DC070">
-					<model ea_localid="927" type="Class" name="epo:ProcurementServiceProvider"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
+					<model ea_localid="910" type="Class" name="epo:Notice"/>
+					<role name="epo:concernsNotice" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4814"/>
-				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<model ea_localid="4734"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
-				<documentation/>
+				<parameterSubstitutions/>
+				<documentation value="Relates to Notice. &#xA;&#xA;WG approval 14/05/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="1" rt="+epo:concernsNotice"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_4A4C0A9C_E865_4a6a_B108_12037190211E">
-				<source xmi:idref="EAID_CACB5357_5E4E_455f_8BFF_A7D6264C2555">
-					<model ea_localid="2943" type="Class" name="epo:ProfessionalSuitabilitySummary"/>
+			<connector xmi:idref="EAID_632541C4_7CDB_4357_B46D_C59F2C5DFB96">
+				<source xmi:idref="EAID_3E3C6304_E823_43a1_8914_2046342E8F96">
+					<model ea_localid="3085" type="Class" name="epo:NonPublishedInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB">
-					<model ea_localid="2593" type="Class" name="epo:SelectionCriteriaSummary"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_0164D322_9C4D_4db0_BDC4_2A3D0BC53931">
+					<model ea_localid="982" type="Enumeration" name="at-voc:non-publication-justification"/>
+					<role name="epo:hasNonPublicationJustification" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4513"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="4736"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The reason why data is not published. &#xA;WG Approval 11/06/2020 &#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="1" rt="+epo:hasNonPublicationJustification"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_EC04B8A5_6281_4f14_8017_204CCE05A2CC">
-				<source xmi:idref="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4">
-					<model ea_localid="2635" type="Class" name="epo:Project"/>
+			<connector xmi:idref="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF">
+				<source xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
+					<model ea_localid="910" type="Class" name="epo:Notice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -38516,10 +40875,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
+					<model ea_localid="906" type="Class" name="epo:Lot"/>
+					<role name="epo:refersToLot" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -38527,21 +40886,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4076"/>
+				<model ea_localid="4691"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="A unique identifier of the instance of the concept.&#xA;&#xA;Additional Information&#xA;&#xA;For example, in the case of the Procurement Identifier, this could be the European Public Procurement Identifier, and/or any other identifier provided by the buyer, the service provider or any other stakeholder.&#xA;&#xA;WG Approval 12/11/2019&#xA;&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+adms:identifier"/>
+				<labels rb="1..*" rt="+epo:refersToLot"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9866393B_8067_4f18_9B28_69541B862505">
-				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
-					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
+			<connector xmi:idref="EAID_3561E9C9_899A_4ca7_9CF4_9285C5C0CCEC">
+				<source xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
+					<model ea_localid="910" type="Class" name="epo:Notice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -38551,9 +40910,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4">
-					<model ea_localid="2635" type="Class" name="epo:Project"/>
-					<role name="epo:refersToProject" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66">
+					<model ea_localid="977" type="Enumeration" name="at-voc:legal-basis"/>
+					<role name="epo:isBasedOnImplementingRegulation" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -38562,55 +40921,52 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4074"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="3049"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="Indicates under which regulation a notice is created.&#xA;&#xA;WG Acceptance 06/09/2022"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:refersToProject"/>
+				<labels rb="0..1" rt="+epo:isBasedOnImplementingRegulation"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_8D1FC032_83F1_4753_BF39_B673852D3F9A">
-				<source xmi:idref="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB">
-					<model ea_localid="2593" type="Class" name="epo:SelectionCriteriaSummary"/>
+			<connector xmi:idref="EAID_3BC5D7DE_3CD8_46c6_9B27_A7A4C7B70604">
+				<source xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
+					<model ea_localid="910" type="Class" name="epo:Notice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89">
-					<model ea_localid="2950" type="Class" name="epo:QualificationCriteriaSummary"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66">
+					<model ea_localid="977" type="Enumeration" name="at-voc:legal-basis"/>
+					<role name="epo:conformsToLegalBasis" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3977"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="3050"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The Notice was designed in accordance with the given legal basis.&#xA;&#xA;Additional Information:&#xA;This Notice can be used for Procedures which do not have the same legal basis.&#xA;This holds for standard forms."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..*" rt="+epo:conformsToLegalBasis"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A04862A6_080C_43b0_8DCE_04D577B2D3F0">
-				<source xmi:idref="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD">
-					<model ea_localid="2951" type="Class" name="epo:QualificationCriterion"/>
+			<connector xmi:idref="EAID_6AA5ADDC_B303_41f6_A0B5_482CD2D1D30D">
+				<source xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
+					<model ea_localid="910" type="Class" name="epo:Notice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -38620,10 +40976,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD">
-					<model ea_localid="2951" type="Class" name="epo:QualificationCriterion"/>
-					<role name="epo:includesNationalCriterion" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_C07688A9_AAC8_4f60_A2CC_FA90C006C282">
+					<model ea_localid="1096" type="Enumeration" name="at-voc:notice-type"/>
+					<role name="epo:hasNoticeType" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -38631,89 +40987,87 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4948"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="Relation indicating that a Criterion contains a Criterion that is specific to a given Member State.&#xA;&#xA;Additional Information:&#xA;In the ESPD, a Subcriterion is used to define national sub-criteria; maps to a UBL-2.3 cac:SubTenderingCriterion class. It is currently used only for purely national criteria, to be able to establish the mapping from eCertis.&#xA;&#xA;WG approval 07/11/2023&#xA;&#xA;"/>
+				<model ea_localid="3051"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:includesNationalCriterion"/>
+				<labels rb="1" rt="+epo:hasNoticeType"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_B61D93A6_A88F_4730_93D5_612F44B8ECE4">
-				<source xmi:idref="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122">
-					<model ea_localid="942" type="Class" name="epo:SelectionCriterion"/>
+			<connector xmi:idref="EAID_7EE70932_F57C_4861_BE52_91F3F7270840">
+				<source xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
+					<model ea_localid="910" type="Class" name="epo:Notice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD">
-					<model ea_localid="2951" type="Class" name="epo:QualificationCriterion"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
+					<model ea_localid="910" type="Class" name="epo:Notice"/>
+					<role name="epo:refersToNotice" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1394"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="1598"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo:refersToNotice"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7B3A32F2_68B4_4cca_AA0C_F4AAB1D0346B">
-				<source xmi:idref="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32">
-					<model ea_localid="1675" type="Class" name="epo:ReviewDecision"/>
+			<connector xmi:idref="EAID_F337974A_F4B7_4be6_BD98_F885B35FD24B">
+				<source xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
+					<model ea_localid="910" type="Class" name="epo:Notice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1">
-					<model ea_localid="1677" type="Class" name="epo:ReviewObject"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A">
+					<model ea_localid="1006" type="Enumeration" name="at-voc:form-type"/>
+					<role name="epo:hasFormType" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2844"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="1451"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="A categorisation of the steps in which the Notice is used.&#xA;&#xA;WG Approval 12/05/2020&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo:hasFormType"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9663763E_2F48_4952_926C_444F368462AA">
-				<source xmi:idref="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32">
-					<model ea_localid="1675" type="Class" name="epo:ReviewDecision"/>
+			<connector xmi:idref="EAID_F955E894_651A_4a8b_A411_E8DA312BC449">
+				<source xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
+					<model ea_localid="910" type="Class" name="epo:Notice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -38723,9 +41077,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC">
-					<model ea_localid="1543" type="Class" name="epo:ReviewRequest"/>
-					<role name="epo:resolvesReviewRequest" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
+					<model ea_localid="922" type="Class" name="epo:Procedure"/>
+					<role name="epo:refersToProcedure" visibility="Public" targetScope="instance"/>
 					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -38734,223 +41088,225 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3132"/>
+				<model ea_localid="4660"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:resolvesReviewRequest"/>
+				<labels rb="1" rt="+epo:refersToProcedure"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9D50C424_E7E2_4c52_B4E8_8A666E94C5BA">
-				<source xmi:idref="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32">
-					<model ea_localid="1675" type="Class" name="epo:ReviewDecision"/>
+			<connector xmi:idref="EAID_05C9AA43_1AE1_4dbd_8080_CCC8C1824CB7">
+				<source xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257">
+					<model ea_localid="1078" type="Class" name="epo-not:ContractModificationNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_E95530AB_B746_4056_8805_0F3BB79051BE">
-					<model ea_localid="1680" type="Enumeration" name="at-voc:remedy-type"/>
-					<role name="epo:providesRulingOnRemedy" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
+					<model ea_localid="910" type="Class" name="epo:Notice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3133"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="States  the measures to be taken after a review procedure."/>
+				<model ea_localid="1773"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:providesRulingOnRemedy"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A13D1892_1403_4dcc_B7C6_33C21269E183">
-				<source xmi:idref="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32">
-					<model ea_localid="1675" type="Class" name="epo:ReviewDecision"/>
+			<connector xmi:idref="EAID_95EED5E2_B9B4_4812_B1E5_07E432421C63">
+				<source xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524">
+					<model ea_localid="1079" type="Class" name="epo-not:CompletionNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:hasRemedyValue" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
+					<model ea_localid="910" type="Class" name="epo:Notice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2850"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1774"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="Additional information:&#xA;This relation corresponds in eForms to BT-793	    Review Remedy Value."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasRemedyValue"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_BB4CF849_5E86_494d_AD24_2A89B4A5DAF1">
-				<source xmi:idref="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32">
-					<model ea_localid="1675" type="Class" name="epo:ReviewDecision"/>
+			<connector xmi:idref="EAID_9B54EEA9_42F0_4e42_A2F1_707153826314">
+				<source xmi:idref="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B">
+					<model ea_localid="1074" type="Class" name="epo-not:PlanningNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_0CC18385_984E_4d4c_A942_07304CE66481">
-					<model ea_localid="1537" type="Enumeration" name="at-voc:irregularity-type"/>
-					<role name="epo:hasConfirmedIrregularityType" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
+					<model ea_localid="910" type="Class" name="epo:Notice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2667"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Additional information:&#xA;This relation corresponds in eForms to    BT-791	    Review Irregularity Type"/>
+				<model ea_localid="1769"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasConfirmedIrregularityType"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_E9C9B328_DB7C_4af2_A37A_DA236E1A8FE3">
-				<source xmi:idref="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32">
-					<model ea_localid="1675" type="Class" name="epo:ReviewDecision"/>
+			<connector xmi:idref="EAID_A1DC6D24_EABE_467c_80DC_91F8A4D3F0DE">
+				<source xmi:idref="EAID_6553D38F_A9F2_4458_A1C3_A0E883EA3F03">
+					<model ea_localid="3078" type="Class" name="epo-not:PreMarketConsultationNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_C1D5C542_388C_4d77_B0AA_8B1D0C8C20CA">
-					<model ea_localid="1678" type="Enumeration" name="at-voc:review-decision-type"/>
-					<role name="epo:hasReviewDecisionType" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
+					<model ea_localid="910" type="Class" name="epo:Notice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2848"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Additional information:&#xA;This relation corresponds in eForms to BT-790	    Review Decision Type."/>
+				<model ea_localid="5448"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasReviewDecisionType"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_70BE7952_3EF2_47d7_9AF0_B6AC86597613">
-				<source xmi:idref="EAID_07601514_1C57_47ce_9A2D_CD97C5116067">
-					<model ea_localid="938" type="Class" name="epo:Reviewer"/>
+			<connector xmi:idref="EAID_A87ED0E5_0C79_4015_8392_5BAE0E90B288">
+				<source xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2">
+					<model ea_localid="1077" type="Class" name="epo-not:ResultNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_5466880A_1E58_432c_BA75_7B4EA81152C8">
-					<model ea_localid="3040" type="Enumeration" name="at-voc:review-body-type"/>
-					<role name="epo:hasReviewBodyType" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
+					<model ea_localid="910" type="Class" name="epo:Notice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4662"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="1772"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasReviewBodyType"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_1B531817_E843_4c42_8EA1_111804B30C38">
-				<source xmi:idref="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8">
-					<model ea_localid="3090" type="Class" name="epo:ReviewTerm"/>
+			<connector xmi:idref="EAID_AD106A36_48F1_47c9_A453_938579C970A7">
+				<source xmi:idref="EAID_17662AEF_1321_446a_AE42_0583F7417A79">
+					<model ea_localid="1075" type="Class" name="epo-not:CompetitionNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_07601514_1C57_47ce_9A2D_CD97C5116067">
-					<model ea_localid="938" type="Class" name="epo:Reviewer"/>
-					<role name="epo:definesReviewer" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
+					<model ea_localid="910" type="Class" name="epo:Notice"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4756"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1770"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating a ReviewTerm has a Reviewer."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:definesReviewer"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_484BA28E_0C28_4b4b_B440_E1E735697188">
-				<source xmi:idref="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A">
-					<model ea_localid="1681" type="Class" name="epo:ReviewIrregularitySummary"/>
+			<connector xmi:idref="EAID_B825D1CD_744B_411b_A025_488C1781D353">
+				<source xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C">
+					<model ea_localid="1076" type="Class" name="epo-not:DirectAwardPrenotificationNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -38960,8 +41316,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_4F81C811_16F5_4332_BAEA_9843D331872F">
-					<model ea_localid="944" type="Class" name="epo:StatisticalInformation"/>
+				<target xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
+					<model ea_localid="910" type="Class" name="epo:Notice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -38971,7 +41327,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2862"/>
+				<model ea_localid="1771"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -38982,9 +41338,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_FA7858FE_BA9B_4d0a_88C5_0D1CAE6FE311">
-				<source xmi:idref="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A">
-					<model ea_localid="1681" type="Class" name="epo:ReviewIrregularitySummary"/>
+			<connector xmi:idref="EAID_D3DD6F7E_CC4D_4861_963A_7FE0F57DA5D8">
+				<source xmi:idref="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB">
+					<model ea_localid="1664" type="Class" name="epo-acc:ESPDRequest"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -38994,10 +41350,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_0CC18385_984E_4d4c_A942_07304CE66481">
-					<model ea_localid="1537" type="Enumeration" name="at-voc:irregularity-type"/>
-					<role name="epo:hasIrregularityType" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
+					<model ea_localid="910" type="Class" name="epo:Notice"/>
+					<role name="epo-acc:refersToNotice" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -39005,19 +41361,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2853"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Additional information:&#xA;This relation corresponds in eForms to    BT-636	        Buyer Review Requests Irregularity Type"/>
+				<model ea_localid="4773"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Reference to a Notice.&#xA;&#xA;WG approval 12/03/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:hasIrregularityType"/>
+				<labels rb="0..*" rt="+epo-acc:refersToNotice"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_29EB89B4_BF73_4250_B00A_CDF53D99CBCD">
-				<source xmi:idref="EAID_92AE6E92_3A20_4642_A531_93ABFC476500">
-					<model ea_localid="1542" type="Class" name="epo:ReviewRequestSummary"/>
+			<connector xmi:idref="EAID_38F70CB6_EA38_4786_82CF_5486AAD496C1">
+				<source xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
+					<model ea_localid="1655" type="Class" name="epo:NoticeAwardInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -39027,10 +41385,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A">
-					<model ea_localid="1681" type="Class" name="epo:ReviewIrregularitySummary"/>
-					<role name="epo:hasReviewIrregularitySummary" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C">
+					<model ea_localid="1076" type="Class" name="epo-not:DirectAwardPrenotificationNotice"/>
+					<role name="epo:describesDirectAwardPrenotificationNotice" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -39038,21 +41396,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2852"/>
+				<model ea_localid="4640"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Additional information:&#xA;This relation corresponds in eForms to   BG-613	    Buyer Review Requests"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasReviewIrregularitySummary"/>
+				<labels rb="0..1" rt="+epo:describesDirectAwardPrenotificationNotice"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_4C33CDC7_EDE9_461d_85E1_1ABB6B9E21EB">
-				<source xmi:idref="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1">
-					<model ea_localid="1677" type="Class" name="epo:ReviewObject"/>
+			<connector xmi:idref="EAID_59564C5C_30DE_429b_AE68_D4CA3CC6E260">
+				<source xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
+					<model ea_localid="1655" type="Class" name="epo:NoticeAwardInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -39062,9 +41420,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1">
-					<model ea_localid="1677" type="Class" name="epo:ReviewObject"/>
-					<role name="epo:refersToPreviousReview" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2">
+					<model ea_localid="1077" type="Class" name="epo-not:ResultNotice"/>
+					<role name="epo:describesResultNotice" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -39073,55 +41431,56 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2846"/>
+				<model ea_localid="2812"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Additional information:&#xA;This relation corresponds in eForms to BT-785 &quot;Review Previous Identifier&quot;."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:refersToPreviousReview"/>
+				<labels rb="0..1" rt="+epo:describesResultNotice"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_2C3C6FFD_7F77_424c_B8A1_C090490D5878">
-				<source xmi:idref="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC">
-					<model ea_localid="1543" type="Class" name="epo:ReviewRequest"/>
+			<connector xmi:idref="EAID_76074F10_F8BD_4e56_929F_478C3A0B8424">
+				<source xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C">
+					<model ea_localid="1076" type="Class" name="epo-not:DirectAwardPrenotificationNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1">
-					<model ea_localid="1677" type="Class" name="epo:ReviewObject"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
+					<model ea_localid="1655" type="Class" name="epo:NoticeAwardInformation"/>
+					<role name="epo:announcesNoticeAwardInformation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2670"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4639"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo:announcesNoticeAwardInformation"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_6F34B051_9C2E_444e_83DD_D95F6EA9897B">
-				<source xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524">
-					<model ea_localid="1079" type="Class" name="epo-not:CompletionNotice"/>
+			<connector xmi:idref="EAID_9C96E83D_792B_44cd_BDF4_F589B6CAC7A1">
+				<source xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257">
+					<model ea_localid="1078" type="Class" name="epo-not:ContractModificationNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -39131,10 +41490,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1">
-					<model ea_localid="1677" type="Class" name="epo:ReviewObject"/>
-					<role name="epo:announcesReviewObject" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
+					<model ea_localid="1655" type="Class" name="epo:NoticeAwardInformation"/>
+					<role name="epo:refersToNoticeAwardInformation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -39142,21 +41501,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4654"/>
+				<model ea_localid="4655"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1..*" rt="+epo:announcesReviewObject"/>
+				<labels rb="0..1" rt="+epo:refersToNoticeAwardInformation"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_229C17AB_3D5F_4ffe_AC22_DE4C7CCE3C2E">
-				<source xmi:idref="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8">
-					<model ea_localid="3090" type="Class" name="epo:ReviewTerm"/>
+			<connector xmi:idref="EAID_BBBA098A_C04A_4c7d_A8BE_2A965642DCD3">
+				<source xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524">
+					<model ea_localid="1079" type="Class" name="epo-not:CompletionNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -39166,9 +41525,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_DCE733E5_38D7_4e94_A8B8_B385E9A6811B">
-					<model ea_localid="1351" type="Class" name="epo:ReviewProcedureInformationProvider"/>
-					<role name="epo:definesReviewProcedureInformationProvider" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
+					<model ea_localid="1655" type="Class" name="epo:NoticeAwardInformation"/>
+					<role name="epo:refersToNoticeAwardInformation" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -39177,21 +41536,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4755"/>
+				<model ea_localid="4651"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating a ReviewTerm has a ReviewProcedureInformationProvider."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:definesReviewProcedureInformationProvider"/>
+				<labels rb="0..1" rt="+epo:refersToNoticeAwardInformation"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_384E8446_C9A6_4e30_9DD7_3219683AAD0C">
-				<source xmi:idref="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC">
-					<model ea_localid="1543" type="Class" name="epo:ReviewRequest"/>
+			<connector xmi:idref="EAID_F053A3B1_64BB_454a_8FCF_CE8415CE3F22">
+				<source xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2">
+					<model ea_localid="1077" type="Class" name="epo-not:ResultNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -39201,10 +41560,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_0CC18385_984E_4d4c_A942_07304CE66481">
-					<model ea_localid="1537" type="Enumeration" name="at-voc:irregularity-type"/>
-					<role name="epo:hasAllegedIrregularityType" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
+					<model ea_localid="1655" type="Class" name="epo:NoticeAwardInformation"/>
+					<role name="epo:announcesNoticeAwardInformation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -39212,19 +41571,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3131"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Additional information:&#xA;This relation corresponds in eForms to    BT-791	    Review Irregularity Type&#xA;"/>
+				<model ea_localid="2809"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1..*" rt="+epo:hasAllegedIrregularityType"/>
+				<labels rb="0..1" rt="+epo:announcesNoticeAwardInformation"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_6D0F07D8_06B8_43e0_AB80_8F686D5C488E">
-				<source xmi:idref="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC">
-					<model ea_localid="1543" type="Class" name="epo:ReviewRequest"/>
+			<connector xmi:idref="EAID_B44261EC_B8C1_4e5a_9174_C3DEEEA32848">
+				<source xmi:idref="EAID_C52C2B8E_EBBE_4a9a_A48C_B479107AD49E">
+					<model ea_localid="2626" type="Class" name="epo:OfferIssuer"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -39234,10 +41595,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:hasReviewRequestFee" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF">
+					<model ea_localid="2625" type="Class" name="epo:Offer"/>
+					<role name="epo:distributesOffer" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -39245,54 +41606,55 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2851"/>
+				<model ea_localid="4058"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Additional information:&#xA;This relation corresponds in eForms to BT-795	    Review Request Fee."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasReviewRequestFee"/>
+				<labels rb="0..*" rt="+epo:distributesOffer"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_E1801D29_495B_4d90_9640_5358E5CE90C3">
-				<source xmi:idref="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC">
-					<model ea_localid="1543" type="Class" name="epo:ReviewRequest"/>
+			<connector xmi:idref="EAID_199C3BDF_913A_42e4_A409_64CB2CE61248">
+				<source xmi:idref="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53">
+					<model ea_localid="956" type="Class" name="epo:Tenderer"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_E95530AB_B746_4056_8805_0F3BB79051BE">
-					<model ea_localid="1680" type="Enumeration" name="at-voc:remedy-type"/>
-					<role name="epo:requestsRemedyType" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
+					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2849"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Additional information:&#xA;This relation corresponds in eForms to     BT-792	  Review Remedy Type"/>
+				<model ea_localid="1363"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:requestsRemedyType"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_3777662E_A9D8_4d59_AF6E_5DFBB174C5FA">
-				<source xmi:idref="EAID_92AE6E92_3A20_4642_A531_93ABFC476500">
-					<model ea_localid="1542" type="Class" name="epo:ReviewRequestSummary"/>
+			<connector xmi:idref="EAID_2AAB3E29_13AA_402b_B91F_9E3189FB3EC9">
+				<source xmi:idref="EAID_8335C0F2_1EB0_4dcb_94E3_EFE2E0DF3118">
+					<model ea_localid="3596" type="Class" name="epo-inv:SellerTaxRepresentative"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -39302,8 +41664,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_4F81C811_16F5_4332_BAEA_9843D331872F">
-					<model ea_localid="944" type="Class" name="epo:StatisticalInformation"/>
+				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
+					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -39313,7 +41675,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2669"/>
+				<model ea_localid="5375"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -39324,44 +41686,43 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_56C46ECB_7950_4db1_AA23_2C9AD7E8E999">
-				<source xmi:idref="EAID_92AE6E92_3A20_4642_A531_93ABFC476500">
-					<model ea_localid="1542" type="Class" name="epo:ReviewRequestSummary"/>
+			<connector xmi:idref="EAID_5729A98B_A925_4816_AEF4_9EBDE5851B98">
+				<source xmi:idref="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51">
+					<model ea_localid="2202" type="Class" name="epo:OtherEntity"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
-					<model ea_localid="906" type="Class" name="epo:Lot"/>
-					<role name="epo:concernsReviewSummaryForLot" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
+					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2854"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3523"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="Relates to Lot review summary.&#xA;&#xA;Additional information:&#xA;This relation corresponds in eForms to   BT-13722	    Buyer Review Lot Identifier."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:concernsReviewSummaryForLot"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_ED4865EB_995F_486e_A7A9_407855E7F1B8">
-				<source xmi:idref="EAID_6966846F_842F_4149_A95B_AE374D603608">
-					<model ea_localid="3006" type="Class" name="epo:SelectedCandidateList"/>
+			<connector xmi:idref="EAID_7775FD52_1FE1_445c_9B8B_96AA208D3134">
+				<source xmi:idref="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D">
+					<model ea_localid="3474" type="Class" name="epo-sub:LegalRepresentative"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -39371,9 +41732,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
-					<model ea_localid="915" type="Class" name="epo:Period"/>
-					<role name="epo:hasStartDate" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
+					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
+					<role name="epo:actsOnBehalfOf" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -39382,154 +41743,157 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4599"/>
+				<model ea_localid="5262"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasStartDate"/>
+				<labels rb="0..1" rt="+epo:actsOnBehalfOf"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_829CE86D_DCFB_48b2_AA55_2065496F072C">
-				<source xmi:idref="EAID_FB996CB7_0FB9_4a30_8AA0_0ABAC3D0F2BD">
-					<model ea_localid="2945" type="Class" name="epo:TechnicalAbilitySummary"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+			<connector xmi:idref="EAID_7B0A44E0_63E1_4c30_AB83_DA8166C24C14">
+				<source xmi:idref="EAID_4E7C30BC_ABE6_4736_8E07_54ED87CB1179">
+					<model ea_localid="1046" type="Class" name="epo:ReviewRequester"/>
+					<role visibility="Public"/>
+					<type aggregation="none"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="AllowDuplicates=0;Derived=0;Union=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB">
-					<model ea_localid="2593" type="Class" name="epo:SelectionCriteriaSummary"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
+					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
+					<role visibility="Public"/>
+					<type aggregation="none"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="AllowDuplicates=0;Derived=0;Union=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4515"/>
+				<model ea_localid="1742"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels/>
-				<extendedProperties virtualInheritance="0"/>
+				<extendedProperties/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A78FA1C1_2940_4ad1_A3A2_FA8F430848B1">
-				<source xmi:idref="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122">
-					<model ea_localid="942" type="Class" name="epo:SelectionCriterion"/>
+			<connector xmi:idref="EAID_A27A53B2_A6D1_4fdd_A43E_D33DC6607852">
+				<source xmi:idref="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7">
+					<model ea_localid="947" type="Class" name="epo:Subcontractor"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_47C343CA_8534_4855_8BAE_9C5DE33229E3">
-					<model ea_localid="998" type="Enumeration" name="at-voc:usage"/>
-					<role name="epo:hasSelectionCriteriaUsage" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
+					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3005"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="&#xA;Additional Information:&#xA;This corresponds in eForms to BT-748 Selection Criteria Used."/>
+				<model ea_localid="1384"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasSelectionCriteriaUsage"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_AF66C86B_C371_4afb_8012_8F091434E4D3">
-				<source xmi:idref="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122">
-					<model ea_localid="942" type="Class" name="epo:SelectionCriterion"/>
+			<connector xmi:idref="EAID_A641D156_C668_4cc3_9877_03C8FEE30681">
+				<source xmi:idref="EAID_C52C2B8E_EBBE_4a9a_A48C_B479107AD49E">
+					<model ea_localid="2626" type="Class" name="epo:OfferIssuer"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_FA62ED20_6A09_47b0_BE65_B3A78C349AC2">
-					<model ea_localid="992" type="Enumeration" name="at-voc:selection-criterion"/>
-					<role name="epo:hasSelectionCriterionType" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
+					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1392"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The classification of the selection criteria.&#xA;&#xA;&#xA;Additional Information:&#xA;&#xA;This corresponds in eForms to BT-747	 Selection Criteria Type.&#xA;&#xA;WG Approval 09/11/2021&#xA;"/>
+				<model ea_localid="4057"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasSelectionCriterionType"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_5C87BC92_AF78_4f16_994C_2F6853BD9DA7">
-				<source xmi:idref="EAID_2DF96E3A_E135_465d_908F_EAB3689291DE">
-					<model ea_localid="943" type="Class" name="epo:SocialProcurement"/>
+			<connector xmi:idref="EAID_A88E2729_62D9_493c_8105_4D93D49DFA8A">
+				<source xmi:idref="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01">
+					<model ea_localid="2018" type="Class" name="epo-ord:Seller"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_53AB9EFA_0DDD_4512_8CA7_9D132E537955">
-					<model ea_localid="993" type="Enumeration" name="at-voc:social-objective"/>
-					<role name="epo:fulfillsRequirement" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
+					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1389"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The requirement to which the concept meets.&#xA;WG Approval 09/11/2021&#xA;&#xA;"/>
+				<model ea_localid="3265"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:fulfillsRequirement"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_857D08F9_84F2_4d98_8718_882951247DF8">
-				<source xmi:idref="EAID_2DF96E3A_E135_465d_908F_EAB3689291DE">
-					<model ea_localid="943" type="Class" name="epo:SocialProcurement"/>
+			<connector xmi:idref="EAID_ACAE27B9_7F0D_4491_BDBC_A13B860A4535">
+				<source xmi:idref="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3">
+					<model ea_localid="2017" type="Class" name="epo-ful:Despatcher"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -39539,8 +41903,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA">
-					<model ea_localid="945" type="Class" name="epo:StrategicProcurement"/>
+				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
+					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -39550,7 +41914,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1390"/>
+				<model ea_localid="3264"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -39561,9 +41925,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_31D3A42A_B28E_449d_AF5F_9D6CCD87E6A1">
-				<source xmi:idref="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A">
-					<model ea_localid="1544" type="Class" name="epo:SubmissionStatisticalInformation"/>
+			<connector xmi:idref="EAID_D2C94CC0_A14F_4c9c_B4C0_912C9C11EC4E">
+				<source xmi:idref="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD">
+					<model ea_localid="1605" type="Class" name="epo-cat:Manufacturer"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -39573,8 +41937,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_4F81C811_16F5_4332_BAEA_9843D331872F">
-					<model ea_localid="944" type="Class" name="epo:StatisticalInformation"/>
+				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
+					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -39584,7 +41948,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2790"/>
+				<model ea_localid="2725"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -39595,112 +41959,111 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_1BB31111_F63D_4464_AA32_D22B32C1DF1F">
-				<source xmi:idref="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA">
-					<model ea_localid="945" type="Class" name="epo:StrategicProcurement"/>
+			<connector xmi:idref="EAID_D86AFBB4_83ED_4d20_960D_7A768CA3117C">
+				<source xmi:idref="EAID_6161E37F_B166_4ecf_A645_92E7667F0CC8">
+					<model ea_localid="3595" type="Class" name="epo-inv:Payee"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_DFCCF9E6_D161_4a4e_8468_6429D56A1496">
-					<model ea_localid="963" type="Enumeration" name="at-voc:accessibility"/>
-					<role name="epo:includesAccessibilityCriterion" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
+					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1372"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Explanation as to whether accessibility Criterion are used or not.&#xA;WG Approval 09/11/2021&#xA;&#xA;"/>
+				<model ea_localid="5376"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:includesAccessibilityCriterion"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_81D470D5_433B_4242_826E_974C4A3AEF87">
-				<source xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
-					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
+			<connector xmi:idref="EAID_E4D55FF7_2180_4a21_A34C_23F9AB59E814">
+				<source xmi:idref="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3">
+					<model ea_localid="962" type="Class" name="epo:Winner"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA">
-					<model ea_localid="945" type="Class" name="epo:StrategicProcurement"/>
-					<role name="epo:fulfillsStrategicProcurement" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
+					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1493"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1358"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:fulfillsStrategicProcurement"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_55AE269D_7874_4515_A52E_6EBA9F23871A">
-				<source xmi:idref="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E">
-					<model ea_localid="1650" type="Class" name="epo:SubcontractingEstimate"/>
+			<connector xmi:idref="EAID_15042E3E_B61C_4d75_BF56_83000481AB12">
+				<source xmi:idref="EAID_82AA47D1_6939_4328_8108_0018817C75BD">
+					<model ea_localid="912" type="Class" name="epo:OpeningTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:hasSubcontractingEstimatedValue" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD">
+					<model ea_localid="1773" type="Class" name="epo:ProcedureSpecificTerm"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1386"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4802"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="The estimated value of a single subcontract.&#xA;&#xA;This relates to BT-553 in eForms.&#xA;&#xA;WG Approval 01/09/2020&#xA;&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasSubcontractingEstimatedValue"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7C98771E_06E0_4141_9CF5_2CFE5FEB856B">
-				<source xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
-					<model ea_localid="958" type="Class" name="epo:Tender"/>
+			<connector xmi:idref="EAID_A8CBD7C1_E82A_4979_98A5_58BD6A43131C">
+				<source xmi:idref="EAID_82AA47D1_6939_4328_8108_0018817C75BD">
+					<model ea_localid="912" type="Class" name="epo:OpeningTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -39710,10 +42073,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E">
-					<model ea_localid="1650" type="Class" name="epo:SubcontractingEstimate"/>
-					<role name="epo:foreseesSubcontracting" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_29678A10_6473_461a_BE84_76269B5BBD68">
+					<model ea_localid="851" type="Class" name="locn:Address"/>
+					<role name="epo:definesOpeningPlace" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -39721,34 +42084,34 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1385"/>
+				<model ea_localid="1704"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The place where the tenders will be publicly opened.&#xA;&#xA;WG Approval 10-10-2019"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:foreseesSubcontracting"/>
+				<labels rb="0..1" rt="+epo:definesOpeningPlace"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_24545C91_D269_4cfe_A646_9A2FDEE01B0F">
-				<source xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
-					<model ea_localid="958" type="Class" name="epo:Tender"/>
+			<connector xmi:idref="EAID_0AA8BD10_946A_403c_B906_6DB183F74D9F">
+				<source xmi:idref="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D">
+					<model ea_localid="914" type="Class" name="epo:OrganisationGroup"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7">
-					<model ea_localid="947" type="Class" name="epo:Subcontractor"/>
-					<role name="epo:specifiesSubcontractors" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+					<model ea_localid="913" type="Class" name="org:Organization"/>
+					<role name="epo:hasMember" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -39756,66 +42119,67 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1557"/>
+				<model ea_localid="1447"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:specifiesSubcontractors"/>
+				<labels rb="1..*" rt="+epo:hasMember"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C8DDF2AD_D50E_4225_A715_E7C9368CEB39">
-				<source xmi:idref="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561">
-					<model ea_localid="948" type="Class" name="epo:SubcontractTerm"/>
+			<connector xmi:idref="EAID_881F7772_9A6C_4e5a_BB86_A2E25524B058">
+				<source xmi:idref="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D">
+					<model ea_localid="914" type="Class" name="epo:OrganisationGroup"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_9134CB43_EE09_4c07_80C3_3F39DFD09011">
-					<model ea_localid="996" type="Enumeration" name="at-voc:subcontracting-obligation"/>
-					<role name="epo:hasSubcontractingObligation" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+					<model ea_localid="913" type="Class" name="org:Organization"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1383"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The requirement the tender must meet with regard to subcontracting parts of the contract.&#xA;WG Approval 09/11/2021&#xA;&#xA;"/>
+				<model ea_localid="3189"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasSubcontractingObligation"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_3127E296_9886_44bc_86E7_B4E433F87208">
-				<source xmi:idref="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A">
-					<model ea_localid="1544" type="Class" name="epo:SubmissionStatisticalInformation"/>
+			<connector xmi:idref="EAID_F3F440DD_AB87_4730_A6DF_915A5FB0B3DB">
+				<source xmi:idref="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D">
+					<model ea_localid="914" type="Class" name="epo:OrganisationGroup"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:hasHighestReceivedTenderValue" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+					<model ea_localid="913" type="Class" name="org:Organization"/>
+					<role name="epo:leadBy" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -39824,21 +42188,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2796"/>
+				<model ea_localid="1446"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Amount of the Tender with the highest value.&#xA;&#xA;Additional Information&#xA;The value must correspond to an admissible tender. For example, tenders compliant with the procurement document requirements, not having an abnormally low price or cost, etc. &#xA;&#xA;&#xA;WG Approval 12/12/2019&#xA;&#xA;&#xA;"/>
+				<documentation value="The epo:OrganisationGroup epo:leadBy org:Organization was implemented to be used in case of an Economic Operator Group."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasHighestReceivedTenderValue"/>
-				<extendedProperties virtualInheritance="0"/>
+				<labels rb="0..1" rt="+epo:leadBy"/>
+				<extendedProperties/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_6E3C7B53_979C_4020_95DB_31C0DA62F564">
-				<source xmi:idref="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A">
-					<model ea_localid="1544" type="Class" name="epo:SubmissionStatisticalInformation"/>
+			<connector xmi:idref="EAID_976D38A5_94EF_4bae_941E_311C9FC4668A">
+				<source xmi:idref="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809">
+					<model ea_localid="2362" type="Class" name="epo-ord:OriginatorInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -39848,9 +42212,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_12955701_35A4_47c8_8EA6_28768E083EED">
-					<model ea_localid="1723" type="Enumeration" name="at-voc:received-submission-type"/>
-					<role name="epo:hasReceivedSubmissionType" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_23E9784F_4AEE_4484_9BAC_28A7FEB05838">
+					<model ea_localid="2630" type="Class" name="epo:OriginatorRequest"/>
+					<role name="epo-ord:concernsOriginatorRequest" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -39859,19 +42223,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2932"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="4072"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasReceivedSubmissionType"/>
+				<labels rb="0..1" rt="+epo-ord:concernsOriginatorRequest"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_98D513D4_9622_4217_94D7_26E6E451AF0C">
-				<source xmi:idref="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A">
-					<model ea_localid="1544" type="Class" name="epo:SubmissionStatisticalInformation"/>
+			<connector xmi:idref="EAID_76DEFDDE_AF78_4e23_8B84_0C6E8B387AD5">
+				<source xmi:idref="EAID_432BFDAD_99CD_40ab_A159_824F0F6571E2">
+					<model ea_localid="2589" type="Class" name="epo:ParticipationCondition"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -39881,10 +42247,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:hasLowestReceivedTenderValue" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_B81F2C0E_31F9_4ec0_AC1E_A0960D618FE6">
+					<model ea_localid="991" type="Enumeration" name="at-voc:reserved-procurement"/>
+					<role name="epo:hasReservedProcurement" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -39892,56 +42258,53 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2795"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="Amount of the Tender with the lowest value.&#xA;&#xA;Additional Information&#xA;The value must correspond to an admissible tender. For example, tenders compliant with the procurement document requirements, not having an abnormally low price or cost, etc. &#xA;&#xA;WG Approval 12/12/2019&#xA;&#xA;"/>
+				<model ea_localid="1495"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="Explanation as to whether a procurement may be reserved for the participation of certain types of organisation.&#xA;&#xA;Additional information:&#xA;This property corresponds in eForms to the BT-71&#xA;WG Approval 09/11/2021&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasLowestReceivedTenderValue"/>
+				<labels rb="0..*" rt="+epo:hasReservedProcurement"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_1EA9C84A_C46F_456b_A355_DA9CD314CBA0">
-				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
-					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
+			<connector xmi:idref="EAID_E51D25BC_E9FB_423c_BFBF_00E3B99864B4">
+				<source xmi:idref="EAID_432BFDAD_99CD_40ab_A159_824F0F6571E2">
+					<model ea_localid="2589" type="Class" name="epo:ParticipationCondition"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969">
-					<model ea_localid="1698" type="Class" name="epo:Duration"/>
-					<role name="epo:hasTenderValidityDuration" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4">
+					<model ea_localid="924" type="Class" name="epo:ProcurementCriterion"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4801"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3974"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasTenderValidityDuration"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_6D0203DA_A8A3_482a_B747_66A09DEF42FC">
-				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
-					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
+			<connector xmi:idref="EAID_0EC24453_1D32_4b47_B797_31C56125A97E">
+				<source xmi:idref="EAID_44E6EE1C_AF22_4586_B990_EF3674BAE826">
+					<model ea_localid="2591" type="Class" name="epo:ParticipationConditionsSummary"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -39951,10 +42314,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_A8A23909_CD9D_402e_B37A_C9F795BD0521">
-					<model ea_localid="979" type="Enumeration" name="at-voc:missing-info-submission"/>
-					<role name="epo:hasLateSubmissionPermission" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_B81F2C0E_31F9_4ec0_AC1E_A0960D618FE6">
+					<model ea_localid="991" type="Enumeration" name="at-voc:reserved-procurement"/>
+					<role name="epo:hasReservedProcurement" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -39962,54 +42325,53 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1382"/>
+				<model ea_localid="4566"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Whether economic operator-related information can be supplemented even after the submission deadline.&#xA;&#xA;Additional Information&#xA;This is specific to the information on the economic operator and not the actual offer. This does  not apply to the requests for clarification.&#xA;&#xA;WG Approval 21/07/2020&#xA;"/>
+				<documentation value="Explanation as to whether a procurement may be reserved for the participation of certain types of organisation.&#xA;&#xA;Additional information:&#xA;This property corresponds in eForms to the BT-71&#xA;WG Approval 09/11/2021&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasLateSubmissionPermission"/>
+				<labels rb="0..*" rt="+epo:hasReservedProcurement"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7BC31FFB_F53F_431c_AED5_36E1786ED85F">
-				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
-					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
+			<connector xmi:idref="EAID_EE3FD9AF_3712_4b11_9970_82968E7EB99F">
+				<source xmi:idref="EAID_44E6EE1C_AF22_4586_B990_EF3674BAE826">
+					<model ea_localid="2591" type="Class" name="epo:ParticipationConditionsSummary"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_73C42C68_C5D6_4b6c_AA94_2CA27746393B">
-					<model ea_localid="1343" type="Class" name="epo:TenderReceiver"/>
-					<role name="epo:definesTenderReceiver" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D">
+					<model ea_localid="2590" type="Class" name="epo:ProcurementCriteriaSummary"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3118"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3976"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating a SubmissionTerm has a TenderReceiver."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:definesTenderReceiver"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_8A3EF8BD_C6F5_4027_9D0A_235327E62C6E">
-				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
-					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
+			<connector xmi:idref="EAID_5CFE789F_365A_4f79_AABC_E6BE700C4FCC">
+				<source xmi:idref="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366">
+					<model ea_localid="1477" type="Class" name="epo:ParticipationRequestTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40019,10 +42381,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1FF5173E_4940_44db_A1A0_C190337F6440">
-					<model ea_localid="967" type="Enumeration" name="at-voc:communication-justification"/>
-					<role name="epo:hasNonElectronicSubmissionJustification" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_572B82B3_FF4C_43b8_9C2C_09AD5D3F4615">
+					<model ea_localid="1340" type="Class" name="epo:ParticipationRequestProcessor"/>
+					<role name="epo:definesParticipationRequestProcessor" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -40030,19 +42392,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1381"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="&#xA;Reason for not accepting electronic information.&#xA;&#xA;WG Approval 21/07/2020&#xA;"/>
+				<model ea_localid="2544"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Relation indicating a ParticipationRequestTerm has a ParticipationRequestProcessor."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasNonElectronicSubmissionJustification"/>
+				<labels rb="0..1" rt="+epo:definesParticipationRequestProcessor"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_8CA66645_D223_487b_B348_21446E4664A6">
-				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
-					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
+			<connector xmi:idref="EAID_255D53F4_253B_4698_B2EF_82E934FAC2F4">
+				<source xmi:idref="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366">
+					<model ea_localid="1477" type="Class" name="epo:ParticipationRequestTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40052,9 +42416,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5">
-					<model ea_localid="988" type="Enumeration" name="at-voc:permission"/>
-					<role name="epo:hasVariantPermission" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_9403AC67_80A3_4c77_9299_6171EF9D6788">
+					<model ea_localid="1341" type="Class" name="epo:ParticipationRequestReceiver"/>
+					<role name="epo:definesParticipationRequestReceiver" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -40063,19 +42427,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1491"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The obligation or possibility for tenderers to submit variants or not.&#xA;&#xA;Additional Information:&#xA;&#xA;Variants are alternative ways to fulfil the buyer's needs as opposed to solutions indicated in the procurement documents.&#xA;&#xA;eForms: Whether tenderers are required, allowed or forbidden to submit tenders which fulfil the buyer's needs differently than as proposed in the procurement documents. &#xA;&#xA;Additional Information:&#xA;&#xA;Further conditions for submitting variant tenders are in the procurement documents.&#xA;"/>
+				<model ea_localid="2543"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Relation indicating a ParticipationRequestTerm has a ParticipationRequestReceiver."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasVariantPermission"/>
+				<labels rb="0..1" rt="+epo:definesParticipationRequestReceiver"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9B46D9F5_E71D_40fc_A50D_BE4367D5EE4E">
-				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
-					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
+			<connector xmi:idref="EAID_007A256B_E0B5_4a62_B8D7_2BC14F331BE5">
+				<source xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
+					<model ea_localid="915" type="Class" name="epo:Period"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40085,10 +42451,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5">
-					<model ea_localid="988" type="Enumeration" name="at-voc:permission"/>
-					<role name="epo:hasESubmissionPermission" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_5A01D361_6509_447f_B318_F20F23FBF81F">
+					<model ea_localid="997" type="Enumeration" name="at-voc:timeperiod"/>
+					<role name="epo:hasTimePeriod" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -40096,19 +42462,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1379"/>
+				<model ea_localid="1443"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The requirements as to what extent electronic submission is allowed.&#xA;&#xA;WG Approval 03/10/2019&#xA;&#xA;"/>
+				<documentation value="&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasESubmissionPermission"/>
+				<labels rb="1..*" rt="+epo:hasTimePeriod"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_BC7F270C_1A4E_400c_88ED_7EFEB868C4EC">
-				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
-					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
+			<connector xmi:idref="EAID_11C78626_167C_4c06_AF8A_1D37420731A9">
+				<source xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8">
+					<model ea_localid="2023" type="Class" name="epo-ful:ShipmentInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40118,9 +42484,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_FD0308FC_9EDA_4a54_A4B6_FBCE76BF76A2">
-					<model ea_localid="1344" type="Class" name="epo:TenderProcessor"/>
-					<role name="epo:definesTenderProcessor" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
+					<model ea_localid="915" type="Class" name="epo:Period"/>
+					<role name="epo-ful:hasEstimatedDeliveryPeriod" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -40129,21 +42495,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2540"/>
+				<model ea_localid="3423"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating a SubmissionTerm has a TenderProcessor."/>
+				<documentation value="The forecasted time period given by the Despatcher to provide the goods and services.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:definesTenderProcessor"/>
+				<labels rb="0..1" rt="+epo-ful:hasEstimatedDeliveryPeriod"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C144677A_178B_495d_A1CC_20D0D20B3AD0">
-				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
-					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
+			<connector xmi:idref="EAID_24C53A6F_084E_4dbf_817A_1DF5BE5981D8">
+				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
+					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40153,10 +42519,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_8B37BCB9_9B2F_4a90_8339_DA7B0472F42E">
-					<model ea_localid="995" type="Enumeration" name="at-voc:subcontracting-indication"/>
-					<role name="epo:hasTenderSubcontractingInformation" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
+					<model ea_localid="915" type="Class" name="epo:Period"/>
+					<role name="epo:hasValidityPeriod" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -40164,19 +42530,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1377"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The information about subcontracting that must be indicated in the tender.&#xA;&#xA;WG  Approval 10/10/2019&#xA;&#xA;"/>
+				<model ea_localid="5374"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasTenderSubcontractingInformation"/>
+				<labels rb="0..1" rt="+epo:hasValidityPeriod"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C325A5AA_AAE1_4e55_A542_A867A1BED99D">
-				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
-					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
+			<connector xmi:idref="EAID_33FC7129_7479_45ab_AECD_F356DB6C1872">
+				<source xmi:idref="EAID_A8D775E4_EEB9_4502_B8A1_C1DD5D555864">
+					<model ea_localid="3505" type="Class" name="cccev:EvidenceType"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40186,10 +42554,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5">
-					<model ea_localid="988" type="Enumeration" name="at-voc:permission"/>
-					<role name="epo:hasECataloguePermission" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
+					<model ea_localid="915" type="Class" name="epo:Period"/>
+					<role name="cccev:validityPeriodConstraint" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -40197,31 +42565,33 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1376"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The extent to which electronic catalogues may be used in tenders.&#xA;&#xA;WG Approval 03/10/2019&#xA;"/>
+				<model ea_localid="5239"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Temporal condition on the validity period of the Evidence Type.&#xA;&#xA;Additional Information:&#xA;E.g. A Belgian birth evidence is valid for X months after emission. To express constraints on the validity period that must hold when assessing the evidence (e.g. the certificate of good conduct cannot be issued more than 3 months ago), we refer to the Constraint class."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasECataloguePermission"/>
+				<labels rb="0..*" rt="+cccev:validityPeriodConstraint"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D07B06AA_2E5B_4fa1_B0EA_CB49790C2AAD">
-				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
-					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
+			<connector xmi:idref="EAID_3A930003_5665_43a6_9887_A78953BBB2E2">
+				<source xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8">
+					<model ea_localid="2023" type="Class" name="epo-ful:ShipmentInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
 				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
 					<model ea_localid="915" type="Class" name="epo:Period"/>
-					<role name="epo:hasTenderValidityPeriod" visibility="Public" targetScope="instance"/>
+					<role name="epo-ful:hasDespatchPeriod" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -40230,21 +42600,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1442"/>
+				<model ea_localid="5446"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The relation indicating until when a tender instance is applicable.&#xA;"/>
+				<documentation value="The time period when the Despatcher picks-up the Goods Items to be delivered.&#xA;&#xA;WG approval 16/07/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasTenderValidityPeriod"/>
+				<labels rb="0..1" rt="+epo-ful:hasDespatchPeriod"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_E2C29363_440C_4c85_8C4E_38DED0468EB4">
-				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
-					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
+			<connector xmi:idref="EAID_45DE6A43_058C_45b5_9BD1_786F801B344D">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40254,10 +42624,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90">
-					<model ea_localid="976" type="Enumeration" name="at-voc:language"/>
-					<role name="epo:hasLanguage" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
+					<model ea_localid="915" type="Class" name="epo:Period"/>
+					<role name="epo-inv:hasInvoicingPeriod" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -40265,88 +42635,91 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1375"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Language in which the submitted information is to be expressed. &#xA;&#xA;WG Approval 21/07/2020&#xA;&#xA;"/>
+				<model ea_localid="5373"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasLanguage"/>
+				<labels rb="0..1" rt="+epo-inv:hasInvoicingPeriod"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_80B8D836_6545_4db6_8C20_4A9289C81C12">
-				<source xmi:idref="EAID_DC5A8DC6_4D0A_4432_B667_CE2C1E6D5A96">
-					<model ea_localid="950" type="Class" name="epo:System"/>
+			<connector xmi:idref="EAID_6D166D58_F0F4_4650_92D7_DAC20DD7E2F8">
+				<source xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+					<model ea_localid="3581" type="Class" name="epo-inv:InvoiceLine"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1">
-					<model ea_localid="852" type="Class" name="foaf:Agent"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
+					<model ea_localid="915" type="Class" name="epo:Period"/>
+					<role name="epo-inv:hasInvoiceLinePeriod" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1374"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="5384"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo-inv:hasInvoiceLinePeriod"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_EBF47D81_D8E3_4eda_9351_165A2D6D972E">
-				<source xmi:idref="EAID_DC5A8DC6_4D0A_4432_B667_CE2C1E6D5A96">
-					<model ea_localid="950" type="Class" name="epo:System"/>
-					<role name="epo:ownsSystem" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+			<connector xmi:idref="EAID_6D569FED_815F_45f4_87EA_C0E83DC5C9AF">
+				<source xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
+					<model ea_localid="1831" type="Class" name="epo-cat:Price"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1">
-					<model ea_localid="852" type="Class" name="foaf:Agent"/>
-					<role name="epo:isOwnedByAgent" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
+					<model ea_localid="915" type="Class" name="epo:Period"/>
+					<role name="epo-cat:hasPriceValidity" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation/>
+					<documentation value="The period of time when the Item can be ordered to the given price.&#xA;"/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1695"/>
-				<properties ea_type="Association" direction="Bi-Directional"/>
+				<model ea_localid="1755"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels lb="0..*" lt="+epo:ownsSystem" rb="0..1" rt="+epo:isOwnedByAgent"/>
+				<labels rb="1" rt="+epo-cat:hasPriceValidity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_8FF77444_1F49_4895_AA8E_5C76444F3AE1">
-				<source xmi:idref="EAID_3780AA50_D898_4068_B300_47B46651CA0A">
-					<model ea_localid="953" type="Class" name="epo:Technique"/>
+			<connector xmi:idref="EAID_89C3F218_90EF_42ed_B918_7EEB88718C50">
+				<source xmi:idref="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB">
+					<model ea_localid="3096" type="Class" name="epo-ord:OrderResponseInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40356,9 +42729,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_47C343CA_8534_4855_8BAE_9C5DE33229E3">
-					<model ea_localid="998" type="Enumeration" name="at-voc:usage"/>
-					<role name="epo:hasUsage" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
+					<model ea_localid="915" type="Class" name="epo:Period"/>
+					<role name="epo-ord:hasDeliveryPeriod" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -40367,19 +42740,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1562"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The codelist to be used is at-voc:usage which is available at http://publications.europa.eu/resource/dataset/usage&#xA;"/>
+				<model ea_localid="4763"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasUsage"/>
+				<labels rb="0..1" rt="+epo-ord:hasDeliveryPeriod"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_DE5098A6_B134_4261_8994_841365A27FAB">
-				<source xmi:idref="EAID_3780AA50_D898_4068_B300_47B46651CA0A">
-					<model ea_localid="953" type="Class" name="epo:Technique"/>
+			<connector xmi:idref="EAID_8FF88923_D9FB_4937_B866_FABECBC1DB55">
+				<source xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B">
+					<model ea_localid="1057" type="Class" name="epo-cat:CatalogueLine"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40391,7 +42766,7 @@
 				</source>
 				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
 					<model ea_localid="915" type="Class" name="epo:Period"/>
-					<role name="epo:hasValidityPeriod" visibility="Public" targetScope="instance"/>
+					<role name="epo-cat:hasCatalogueLineValidity" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -40400,21 +42775,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1440"/>
+				<model ea_localid="1754"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The relation indicating until when a given instance of a concept is applicable.&#xA;&#xA;WG approval 30/05/2023&#xA;"/>
+				<documentation value="The relation indicating until when a Catalogue Line instance is applicable.&#xA;&#xA;WG approval 21/09/2023"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasValidityPeriod"/>
+				<labels rb="0..1" rt="+epo-cat:hasCatalogueLineValidity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_2D4516BD_7CD7_4f69_89C8_D3FC52D7CF0C">
-				<source xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A">
-					<model ea_localid="917" type="Class" name="epo:PlannedProcurementPart"/>
+			<connector xmi:idref="EAID_9EDDC1AB_FC05_462d_A479_433862DD01D8">
+				<source xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0">
+					<model ea_localid="1056" type="Class" name="epo-cat:Catalogue"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40424,10 +42799,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_3780AA50_D898_4068_B300_47B46651CA0A">
-					<model ea_localid="953" type="Class" name="epo:Technique"/>
-					<role name="epo:foreseesTechnique" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
+					<model ea_localid="915" type="Class" name="epo:Period"/>
+					<role name="epo:hasValidityPeriod" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -40435,21 +42810,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3181"/>
+				<model ea_localid="4916"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The relation indicating until when a given instance of a concept is applicable.&#xA;&#xA;WG approval 30/05/2023"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:foreseesTechnique"/>
+				<labels rb="0..1" rt="+epo:hasValidityPeriod"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_ADE68ED4_8A73_411c_B751_1F0998CC86A7">
-				<source xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
-					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
+			<connector xmi:idref="EAID_B2FBB3C3_8542_4cd9_8B7E_A25D4A6C9048">
+				<source xmi:idref="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC">
+					<model ea_localid="3467" type="Class" name="epo-sub:Response"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40459,10 +42834,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_3780AA50_D898_4068_B300_47B46651CA0A">
-					<model ea_localid="953" type="Class" name="epo:Technique"/>
-					<role name="epo:usesTechnique" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
+					<model ea_localid="915" type="Class" name="epo:Period"/>
+					<role name="epo-sub:refersToApplicablePeriod" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -40470,34 +42845,34 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3180"/>
+				<model ea_localid="5193"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating the period to which the Response shall apply.&#xA;&#xA;WG approval 12/03/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:usesTechnique"/>
+				<labels rb="0..1" rt="+epo-sub:refersToApplicablePeriod"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_00497249_92E0_435e_9C45_B9A2F9CBFE43">
-				<source xmi:idref="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B">
-					<model ea_localid="1370" type="Class" name="epo:TenderAwardOutcome"/>
+			<connector xmi:idref="EAID_D07B06AA_2E5B_4fa1_B0EA_CB49790C2AAD">
+				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
+					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
-					<model ea_localid="958" type="Class" name="epo:Tender"/>
-					<role name="epo:concernsTender" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
+					<model ea_localid="915" type="Class" name="epo:Period"/>
+					<role name="epo:hasTenderValidityPeriod" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -40505,33 +42880,33 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2498"/>
+				<model ea_localid="1442"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The relation indicating until when a tender instance is applicable.&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:concernsTender"/>
+				<labels rb="0..1" rt="+epo:hasTenderValidityPeriod"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_24ED3FAD_FABC_4b24_A3E6_B0420EB7CF2A">
-				<source xmi:idref="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B">
-					<model ea_localid="1370" type="Class" name="epo:TenderAwardOutcome"/>
+			<connector xmi:idref="EAID_D77EAC2F_A434_424a_8ECC_D32EF06886BB">
+				<source xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A">
+					<model ea_localid="917" type="Class" name="epo:PlannedProcurementPart"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3">
-					<model ea_localid="962" type="Class" name="epo:Winner"/>
-					<role name="epo:indicatesAwardToWinner" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
+					<model ea_localid="915" type="Class" name="epo:Period"/>
+					<role name="epo:hasPlannedPeriod" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -40540,21 +42915,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2497"/>
+				<model ea_localid="1441"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Reveals the winner to whom the tender award outcome is attributed."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:indicatesAwardToWinner"/>
+				<labels rb="0..1" rt="+epo:hasPlannedPeriod"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_61636EE3_DE81_4083_BF9B_6F607A63A921">
-				<source xmi:idref="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3">
-					<model ea_localid="962" type="Class" name="epo:Winner"/>
+			<connector xmi:idref="EAID_DCA21CBC_3D4F_480a_B24B_49A69CC51624">
+				<source xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A">
+					<model ea_localid="2087" type="Class" name="epo-ord:DeliveryInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40564,9 +42939,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53">
-					<model ea_localid="956" type="Class" name="epo:Tenderer"/>
-					<role name="epo:needsToBeATenderer" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
+					<model ea_localid="915" type="Class" name="epo:Period"/>
+					<role name="epo-ord:hasDeliveryPeriod" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -40575,33 +42950,33 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2469"/>
+				<model ea_localid="3281"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The Winner must be a Tenderer."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:needsToBeATenderer"/>
+				<labels rb="0..1" rt="+epo-ord:hasDeliveryPeriod"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_E026EBD4_4329_4e57_9F78_AF7887C44E46">
-				<source xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
-					<model ea_localid="958" type="Class" name="epo:Tender"/>
+			<connector xmi:idref="EAID_DE5098A6_B134_4261_8994_841365A27FAB">
+				<source xmi:idref="EAID_3780AA50_D898_4068_B300_47B46651CA0A">
+					<model ea_localid="953" type="Class" name="epo:Technique"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53">
-					<model ea_localid="956" type="Class" name="epo:Tenderer"/>
-					<role name="epo:isSubmitedBy" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
+					<model ea_localid="915" type="Class" name="epo:Period"/>
+					<role name="epo:hasValidityPeriod" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -40610,21 +42985,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1366"/>
+				<model ea_localid="1440"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating the submission of a tender by an economic operator.&#xA;WG approval 18/05/2021"/>
+				<documentation value="The relation indicating until when a given instance of a concept is applicable.&#xA;&#xA;WG approval 30/05/2023&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:isSubmitedBy"/>
+				<labels rb="0..1" rt="+epo:hasValidityPeriod"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_818697AF_821C_40da_B5DE_D7ED82169378">
-				<source xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
-					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
+			<connector xmi:idref="EAID_ED4865EB_995F_486e_A7A9_407855E7F1B8">
+				<source xmi:idref="EAID_6966846F_842F_4149_A95B_AE374D603608">
+					<model ea_localid="3006" type="Class" name="epo:SelectedCandidateList"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40634,10 +43009,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D">
-					<model ea_localid="1368" type="Class" name="epo:Term"/>
-					<role name="epo:isSubjectToTerm" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
+					<model ea_localid="915" type="Class" name="epo:Period"/>
+					<role name="epo:hasStartDate" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -40645,67 +43020,68 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2981"/>
+				<model ea_localid="4599"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:isSubjectToTerm"/>
+				<labels rb="0..1" rt="+epo:hasStartDate"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_78ABF07D_FFDF_40a2_8CAF_4B1C7067546E">
-				<source xmi:idref="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0">
-					<model ea_localid="3084" type="Class" name="epo:VehicleInformation"/>
+			<connector xmi:idref="EAID_A5B20E6A_8922_4f1d_9A94_0EFFDFC4B060">
+				<source xmi:idref="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD">
+					<model ea_localid="1773" type="Class" name="epo:ProcedureSpecificTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F565346A_74A1_4bf9_82F9_EE632CBBD88D">
-					<model ea_localid="3083" type="Enumeration" name="at-voc:vehicle-category"/>
-					<role name="epo:specifiesCleanVehicleDirectiveVehicleCategory" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D">
+					<model ea_localid="1368" type="Class" name="epo:Term"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4731"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="2964"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:specifiesCleanVehicleDirectiveVehicleCategory"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_8F9F898E_D644_43bd_B368_6604C3E040EC">
-				<source xmi:idref="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0">
-					<model ea_localid="3084" type="Class" name="epo:VehicleInformation"/>
+			<connector xmi:idref="EAID_1C8C734E_FD33_4153_9939_FA613CEB5D22">
+				<source xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
+					<model ea_localid="922" type="Class" name="epo:Procedure"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_63483BB6_C796_4631_87DA_3F3808C4744F">
-					<model ea_localid="3082" type="Enumeration" name="at-voc:cvd-contract-type"/>
-					<role name="epo:specifiesCleanVehicleDirectiveContractType" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD">
+					<model ea_localid="1773" type="Class" name="epo:ProcedureSpecificTerm"/>
+					<role name="epo:isSubjectToProcedureSpecificTerm" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -40713,54 +43089,55 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4730"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="1426"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:specifiesCleanVehicleDirectiveContractType"/>
+				<labels rb="1..*" rt="+epo:isSubjectToProcedureSpecificTerm"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_319F106B_6066_4ba7_B084_12D7110FE9E0">
-				<source xmi:idref="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1">
-					<model ea_localid="852" type="Class" name="foaf:Agent"/>
+			<connector xmi:idref="EAID_4C36EE86_0569_4453_9E13_5EC63FC08031">
+				<source xmi:idref="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D">
+					<model ea_localid="923" type="Class" name="epo:ProcedureTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD">
+					<model ea_localid="1773" type="Class" name="epo:ProcedureSpecificTerm"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3011"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2979"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="Links a resource to an adms:Identifier class."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+adms:identifier"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_19AD8C15_4D9D_48f2_A3E1_A997E86942D2">
-				<source xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
-					<model ea_localid="913" type="Class" name="org:Organization"/>
+			<connector xmi:idref="EAID_6248DC7A_ACC5_4553_92ED_5A488B7D6FC6">
+				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
+					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40770,8 +43147,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1">
-					<model ea_localid="852" type="Class" name="foaf:Agent"/>
+				<target xmi:idref="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD">
+					<model ea_localid="1773" type="Class" name="epo:ProcedureSpecificTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40781,7 +43158,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1448"/>
+				<model ea_localid="3275"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -40792,9 +43169,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_24AB8D4E_3151_4d4e_B951_BAA8F8436033">
-				<source xmi:idref="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53">
-					<model ea_localid="1902" type="Class" name="foaf:Person"/>
+			<connector xmi:idref="EAID_C7F7FABE_11B6_42f1_8310_BCB1832C647A">
+				<source xmi:idref="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8">
+					<model ea_localid="3090" type="Class" name="epo:ReviewTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40804,8 +43181,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1">
-					<model ea_localid="852" type="Class" name="foaf:Agent"/>
+				<target xmi:idref="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD">
+					<model ea_localid="1773" type="Class" name="epo:ProcedureSpecificTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40815,7 +43192,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3091"/>
+				<model ea_localid="4831"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -40826,9 +43203,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_498900B2_4B2A_411b_B5EB_19C2D921F4D1">
-				<source xmi:idref="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53">
-					<model ea_localid="1902" type="Class" name="foaf:Person"/>
+			<connector xmi:idref="EAID_44CFA3B0_EE66_4ace_9069_38D7A3B7A01C">
+				<source xmi:idref="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D">
+					<model ea_localid="923" type="Class" name="epo:ProcedureTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40838,9 +43215,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
-					<model ea_localid="1952" type="Class" name="epo:Certificate"/>
-					<role name="epo:hasCertification" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
+					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
+					<role name="epo:definesLotGroup" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -40849,56 +43226,55 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4578"/>
+				<model ea_localid="1460"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation to the proof of conformance.&#xA;&#xA;WG approval 30/05/2023"/>
+				<documentation value="Relation indicating a ProcedureTerm has a LotGroup."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasCertification"/>
-				<extendedProperties/>
+				<labels rb="0..*" rt="+epo:definesLotGroup"/>
+				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_3F693B40_13CE_47d1_A051_E627959E09EF">
-				<source xmi:idref="EAID_9099AF4F_0019_4768_B85A_99820F3E6307">
-					<model ea_localid="2618" type="Class" name="epo-ful:TransportMeansOperator"/>
+			<connector xmi:idref="EAID_01F4D5D0_A9BC_466c_B263_41FB53AE1719">
+				<source xmi:idref="EAID_7D5A2915_BFCE_41da_BDCF_E7310A70B190">
+					<model ea_localid="1911" type="Class" name="epo:ProcessPlanningTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53">
-					<model ea_localid="1902" type="Class" name="foaf:Person"/>
-					<role name="epo:playedBy" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D">
+					<model ea_localid="1368" type="Class" name="epo:Term"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4026"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3102"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:playedBy"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F79A58B0_3229_4f09_A0DE_6D0C5CD5A716">
-				<source xmi:idref="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225">
-					<model ea_localid="916" type="Class" name="person:Person"/>
+			<connector xmi:idref="EAID_48B39F0F_A79C_4ac8_995B_59C79DE365BD">
+				<source xmi:idref="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89">
+					<model ea_localid="2950" type="Class" name="epo:QualificationCriteriaSummary"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40908,8 +43284,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53">
-					<model ea_localid="1902" type="Class" name="foaf:Person"/>
+				<target xmi:idref="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D">
+					<model ea_localid="2590" type="Class" name="epo:ProcurementCriteriaSummary"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40919,7 +43295,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1438"/>
+				<model ea_localid="4518"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -40930,42 +43306,44 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_626183B8_93AC_4300_B227_85988E5F2016">
-				<source xmi:idref="EAID_29678A10_6473_461a_BE84_76269B5BBD68">
-					<model ea_localid="851" type="Class" name="locn:Address"/>
-					<role visibility="Public"/>
-					<type aggregation="none"/>
+			<connector xmi:idref="EAID_DB9BB27E_7F36_41c3_8166_36C3538F2F3A">
+				<source xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
+					<model ea_localid="922" type="Class" name="epo:Procedure"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="AllowDuplicates=0;Derived=0;Navigable=Non-Navigable;Owned=0;Union=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40">
-					<model ea_localid="986" type="Enumeration" name="at-voc:nuts"/>
-					<role name="epo:hasNutsCode" visibility="Public"/>
-					<type multiplicity="0..1" aggregation="none"/>
+				<target xmi:idref="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D">
+					<model ea_localid="2590" type="Class" name="epo:ProcurementCriteriaSummary"/>
+					<role name="epo:specifiesProcurementCriteriaSummary" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="AllowDuplicates=0;Derived=0;Navigable=Navigable;Owned=0;Union=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2568"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="2536"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasNutsCode"/>
-				<extendedProperties/>
+				<labels rb="0..*" rt="+epo:specifiesProcurementCriteriaSummary"/>
+				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C6F7D14A_11BF_430e_ABED_4C9AC22FFF2A">
-				<source xmi:idref="EAID_29678A10_6473_461a_BE84_76269B5BBD68">
-					<model ea_localid="851" type="Class" name="locn:Address"/>
+			<connector xmi:idref="EAID_277C636A_D943_484f_A80D_69ACBFA6147C">
+				<source xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4">
+					<model ea_localid="924" type="Class" name="epo:ProcurementCriterion"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40975,9 +43353,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="locn:addressID" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_D278CCD5_4E82_42f5_9A9B_C25371C94006">
+					<model ea_localid="985" type="Enumeration" name="at-voc:number-weight"/>
+					<role name="epo:hasWeightValueType" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -40986,21 +43364,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3024"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="A globally unique identifier for each instance of an Address.&#xA;&#xA;Additional Information:&#xA;The concept of adding a globally unique identifier for each instance of an address is a crucial part of the INSPIRE data spec. A number of EU countries have already implemented an ID (a UUID) in their Address Register/gazetteer, among them Denmark. OASIS xAL also includes an address identifier. It is the address Identifier that allows an address to be represented in a format other than INSPIRE whilst remaining conformant to the Core Vocabulary.&#xA;&#xA;The INSPIRE method of representing addresses is very detailed, designed primarily for use in databases of addresses. Whilst data that is published in full conformance with the INSPIRE data structure can be made available using the Location Core Vocabulary the reverse is not true since the Core Vocabulary allows much greater flexibility.&#xA;&#xA;Many datasets that include address data as one piece of information about something else are likely to have that data in simpler formats. These might be tailored to the specific need of the dataset, follow a national norm, or make use of a standard like vCard.&#xA;&#xA;To provide maximum flexibility in the Core Vocabulary, whilst remaining interoperable with INSPIRE Address Guidelines (which EU Member States are obliged to use), the Location Core Vocabulary provides the extra property of full address and makes use of INSPIRE's addressID."/>
+				<model ea_localid="1693"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="No definition. Waiting on CCCEV alignment.&#xA;&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+locn:addressID"/>
+				<labels rb="0..1" rt="+epo:hasWeightValueType"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D0F25E0B_E148_41e7_8C52_BAE14F5149F6">
-				<source xmi:idref="EAID_29678A10_6473_461a_BE84_76269B5BBD68">
-					<model ea_localid="851" type="Class" name="locn:Address"/>
+			<connector xmi:idref="EAID_849B9DC8_4F7D_4023_8EA7_36C327FE63FE">
+				<source xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4">
+					<model ea_localid="924" type="Class" name="epo:ProcurementCriterion"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -41010,65 +43386,64 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F">
-					<model ea_localid="969" type="Enumeration" name="at-voc:country"/>
-					<role name="epo:hasCountryCode" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_FAC84DE8_1A2E_4a6f_9F36_38EB360ACD58">
+					<model ea_localid="990" type="Enumeration" name="at-voc:requirement-stage"/>
+					<role name="epo:hasPerformingStaffQualificationInformation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation/>
+					<documentation value="Explanation as to if and/or when information of the persons to carry out the contract is to be provided.&#xA;WG Approval 09/11/2021&#xA;&#xA;The codelist to be used is at-voc:requirement-stage which is available at http://publications.europa.eu/resource/dataset/requirement-stage&#xA;"/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1707"/>
+				<model ea_localid="1492"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="&#xA;"/>
+				<documentation value="&#xA;Additional information: &#xA;&#xA;This relation corresponds in eForms to BT-79."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasCountryCode"/>
+				<labels rb="0..*" rt="+epo:hasPerformingStaffQualificationInformation"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_28236B4B_9308_46ad_9581_3601B37AA6A4">
-				<source xmi:idref="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225">
-					<model ea_localid="916" type="Class" name="person:Person"/>
+			<connector xmi:idref="EAID_03FC1FD2_BDF5_4ae5_8D8D_679E9486EE84">
+				<source xmi:idref="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD">
+					<model ea_localid="2951" type="Class" name="epo:QualificationCriterion"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_29678A10_6473_461a_BE84_76269B5BBD68">
-					<model ea_localid="851" type="Class" name="locn:Address"/>
-					<role name="cv:registeredAddress" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4">
+					<model ea_localid="924" type="Class" name="epo:ProcurementCriterion"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1507"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4519"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="The registered address relationship links a Resource with the legally registered Address.&#xA;&#xA;Additional Information:&#xA;It is the address to which formal communications can be sent, such as the postal address."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+cv:registeredAddress"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_6A50E4FC_E8DA_47c5_AD39_5BA2A66950B9">
-				<source xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
-					<model ea_localid="913" type="Class" name="org:Organization"/>
+			<connector xmi:idref="EAID_18CF5F1B_45DD_4b29_9E28_8D741E0840F3">
+				<source xmi:idref="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB">
+					<model ea_localid="1664" type="Class" name="epo-acc:ESPDRequest"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -41078,10 +43453,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_29678A10_6473_461a_BE84_76269B5BBD68">
-					<model ea_localid="851" type="Class" name="locn:Address"/>
-					<role name="cv:registeredAddress" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4">
+					<model ea_localid="924" type="Class" name="epo:ProcurementCriterion"/>
+					<role name="epo:specifiesProcurementCriterion" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -41089,33 +43464,33 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1750"/>
+				<model ea_localid="4776"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The registered address relationship links a Resource with the legally registered Address.&#xA;&#xA;Additional Information:&#xA;It is the address to which formal communications can be sent, such as the postal address.&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+cv:registeredAddress"/>
+				<labels rb="1..*" rt="+epo:specifiesProcurementCriterion"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9F23612C_1865_4c8b_82ED_0BAA7D433501">
-				<source xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
-					<model ea_localid="913" type="Class" name="org:Organization"/>
+			<connector xmi:idref="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4">
+				<source xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
+					<model ea_localid="906" type="Class" name="epo:Lot"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_29678A10_6473_461a_BE84_76269B5BBD68">
-					<model ea_localid="851" type="Class" name="locn:Address"/>
-					<role name="locn:address" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4">
+					<model ea_localid="924" type="Class" name="epo:ProcurementCriterion"/>
+					<role name="epo:specifiesProcurementCriterion" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -41124,21 +43499,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1506"/>
+				<model ea_localid="3063"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Associates any Resource with the corresponding Address.&#xA;&#xA;Additional Information:&#xA;Asserting the address relationship implies that the Resource has an Address."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+locn:address"/>
+				<labels rb="0..*" rt="+epo:specifiesProcurementCriterion"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6">
-				<source xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
-					<model ea_localid="913" type="Class" name="org:Organization"/>
+			<connector xmi:idref="EAID_FC7073E1_3362_472f_B087_27A619B6C819">
+				<source xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
+					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -41148,9 +43523,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo:hasLegalIdentifier" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4">
+					<model ea_localid="924" type="Class" name="epo:ProcurementCriterion"/>
+					<role name="epo:specifiesProcurementCriterion" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -41159,87 +43534,89 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4117"/>
+				<model ea_localid="3007"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasLegalIdentifier"/>
+				<labels rb="0..*" rt="+epo:specifiesProcurementCriterion"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_15FE118D_5443_4723_8887_BFF48DC77200">
-				<source xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
-					<model ea_localid="913" type="Class" name="org:Organization"/>
+			<connector xmi:idref="EAID_4E94CD77_EB61_4a9e_A6A4_14096262384A">
+				<source xmi:idref="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB">
+					<model ea_localid="1664" type="Class" name="epo-acc:ESPDRequest"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_B64484AC_23D5_423f_A683_B6FC29EE98CC">
-					<model ea_localid="978" type="Enumeration" name="at-voc:main-activity"/>
-					<role name="epo:hasMainActivity" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3">
+					<model ea_localid="926" type="Class" name="epo:ProcurementDocument"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1668"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The principal sectoral area in which an organisation operates.&#xA;&#xA;Additional information:&#xA;&#xA;The activities associated with buyers are derived from the top level of the Classification of the functions of the government (COFOG) from the United Nations Statistics Division.&#xA;&#xA;The activities associated with buyer are derived from sectors explicitly falling within the sectoral directive (2014/25/EU Art. 8 - Art. 14).&#xA;&#xA;WG Approval 05/05/2020&#xA;&#xA;"/>
+				<model ea_localid="2817"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasMainActivity"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_1FFF54A3_B491_40f9_AB43_E5A825C5F2E2">
-				<source xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
-					<model ea_localid="913" type="Class" name="org:Organization"/>
+			<connector xmi:idref="EAID_A00448A7_8270_497c_9895_20BF2C6316EF">
+				<source xmi:idref="EAID_F5AE8AA9_91EE_4cb3_AE98_14D4AF1A77C1">
+					<model ea_localid="951" type="Class" name="epo:TechnicalSpecification"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F">
-					<model ea_localid="969" type="Enumeration" name="at-voc:country"/>
-					<role name="epo:hasRegistrationCountry" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3">
+					<model ea_localid="926" type="Class" name="epo:ProcurementDocument"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4451"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="1373"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasRegistrationCountry"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_2FF93267_E672_481d_B370_202D9A0110E0">
-				<source xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
-					<model ea_localid="913" type="Class" name="org:Organization"/>
+			<connector xmi:idref="EAID_7B7715A6_6B94_492e_9116_A734400E6358">
+				<source xmi:idref="EAID_1062E1ED_D094_425e_B51B_9E700090C968">
+					<model ea_localid="1946" type="Class" name="epo:ProcurementProcessInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -41249,10 +43626,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
-					<model ea_localid="913" type="Class" name="org:Organization"/>
-					<role name="org:subOrganizationOf" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
+					<model ea_localid="906" type="Class" name="epo:Lot"/>
+					<role name="epo:concernsLot" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -41260,34 +43637,34 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4823"/>
+				<model ea_localid="3107"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Represents hierarchical containment of Organizations or OrganizationalUnits; indicates an Organization which contains this Organization.&#xA;&#xA;WG 31/08/2023"/>
+				<documentation value="Relates to Lot."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+org:subOrganizationOf"/>
+				<labels rb="0..1" rt="+epo:concernsLot"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D01BEE04_A51F_434f_9F2B_CD75C658FF42">
-				<source xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
-					<model ea_localid="913" type="Class" name="org:Organization"/>
+			<connector xmi:idref="EAID_ABA2D6DE_6BD5_49b4_9900_A82C2C734195">
+				<source xmi:idref="EAID_1062E1ED_D094_425e_B51B_9E700090C968">
+					<model ea_localid="1946" type="Class" name="epo:ProcurementProcessInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
-					<model ea_localid="1952" type="Class" name="epo:Certificate"/>
-					<role name="epo:hasCertification" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
+					<model ea_localid="922" type="Class" name="epo:Procedure"/>
+					<role name="epo:concernsProcedure" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -41295,21 +43672,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4576"/>
+				<model ea_localid="3111"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation to the proof of conformance.&#xA;&#xA;WG approval 30/05/2023"/>
+				<documentation value="Relates to Procedure."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasCertification"/>
-				<extendedProperties/>
+				<labels rb="0..1" rt="+epo:concernsProcedure"/>
+				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D8B16DE0_0613_42f0_811D_F82085D6A825">
-				<source xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
-					<model ea_localid="913" type="Class" name="org:Organization"/>
+			<connector xmi:idref="EAID_28460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
+				<source xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
+					<model ea_localid="922" type="Class" name="epo:Procedure"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -41319,9 +43696,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_5FC03FB6_FD84_4bb6_988F_5C88024446CE">
-					<model ea_localid="966" type="Enumeration" name="at-voc:buyer-legal-type"/>
-					<role name="epo:hasBuyerLegalType" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_49EC0F16_408C_4b28_B611_0048946DC070">
+					<model ea_localid="927" type="Class" name="epo:ProcurementServiceProvider"/>
+					<role name="epo:isExecutedByProcurementServiceProvider" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -41330,89 +43707,89 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1656"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="A category that indicates the right of an Organisation to play the role of a buyer.&#xA;&#xA;Additional Information:&#xA;The category also effects the rules that the buyer has to abide to within the public procurement procedure.&#xA;WG 07/09/2021&#xA;&#xA;"/>
+				<model ea_localid="2510"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasBuyerLegalType"/>
+				<labels rb="0..1" rt="+epo:isExecutedByProcurementServiceProvider"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB">
-				<source xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
-					<model ea_localid="913" type="Class" name="org:Organization"/>
+			<connector xmi:idref="EAID_A5FB826B_2F91_4a40_97ED_A515BDF3B98B">
+				<source xmi:idref="EAID_F6DB02CC_2D4E_4a02_B1E9_538EB3E24ED2">
+					<model ea_localid="3135" type="Note"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo:hasTaxIdentifier" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_49EC0F16_408C_4b28_B611_0048946DC070">
+					<model ea_localid="927" type="Class" name="epo:ProcurementServiceProvider"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4118"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<model ea_localid="4814"/>
+				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasTaxIdentifier"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_B6D90197_EC7F_4a01_8047_2DAC846D9C03">
-				<source xmi:idref="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9">
-					<model ea_localid="3466" type="Class" name="epo-sub:NationalPreQualificationData"/>
+			<connector xmi:idref="EAID_4A4C0A9C_E865_4a6a_B108_12037190211E">
+				<source xmi:idref="EAID_CACB5357_5E4E_455f_8BFF_A7D6264C2555">
+					<model ea_localid="2943" type="Class" name="epo:ProfessionalSuitabilitySummary"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
-					<model ea_localid="913" type="Class" name="org:Organization"/>
-					<role name="epo-sub:concernsOrganisation" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB">
+					<model ea_localid="2593" type="Class" name="epo:SelectionCriteriaSummary"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="5177"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4513"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="Relates to Organization.&#xA;&#xA;WG approval 05/03/2024&#xA;&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo-sub:concernsOrganisation"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F">
-				<source xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
-					<model ea_localid="1628" type="Class" name="epo-sub:ESPD"/>
+			<connector xmi:idref="EAID_9866393B_8067_4f18_9B28_69541B862505">
+				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
+					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -41422,10 +43799,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
-					<model ea_localid="913" type="Class" name="org:Organization"/>
-					<role name="epo-sub:providesInformationOn" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4">
+					<model ea_localid="2635" type="Class" name="epo:Project"/>
+					<role name="epo:refersToProject" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -41433,21 +43810,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="5257"/>
+				<model ea_localid="4074"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Offers information about an instance of a concept.&#xA;&#xA;WG approval 05/03/2024"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo-sub:providesInformationOn"/>
+				<labels rb="0..1" rt="+epo:refersToProject"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_677B606B_352C_459b_9644_C85CAC550728">
-				<source xmi:idref="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225">
-					<model ea_localid="916" type="Class" name="person:Person"/>
+			<connector xmi:idref="EAID_D8A21C51_ABAE_473e_819D_1729AC275BCF">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -41457,10 +43834,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F">
-					<model ea_localid="969" type="Enumeration" name="at-voc:country"/>
-					<role name="epo:hasNationality" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4">
+					<model ea_localid="2635" type="Class" name="epo:Project"/>
+					<role name="epo:refersToProject" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -41468,52 +43845,55 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1437"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="&#xA;"/>
+				<model ea_localid="5331"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasNationality"/>
+				<labels rb="0..1" rt="+epo:refersToProject"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7E6F9511_A2DD_4f1c_B8AA_9EA312803C2B">
-				<source xmi:idref="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225">
-					<model ea_localid="916" type="Class" name="person:Person"/>
-					<role visibility="Public"/>
-					<type aggregation="none"/>
+			<connector xmi:idref="EAID_8D1FC032_83F1_4753_BF39_B673852D3F9A">
+				<source xmi:idref="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB">
+					<model ea_localid="2593" type="Class" name="epo:SelectionCriteriaSummary"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="AllowDuplicates=0;Derived=0;Navigable=Non-Navigable;Owned=0;Union=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F">
-					<model ea_localid="969" type="Enumeration" name="at-voc:country"/>
-					<role name="epo:hasCountryOfBirth" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89">
+					<model ea_localid="2950" type="Class" name="epo:QualificationCriteriaSummary"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="AllowDuplicates=0;Derived=0;Navigable=Navigable;Owned=0;Union=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2567"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The country in which the Person was born.&#xA;"/>
+				<model ea_localid="3977"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasCountryOfBirth"/>
-				<extendedProperties/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_2EC2BFAF_50AE_496d_A93E_27A2FA651CF4">
-				<source xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524">
-					<model ea_localid="1079" type="Class" name="epo-not:CompletionNotice"/>
+			<connector xmi:idref="EAID_A04862A6_080C_43b0_8DCE_04D577B2D3F0">
+				<source xmi:idref="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD">
+					<model ea_localid="2951" type="Class" name="epo:QualificationCriterion"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -41523,9 +43903,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8">
-					<model ea_localid="854" type="Class" name="epo:AwardDecision"/>
-					<role name="epo:refersToAwardDecision" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD">
+					<model ea_localid="2951" type="Class" name="epo:QualificationCriterion"/>
+					<role name="epo:includesNationalCriterion" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -41534,56 +43914,55 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4646"/>
+				<model ea_localid="4948"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating that a Criterion contains a Criterion that is specific to a given Member State.&#xA;&#xA;Additional Information:&#xA;In the ESPD, a Subcriterion is used to define national sub-criteria; maps to a UBL-2.3 cac:SubTenderingCriterion class. It is currently used only for purely national criteria, to be able to establish the mapping from eCertis.&#xA;&#xA;WG approval 07/11/2023&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:refersToAwardDecision"/>
+				<labels rb="0..*" rt="+epo:includesNationalCriterion"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_5465A41A_7AD8_4020_9E57_C032F2801A7A">
-				<source xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2">
-					<model ea_localid="1077" type="Class" name="epo-not:ResultNotice"/>
+			<connector xmi:idref="EAID_B61D93A6_A88F_4730_93D5_612F44B8ECE4">
+				<source xmi:idref="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122">
+					<model ea_localid="942" type="Class" name="epo:SelectionCriterion"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8">
-					<model ea_localid="854" type="Class" name="epo:AwardDecision"/>
-					<role name="epo:announcesAwardDecision" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD">
+					<model ea_localid="2951" type="Class" name="epo:QualificationCriterion"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2705"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1394"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:announcesAwardDecision"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A1441146_4BC0_49e9_847D_7D2636FCB6FA">
-				<source xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257">
-					<model ea_localid="1078" type="Class" name="epo-not:ContractModificationNotice"/>
+			<connector xmi:idref="EAID_30CBA4D5_2CA0_4043_A8BC_8FBCF102380D">
+				<source xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -41593,10 +43972,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8">
-					<model ea_localid="854" type="Class" name="epo:AwardDecision"/>
-					<role name="epo:refersToAwardDecision" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3">
+					<model ea_localid="1035" type="Enumeration" name="at-voc:measurement-unit"/>
+					<role name="epo:hasUnitCode" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -41604,21 +43983,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4658"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
+				<model ea_localid="2428"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:refersToAwardDecision"/>
+				<labels rb="1" rt="+epo:hasUnitCode"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_EBAA0FEE_B552_4003_8B98_ADD4600E7BA1">
-				<source xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C">
-					<model ea_localid="1076" type="Class" name="epo-not:DirectAwardPrenotificationNotice"/>
+			<connector xmi:idref="EAID_0167DB54_9519_42f6_BD3B_F46B589F376C">
+				<source xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD">
+					<model ea_localid="2621" type="Class" name="epo-ful:AbstractContainer"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -41628,10 +44005,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8">
-					<model ea_localid="854" type="Class" name="epo:AwardDecision"/>
-					<role name="epo:announcesAwardDecision" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasGrossWeight" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -41639,21 +44016,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4483"/>
+				<model ea_localid="3436"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The total mass of goods including the packaging. &#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:announcesAwardDecision"/>
+				<labels rb="0..1" rt="+epo-ful:hasGrossWeight"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_0823E4D3_4706_4097_A6E7_D6BCEF598E62">
-				<source xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
-					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
+			<connector xmi:idref="EAID_05490F76_8D40_4d74_97D4_F3871039E80A">
+				<source xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD">
+					<model ea_localid="2621" type="Class" name="epo-ful:AbstractContainer"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -41663,9 +44040,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07">
-					<model ea_localid="933" type="Class" name="epo:Purpose"/>
-					<role name="epo:hasPurpose" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasNetWeight" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -41674,21 +44051,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3128"/>
+				<model ea_localid="4043"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating the Purpose of a concept."/>
+				<documentation value="The total mass of goods without the packaging. &#xA;&#xA;WG approval 18/06/2024&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasPurpose"/>
+				<labels rb="0..1" rt="+epo-ful:hasNetWeight"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_2FC633C9_64DB_4b46_9190_197D4A4F4C63">
-				<source xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
-					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
+			<connector xmi:idref="EAID_0AC5D04E_7364_4118_9D94_CE93A68B3CF9">
+				<source xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A">
+					<model ea_localid="2037" type="Class" name="epo-ord:OrderLine"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -41698,30 +44075,32 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66">
-					<model ea_localid="977" type="Enumeration" name="at-voc:legal-basis"/>
-					<role name="epo:hasLegalBasis" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-cat:hasQuantity" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation value="The legal basis under which the procurement procedure takes place.&#xA;&#xA;Additional Information: &#xA;For example European Directives or Regulations, national law&#xA;&#xA;WG 09/11/2021&#xA;&#xA;The codelist to be used is at-voc:legal-basis which is available at http://publications.europa.eu/resource/dataset/legal-basis&#xA;"/>
+					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1424"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The legal basis under which the procurement procedure takes place.&#xA;&#xA;Additional Information: &#xA;For example European Directives or Regulations, national laws etc.&#xA;The recommended code list is the example for the legal basis at the European level.&#xA;&#xA;WG 04/04/2023&#xA;&#xA;"/>
+				<model ea_localid="3279"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasLegalBasis"/>
+				<labels rb="1" rt="+epo-cat:hasQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8">
-				<source xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
-					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
+			<connector xmi:idref="EAID_0F1AB34D_EA8C_44fb_B232_AA4B138F066B">
+				<source xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD">
+					<model ea_localid="2621" type="Class" name="epo-ful:AbstractContainer"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -41731,9 +44110,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:hasLaunchFrameworkAgreementMaximumValue" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasLength" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -41742,55 +44121,56 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2799"/>
+				<model ea_localid="4048"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The horizontal measurement.&#xA;&#xA;Additional Information:&#xA;The length is the longer side between the length and the width.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasLaunchFrameworkAgreementMaximumValue"/>
+				<labels rb="0..1" rt="+epo-ful:hasLength"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_AB768772_FAC4_4353_A1C6_F384FEC304AE">
-				<source xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
-					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
+			<connector xmi:idref="EAID_11D3CF7A_4949_410c_A7E5_91AB91646B43">
+				<source xmi:idref="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73">
+					<model ea_localid="3236" type="Class" name="epo-ful:ReceiptAdviceLine"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7">
-					<model ea_localid="2078" type="Class" name="epo:ProcurementElement"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasOversupplyQuantity" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3343"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4891"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo-ful:hasOversupplyQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_AFFFCDAE_C459_4420_9649_6F7949D3D9BA">
-				<source xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A">
-					<model ea_localid="917" type="Class" name="epo:PlannedProcurementPart"/>
+			<connector xmi:idref="EAID_1F622DE3_2DEE_491f_A5F1_B592E89F9030">
+				<source xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
+					<model ea_localid="1831" type="Class" name="epo-cat:Price"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -41800,100 +44180,102 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
-					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
-					<role name="epo:foreseesProcurementObject" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-cat:hasQuantityThreshold" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation/>
+					<documentation value="The minimum quantity of the item that can be ordered to the given net monetary value."/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4441"/>
+				<model ea_localid="3057"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating the instance of a Procurement Object that is planned.&#xA;&#xA;Additional Information:&#xA;The properties of the Procurement Object that is foreseen should be read as foreseen properties. &#xA;For example, Procedure isSMESuitable should be read as Procedure foreseesToBeSMESuitable.&#xA;For example, Procedure isFundedBy should be read as Procedure foreseesToBeFundedBy."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:foreseesProcurementObject"/>
+				<labels rb="0..1" rt="+epo-cat:hasQuantityThreshold"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_B8BA8A30_8A22_4475_A8A7_C0037581B6D3">
-				<source xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
-					<model ea_localid="922" type="Class" name="epo:Procedure"/>
+			<connector xmi:idref="EAID_2ECAEC7F_2186_4280_A2C0_6DC585D1EE96">
+				<source xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD">
+					<model ea_localid="2621" type="Class" name="epo-ful:AbstractContainer"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
-					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasGrossVolume" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2936"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="3431"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The amount of space that is required including the packaging.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo-ful:hasGrossVolume"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_BE41CCFB_8495_440b_ADCE_908A980E0342">
-				<source xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
-					<model ea_localid="906" type="Class" name="epo:Lot"/>
+			<connector xmi:idref="EAID_30A83FCD_B7E1_4f9c_95D1_48B460BCC4B8">
+				<source xmi:idref="EAID_4A472A70_BC06_4c78_BBE0_0475CA9DB28A">
+					<model ea_localid="3581" type="Class" name="epo-inv:InvoiceLine"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
-					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-cat:hasQuantity" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2659"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="5383"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="1" rt="+epo-cat:hasQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_20732599_332F_4f0e_BFE6_593632EDB11F">
-				<source xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
-					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
+			<connector xmi:idref="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65">
+				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
+					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -41903,10 +44285,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
-					<model ea_localid="906" type="Class" name="epo:Lot"/>
-					<role name="epo:setsGroupingContextForLot" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-cat:hasNetQuantity" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -41914,34 +44296,34 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2780"/>
+				<model ea_localid="3027"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The net quantity of the item that is contained in each consumable unit, excluding any packaging materials.&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1..*" rt="+epo:setsGroupingContextForLot"/>
+				<labels rb="0..1" rt="+epo-cat:hasNetQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_3656734D_7238_4738_9F80_EC054ABA2E24">
-				<source xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524">
-					<model ea_localid="1079" type="Class" name="epo-not:CompletionNotice"/>
+			<connector xmi:idref="EAID_3D54F6F9_658D_40fe_9D16_D79F46DB945C">
+				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
+					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
-					<model ea_localid="906" type="Class" name="epo:Lot"/>
-					<role name="epo:refersToLot" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasNetWeight" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -41949,21 +44331,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4647"/>
+				<model ea_localid="4251"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The total mass of goods without the packaging. &#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1..*" rt="+epo:refersToLot"/>
+				<labels rb="0..1" rt="+epo-ful:hasNetWeight"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_389050E1_4285_45aa_87A9_6A9BA62CD554">
-				<source xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C">
-					<model ea_localid="1076" type="Class" name="epo-not:DirectAwardPrenotificationNotice"/>
+			<connector xmi:idref="EAID_45480564_D6B2_41da_8694_DC63D52825C1">
+				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
+					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -41973,10 +44355,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
-					<model ea_localid="906" type="Class" name="epo:Lot"/>
-					<role name="epo:announcesLot" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasChargeableWeight" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -41984,21 +44366,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4641"/>
+				<model ea_localid="4252"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The "/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1..*" rt="+epo:announcesLot"/>
+				<labels rb="0..1" rt="+epo-ful:hasChargeableWeight"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547">
-				<source xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
-					<model ea_localid="958" type="Class" name="epo:Tender"/>
+			<connector xmi:idref="EAID_4BA4CF11_20FC_48b0_A739_471F732B8482">
+				<source xmi:idref="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73">
+					<model ea_localid="3236" type="Class" name="epo-ful:ReceiptAdviceLine"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -42008,10 +44390,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
-					<model ea_localid="906" type="Class" name="epo:Lot"/>
-					<role name="epo:isSubmittedForLot" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasReceivedQuantity" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -42019,21 +44401,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2783"/>
+				<model ea_localid="4890"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:isSubmittedForLot"/>
+				<labels rb="0..1" rt="+epo-ful:hasReceivedQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_53A06CD6_3F60_4e8f_A32A_669CA4829E33">
-				<source xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257">
-					<model ea_localid="1078" type="Class" name="epo-not:ContractModificationNotice"/>
+			<connector xmi:idref="EAID_55AE0CEF_3CD9_464a_82E7_387507253B10">
+				<source xmi:idref="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07">
+					<model ea_localid="933" type="Class" name="epo:Purpose"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -42043,10 +44425,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
-					<model ea_localid="906" type="Class" name="epo:Lot"/>
-					<role name="epo:refersToLot" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo:hasTotalQuantity" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -42054,21 +44436,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4480"/>
+				<model ea_localid="2883"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The number of units required.&#xA;&#xA;Additional Information:&#xA;The quantity needs to go along with the unit. &#xA;&#xA;&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1..*" rt="+epo:refersToLot"/>
+				<labels rb="0..1" rt="+epo:hasTotalQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_55B64699_B98C_49f8_AAA8_01BAEEF0DD49">
-				<source xmi:idref="EAID_17662AEF_1321_446a_AE42_0583F7417A79">
-					<model ea_localid="1075" type="Class" name="epo-not:CompetitionNotice"/>
+			<connector xmi:idref="EAID_5C5BD66A_585D_4646_9A7B_894EA99DED44">
+				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
+					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -42078,10 +44460,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
-					<model ea_localid="906" type="Class" name="epo:Lot"/>
-					<role name="epo:announcesLot" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasTransportHandlingUnitQuantity" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -42089,21 +44471,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2402"/>
+				<model ea_localid="3985"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating the number of the Transport Handling Unit.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1..*" rt="+epo:announcesLot"/>
+				<labels rb="0..1" rt="+epo-ful:hasTransportHandlingUnitQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7355842B_BD0C_4fab_8681_C210E308328D">
-				<source xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2">
-					<model ea_localid="1077" type="Class" name="epo-not:ResultNotice"/>
+			<connector xmi:idref="EAID_65E8EC44_CB4C_4aa9_8218_75D01ED44538">
+				<source xmi:idref="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC">
+					<model ea_localid="2117" type="Class" name="epo-ful:DespatchLine"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -42113,10 +44495,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
-					<model ea_localid="906" type="Class" name="epo:Lot"/>
-					<role name="epo:refersToLot" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasDespatchedQuantity" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -42124,34 +44506,34 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2607"/>
+				<model ea_localid="3426"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The Quantity that has been sent.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1..*" rt="+epo:refersToLot"/>
+				<labels rb="1" rt="+epo-ful:hasDespatchedQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349">
-				<source xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
-					<model ea_localid="922" type="Class" name="epo:Procedure"/>
+			<connector xmi:idref="EAID_73E249AD_BE82_405c_AC1C_956CD538804F">
+				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
+					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
-					<model ea_localid="906" type="Class" name="epo:Lot"/>
-					<role name="epo:hasProcurementScopeDividedIntoLot" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasLoadingMeter" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -42159,67 +44541,68 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1467"/>
+				<model ea_localid="5402"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The area of the Consignment in meters divided by the width of the truck, which is considered to be 2.4 meters.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1..*" rt="+epo:hasProcurementScopeDividedIntoLot"/>
+				<labels rb="0..1" rt="+epo-ful:hasLoadingMeter"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_71953D29_84AD_4774_9664_258E887283AF">
-				<source xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A">
-					<model ea_localid="917" type="Class" name="epo:PlannedProcurementPart"/>
+			<connector xmi:idref="EAID_75378C4F_ABAD_440f_8E1B_502A7CDA0486">
+				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
+					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7">
-					<model ea_localid="2078" type="Class" name="epo:ProcurementElement"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasLoadingLength" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2660"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4035"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The length "/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo-ful:hasLoadingLength"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D77EAC2F_A434_424a_8ECC_D32EF06886BB">
-				<source xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A">
-					<model ea_localid="917" type="Class" name="epo:PlannedProcurementPart"/>
+			<connector xmi:idref="EAID_76005691_B905_4be3_99BF_394E56A591CE">
+				<source xmi:idref="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73">
+					<model ea_localid="3236" type="Class" name="epo-ful:ReceiptAdviceLine"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
-					<model ea_localid="915" type="Class" name="epo:Period"/>
-					<role name="epo:hasPlannedPeriod" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasShortQuantity" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -42228,21 +44611,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1441"/>
+				<model ea_localid="4889"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasPlannedPeriod"/>
+				<labels rb="0..1" rt="+epo-ful:hasShortQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_EB2AC560_378D_4c18_9647_0E2E150D7463">
-				<source xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A">
-					<model ea_localid="917" type="Class" name="epo:PlannedProcurementPart"/>
+			<connector xmi:idref="EAID_770594A4_09FD_4b6e_8D27_8D44BA5CA36A">
+				<source xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD">
+					<model ea_localid="2621" type="Class" name="epo-ful:AbstractContainer"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -42252,9 +44635,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969">
-					<model ea_localid="1698" type="Class" name="epo:Duration"/>
-					<role name="epo:hasPlannedDuration" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasWidth" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -42263,34 +44646,34 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2891"/>
+				<model ea_localid="4050"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The measurement of the depth.&#xA;&#xA;Additional Information:&#xA;The width is the shorter side between the length and the width.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasPlannedDuration"/>
+				<labels rb="0..1" rt="+epo-ful:hasWidth"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_5A3E83F2_4A0C_4707_ACA1_C8D3B87F7C00">
-				<source xmi:idref="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B">
-					<model ea_localid="1074" type="Class" name="epo-not:PlanningNotice"/>
+			<connector xmi:idref="EAID_838E60F9_C54C_4c80_88A3_D705701F1971">
+				<source xmi:idref="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31">
+					<model ea_localid="2905" type="Class" name="epo-con:Deliverable"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A">
-					<model ea_localid="917" type="Class" name="epo:PlannedProcurementPart"/>
-					<role name="epo:announcesPlannedProcurementPart" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-cat:hasQuantity" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -42298,55 +44681,56 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1433"/>
+				<model ea_localid="4454"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:announcesPlannedProcurementPart"/>
+				<labels rb="0..1" rt="+epo-cat:hasQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_8A689597_C8A3_475b_AD2A_EA61AB152656">
-				<source xmi:idref="EAID_A7E3EEA1_BBD5_409a_9717_8E5FF181CF7E">
-					<model ea_localid="2983" type="Note"/>
+			<connector xmi:idref="EAID_87C6E00F_DAEB_4e79_8340_AC2FC83206DA">
+				<source xmi:idref="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9">
+					<model ea_localid="3466" type="Class" name="epo-sub:NationalPreQualificationData"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A">
-					<model ea_localid="917" type="Class" name="epo:PlannedProcurementPart"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-sub:providesOrganisationEmployeeQuantity" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4560"/>
-				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<model ea_localid="5179"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
-				<documentation/>
+				<parameterSubstitutions/>
+				<documentation value="The number of people hired by the Organization.&#xA;&#xA;WG approval 05/03/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo-sub:providesOrganisationEmployeeQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_B62DE754_3523_45c7_9426_333EF3B4B423">
-				<source xmi:idref="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C">
-					<model ea_localid="1948" type="Class" name="epo:CertificationLabel"/>
+			<connector xmi:idref="EAID_87DEA454_B158_4e44_91D6_F1D258049A37">
+				<source xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD">
+					<model ea_localid="2621" type="Class" name="epo-ful:AbstractContainer"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -42356,9 +44740,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_7C286914_0A87_4d10_9FFD_8653AC16BD03">
-					<model ea_localid="1949" type="Enumeration" name="at-voc-new:certification-label-type"/>
-					<role name="epo:hasLabelType" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasHeight" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -42367,19 +44751,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3194"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The label type such environmental, quality, social etc."/>
+				<model ea_localid="4049"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The vertical measurement.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasLabelType"/>
+				<labels rb="0..1" rt="+epo-ful:hasHeight"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C3BED690_3A74_4118_8357_6957359310FB">
-				<source xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
-					<model ea_localid="1952" type="Class" name="epo:Certificate"/>
+			<connector xmi:idref="EAID_8C56C81B_B46D_49ef_B3BF_333FDA416F39">
+				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
+					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -42389,9 +44775,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C">
-					<model ea_localid="1948" type="Class" name="epo:CertificationLabel"/>
-					<role name="epo:attestedByLabel" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasGrossVolume" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -42400,21 +44786,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3192"/>
+				<model ea_localid="3421"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating which label the certificate is about. &#xA;&#xA;WG approval 28/07/2022"/>
+				<documentation value="The amount of space that is required including the packaging.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:attestedByLabel"/>
+				<labels rb="0..1" rt="+epo-ful:hasGrossVolume"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_169198B9_544A_4d67_9273_0F076E0C1306">
-				<source xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
-					<model ea_localid="922" type="Class" name="epo:Procedure"/>
+			<connector xmi:idref="EAID_95D24239_8F4D_44c8_97D1_1C26296607DA">
+				<source xmi:idref="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC">
+					<model ea_localid="2117" type="Class" name="epo-ful:DespatchLine"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -42424,10 +44810,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_9303CE6E_F83F_4762_A306_7FCBDE0E5A37">
-					<model ea_localid="989" type="Enumeration" name="at-voc:procurement-procedure-type"/>
-					<role name="epo:hasProcedureType" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasOutstandingQuantity" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -42435,19 +44821,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1427"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Identification of the Procedure used.&#xA;&#xA;WG Approval 09/06/2020&#xA;"/>
+				<model ea_localid="3427"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The Quantity of non-despatched Goods Items.&#xA;&#xA;WG approval 05/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:hasProcedureType"/>
+				<labels rb="0..1" rt="+epo-ful:hasOutstandingQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A5762169_952E_4db0_9FE7_6B4A895F2AF1">
-				<source xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2">
-					<model ea_localid="1077" type="Class" name="epo-not:ResultNotice"/>
+			<connector xmi:idref="EAID_9EA3B8C3_695C_4b42_8481_D40EEC904171">
+				<source xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
+					<model ea_localid="1831" type="Class" name="epo-cat:Price"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -42457,10 +44845,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
-					<model ea_localid="922" type="Class" name="epo:Procedure"/>
-					<role name="epo:refersToProcedure" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-cat:hasBaseQuantity" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -42468,21 +44856,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2604"/>
+				<model ea_localid="3060"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The quantity at which the net monetary value applies."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:refersToProcedure"/>
+				<labels rb="0..1" rt="+epo-cat:hasBaseQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_AEF23C3F_F74B_434a_AA2D_59AF706E79E6">
-				<source xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257">
-					<model ea_localid="1078" type="Class" name="epo-not:ContractModificationNotice"/>
+			<connector xmi:idref="EAID_A0FABF7A_1814_4dd4_BD97_28BD0C9F2F49">
+				<source xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
+					<model ea_localid="1831" type="Class" name="epo-cat:Price"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -42492,32 +44880,32 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
-					<model ea_localid="922" type="Class" name="epo:Procedure"/>
-					<role name="epo:refersToProcedure" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-cat:hasOrderabableUnitFactorRate" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation/>
+					<documentation value="The factor by which the base unit of the price can be converted to orderable unit.&#xA;&#xA;Additional information:&#xA;This is needed when the base price is provided different than the orderable unit. For example, when selling paper, the price may be set per page, but the  orderable unit is a package of 500 pieces. Therefore the price needs to be converted to the orderable unit. &#xA;&#xA;"/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4487"/>
+				<model ea_localid="3056"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:refersToProcedure"/>
+				<labels rb="0..1" rt="+epo-cat:hasOrderabableUnitFactorRate"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_B1307E49_0838_4569_819E_D05D699E0983">
-				<source xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C">
-					<model ea_localid="1076" type="Class" name="epo-not:DirectAwardPrenotificationNotice"/>
+			<connector xmi:idref="EAID_B1577190_0947_4041_ACDC_BC0C377734AF">
+				<source xmi:idref="EAID_BB1AAA4C_E66B_4fde_A0B6_1A30FC13503B">
+					<model ea_localid="2622" type="Class" name="epo-ful:TemperatureSpecification"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -42527,10 +44915,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
-					<model ea_localid="922" type="Class" name="epo:Procedure"/>
-					<role name="epo:announcesProcedure" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasMaximumTemperature" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -42538,21 +44926,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2872"/>
+				<model ea_localid="4046"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The highest tolerated temperature.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:announcesProcedure"/>
+				<labels rb="0..1" rt="+epo-ful:hasMaximumTemperature"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_E69DD4EA_847D_4a36_96C4_9709B72BA620">
-				<source xmi:idref="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB">
-					<model ea_localid="1664" type="Class" name="epo-acc:ESPDRequest"/>
+			<connector xmi:idref="EAID_B4F0448C_1741_4b38_9973_F506CB883BA2">
+				<source xmi:idref="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73">
+					<model ea_localid="3236" type="Class" name="epo-ful:ReceiptAdviceLine"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -42562,10 +44950,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
-					<model ea_localid="922" type="Class" name="epo:Procedure"/>
-					<role name="epo:concernsProcedure" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasRejectedQuantity" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -42573,21 +44961,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4775"/>
+				<model ea_localid="4892"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relates to Procedure.&#xA;&#xA;WG approval 05/03/2024&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:concernsProcedure"/>
+				<labels rb="0..1" rt="+epo-ful:hasRejectedQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F365A241_4CD0_4009_A42F_041D198E70E4">
-				<source xmi:idref="EAID_17662AEF_1321_446a_AE42_0583F7417A79">
-					<model ea_localid="1075" type="Class" name="epo-not:CompetitionNotice"/>
+			<connector xmi:idref="EAID_B9C9C412_36FA_46d5_AA00_34CA1CC60CA2">
+				<source xmi:idref="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4">
+					<model ea_localid="1940" type="Class" name="epo-cat:ItemProperty"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -42597,10 +44985,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
-					<model ea_localid="922" type="Class" name="epo:Procedure"/>
-					<role name="epo:announcesProcedure" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-cat:hasQualifiedValue" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -42608,21 +44996,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2401"/>
+				<model ea_localid="3168"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Qualified value of the property, which is defined in a classification scheme.&#xA;&#xA;Additional Information:&#xA;For example, the (0173-1#02-AAA026#007) drilling diameter of an item has value of 12 inches. &#xA;&#xA;WG approval 28/07/2022"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:announcesProcedure"/>
+				<labels rb="0..1" rt="+epo-cat:hasQualifiedValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F5AC099A_F1E0_4926_9F7B_6C2B6C33321B">
-				<source xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524">
-					<model ea_localid="1079" type="Class" name="epo-not:CompletionNotice"/>
+			<connector xmi:idref="EAID_C5E4577A_5BDB_4176_9418_BB9B2E957222">
+				<source xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD">
+					<model ea_localid="2621" type="Class" name="epo-ful:AbstractContainer"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -42632,10 +45020,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
-					<model ea_localid="922" type="Class" name="epo:Procedure"/>
-					<role name="epo:refersToProcedure" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasTotalGoodsItemQuantity" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -42643,21 +45031,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4485"/>
+				<model ea_localid="4037"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating the number of the Goods Items.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:refersToProcedure"/>
+				<labels rb="0..1" rt="+epo-ful:hasTotalGoodsItemQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_97176015_1FBF_4d9c_9A77_C246A6F21E71">
-				<source xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
-					<model ea_localid="1952" type="Class" name="epo:Certificate"/>
+			<connector xmi:idref="EAID_E93A74BB_614F_4b1c_AE59_F45CD626BB7A">
+				<source xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B">
+					<model ea_localid="1057" type="Class" name="epo-cat:CatalogueLine"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -42667,9 +45055,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1">
-					<model ea_localid="1951" type="Class" name="epo:Certifier"/>
-					<role name="epo:issuedByCertifier" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-cat:hasMinimumQuantityGuaranteedForDelivery" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -42678,21 +45066,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3193"/>
+				<model ea_localid="3026"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating the Certifier responsible for providing the ItemCertificate.&#xA;&#xA;Additional Information:&#xA;Certifier is a role played by an organisation.&#xA;&#xA;WG approval 26/07/2022"/>
+				<documentation value="The minimum quantity of an item that is guaranteed by the seller to be delivered.&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:issuedByCertifier"/>
+				<labels rb="0..1" rt="+epo-cat:hasMinimumQuantityGuaranteedForDelivery"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_55771AD3_C775_4324_AEBA_EA277D05F7E8">
-				<source xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
-					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
+			<connector xmi:idref="EAID_F475E438_48A3_41f5_A736_268C91FF8AF2">
+				<source xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B">
+					<model ea_localid="1057" type="Class" name="epo-cat:CatalogueLine"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -42702,10 +45090,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo:hasInternalIdentifier" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-cat:hasMaximumOrderQuantity" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -42713,21 +45101,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4821"/>
+				<model ea_localid="3025"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The maximum number of orderable units that can be ordered according to details provided in the catalogue line, such as price.&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasInternalIdentifier"/>
+				<labels rb="0..1" rt="+epo-cat:hasMaximumOrderQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_608CC8C6_3A48_4541_8467_9DDA71E8D534">
-				<source xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
-					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
+			<connector xmi:idref="EAID_F70CA1D5_5E5E_4028_8583_6B810BB672CD">
+				<source xmi:idref="EAID_BB1AAA4C_E66B_4fde_A0B6_1A30FC13503B">
+					<model ea_localid="2622" type="Class" name="epo-ful:TemperatureSpecification"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -42737,9 +45125,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasMinimumTemperature" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -42748,21 +45136,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4688"/>
+				<model ea_localid="4045"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="A unique identifier of the instance of the concept.&#xA;&#xA;Additional Information&#xA;&#xA;For example, in the case of the Procurement Identifier, this could be the European Public Procurement Identifier, and/or any other identifier provided by the buyer, the service provider or any other stakeholder.&#xA;&#xA;WG Approval 12/11/2019"/>
+				<documentation value="The lowest tolerated temperature.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+adms:identifier"/>
+				<labels rb="0..1" rt="+epo-ful:hasMinimumTemperature"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_72A7614C_D179_4558_8F62_2FA41A99DF74">
-				<source xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
-					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
+			<connector xmi:idref="EAID_F93A2AAD_C014_4fa4_88EE_23DE2339DB3C">
+				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
+					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -42772,9 +45160,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:hasEstimatedValue" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasTotalGoodsItemQuantity" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -42783,21 +45171,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4820"/>
+				<model ea_localid="4036"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="A forecast of the value of the procurement before competition.&#xA;&#xA;Additional Information:&#xA;Different cases of estimated values may refer to a lot, the global value of the procedure, or of a combinatorial value of a group of lots.&#xA;The forecast is calculated by the buyer and covers all revenues  whether coming from the buyer or third parties.&#xA;See for example recital (19), Article 5 of Directive 2014/24/EU and other articles from the rest of Directives about procurement.&#xA;&#xA;In the case of framework agreements and dynamic purchasing systems this refers to the maximum estimated value.&#xA;&#xA;This property corresponds to BT-27 in eForms (for Lot and Procedure) and can be used for BT-157 (for LotGroup).&#xA;&lt;b&gt;&#xA;&lt;/b&gt;WG Approval 05/12/2019&#xA;"/>
+				<documentation value="Relation indicating the number of the Goods Items.&#xA;&#xA;WG approval 25/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasEstimatedValue"/>
+				<labels rb="0..1" rt="+epo-ful:hasTotalGoodsItemQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC">
-				<source xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
-					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
+			<connector xmi:idref="EAID_F9F5CFA7_D31A_4c48_80EF_346FB3152195">
+				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
+					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -42807,9 +45195,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:hasLaunchFrameworkAgreementMaximumValue" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasGrossWeight" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -42818,21 +45206,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4681"/>
+				<model ea_localid="3420"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The total mass of goods including the packaging. &#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasLaunchFrameworkAgreementMaximumValue"/>
+				<labels rb="0..1" rt="+epo-ful:hasGrossWeight"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_17DACA2B_8A10_4516_8C96_D5EA3AE635E9">
-				<source xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257">
-					<model ea_localid="1078" type="Class" name="epo-not:ContractModificationNotice"/>
+			<connector xmi:idref="EAID_FA2388C8_1471_4d6b_9B9F_2E0BBE858668">
+				<source xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD">
+					<model ea_localid="2621" type="Class" name="epo-ful:AbstractContainer"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -42840,12 +45228,12 @@
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
-					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
-					<role name="epo:refersToLotGroup" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
+					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+					<role name="epo-ful:hasNetVolume" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -42853,56 +45241,55 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4656"/>
+				<model ea_localid="4042"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The amount of space that is required without the packaging.&#xA;&#xA;WG approval 18/06/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:refersToLotGroup"/>
+				<labels rb="0..1" rt="+epo-ful:hasNetVolume"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7B5EC3B7_635F_49aa_B61D_661F42799A98">
-				<source xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
-					<model ea_localid="958" type="Class" name="epo:Tender"/>
+			<connector xmi:idref="EAID_7B3A32F2_68B4_4cca_AA0C_F4AAB1D0346B">
+				<source xmi:idref="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32">
+					<model ea_localid="1675" type="Class" name="epo:ReviewDecision"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
-					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
-					<role name="epo:isSubjectToGrouping" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1">
+					<model ea_localid="1677" type="Class" name="epo:ReviewObject"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2781"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2844"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:isSubjectToGrouping"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_896CC936_0C78_48b9_A44A_1D010626BE9B">
-				<source xmi:idref="EAID_17662AEF_1321_446a_AE42_0583F7417A79">
-					<model ea_localid="1075" type="Class" name="epo-not:CompetitionNotice"/>
+			<connector xmi:idref="EAID_9663763E_2F48_4952_926C_444F368462AA">
+				<source xmi:idref="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32">
+					<model ea_localid="1675" type="Class" name="epo:ReviewDecision"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -42912,10 +45299,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
-					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
-					<role name="epo:announcesLotGroup" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC">
+					<model ea_localid="1543" type="Class" name="epo:ReviewRequest"/>
+					<role name="epo:resolvesReviewRequest" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -42923,21 +45310,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2426"/>
+				<model ea_localid="3132"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:announcesLotGroup"/>
+				<labels rb="1" rt="+epo:resolvesReviewRequest"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_BCCB407C_08A7_467b_8826_322D82AB6DB0">
-				<source xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2">
-					<model ea_localid="1077" type="Class" name="epo-not:ResultNotice"/>
+			<connector xmi:idref="EAID_9D50C424_E7E2_4c52_B4E8_8A666E94C5BA">
+				<source xmi:idref="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32">
+					<model ea_localid="1675" type="Class" name="epo:ReviewDecision"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -42947,9 +45334,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
-					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
-					<role name="epo:refersToLotGroup" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_E95530AB_B746_4056_8805_0F3BB79051BE">
+					<model ea_localid="1680" type="Enumeration" name="at-voc:remedy-type"/>
+					<role name="epo:providesRulingOnRemedy" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -42958,21 +45345,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2617"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="3133"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="States  the measures to be taken after a review procedure."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:refersToLotGroup"/>
+				<labels rb="0..*" rt="+epo:providesRulingOnRemedy"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C6F18DD0_9007_48f0_9959_5EE6A49DDD1B">
-				<source xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C">
-					<model ea_localid="1076" type="Class" name="epo-not:DirectAwardPrenotificationNotice"/>
+			<connector xmi:idref="EAID_BB4CF849_5E86_494d_AD24_2A89B4A5DAF1">
+				<source xmi:idref="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32">
+					<model ea_localid="1675" type="Class" name="epo:ReviewDecision"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -42982,9 +45367,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
-					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
-					<role name="epo:announcesLotGroup" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_0CC18385_984E_4d4c_A942_07304CE66481">
+					<model ea_localid="1537" type="Enumeration" name="at-voc:irregularity-type"/>
+					<role name="epo:hasConfirmedIrregularityType" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -42993,21 +45378,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4643"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="2667"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="Additional information:&#xA;This relation corresponds in eForms to    BT-791	    Review Irregularity Type"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:announcesLotGroup"/>
+				<labels rb="0..*" rt="+epo:hasConfirmedIrregularityType"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D6AB3946_257D_4382_A283_8978FB00BD51">
-				<source xmi:idref="EAID_93ACA540_2668_42d3_BE40_C921C05C776E">
-					<model ea_localid="1685" type="Class" name="epo:TenderGroup"/>
+			<connector xmi:idref="EAID_E9C9B328_DB7C_4af2_A37A_DA236E1A8FE3">
+				<source xmi:idref="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32">
+					<model ea_localid="1675" type="Class" name="epo:ReviewDecision"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -43017,10 +45400,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
-					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
-					<role name="epo:isSubmittedForLotGroup" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_C1D5C542_388C_4d77_B0AA_8B1D0C8C20CA">
+					<model ea_localid="1678" type="Enumeration" name="at-voc:review-decision-type"/>
+					<role name="epo:hasReviewDecisionType" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -43028,21 +45411,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2865"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="2848"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="Additional information:&#xA;This relation corresponds in eForms to BT-790	    Review Decision Type."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:isSubmittedForLotGroup"/>
+				<labels rb="0..*" rt="+epo:hasReviewDecisionType"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_DB36A935_6B61_49a0_A901_D1A6B9C4D5A7">
-				<source xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524">
-					<model ea_localid="1079" type="Class" name="epo-not:CompletionNotice"/>
+			<connector xmi:idref="EAID_70BE7952_3EF2_47d7_9AF0_B6AC86597613">
+				<source xmi:idref="EAID_07601514_1C57_47ce_9A2D_CD97C5116067">
+					<model ea_localid="938" type="Class" name="epo:Reviewer"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -43052,9 +45433,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
-					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
-					<role name="epo:refersToLotGroup" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_5466880A_1E58_432c_BA75_7B4EA81152C8">
+					<model ea_localid="3040" type="Enumeration" name="at-voc:review-body-type"/>
+					<role name="epo:hasReviewBodyType" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -43063,21 +45444,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4648"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
+				<model ea_localid="4662"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:refersToLotGroup"/>
+				<labels rb="0..*" rt="+epo:hasReviewBodyType"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_6F3635F3_387D_467a_95E2_ACDA293AE181">
-				<source xmi:idref="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7">
-					<model ea_localid="2078" type="Class" name="epo:ProcurementElement"/>
+			<connector xmi:idref="EAID_1B531817_E843_4c42_8EA1_111804B30C38">
+				<source xmi:idref="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8">
+					<model ea_localid="3090" type="Class" name="epo:ReviewTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -43087,9 +45466,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo:hasInternalIdentifier" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_07601514_1C57_47ce_9A2D_CD97C5116067">
+					<model ea_localid="938" type="Class" name="epo:Reviewer"/>
+					<role name="epo:definesReviewer" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -43098,56 +45477,55 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4663"/>
+				<model ea_localid="4756"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating a ReviewTerm has a Reviewer."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasInternalIdentifier"/>
+				<labels rb="0..*" rt="+epo:definesReviewer"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_77A962A1_6ADC_4a69_9C87_1543CFCC17D9">
-				<source xmi:idref="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7">
-					<model ea_localid="2078" type="Class" name="epo:ProcurementElement"/>
+			<connector xmi:idref="EAID_484BA28E_0C28_4b4b_B440_E1E735697188">
+				<source xmi:idref="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A">
+					<model ea_localid="1681" type="Class" name="epo:ReviewIrregularitySummary"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:hasEstimatedValue" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_4F81C811_16F5_4332_BAEA_9843D331872F">
+					<model ea_localid="944" type="Class" name="epo:StatisticalInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1423"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2862"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="A forecast of the value of the procurement before competition.&#xA;&#xA;Additional Information:&#xA;Different cases of estimated values may refer to a lot, the global value of the procedure, or of a combinatorial value of a group of lots.&#xA;The forecast is calculated by the buyer and covers all revenues  whether coming from the buyer or third parties.&#xA;See for example recital (19), Article 5 of Directive 2014/24/EU and other articles from the rest of Directives about procurement.&#xA;&#xA;In the case of framework agreements and dynamic purchasing systems this refers to the maximum estimated value.&#xA;&#xA;This property corresponds to BT-27 in eForms (for Lot and Procedure) and can be used for BT-157 (for LotGroup).&#xA;&lt;b&gt;&#xA;&lt;/b&gt;&lt;b&gt;WG Approval 05/12/2019&lt;/b&gt;&#xA;&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasEstimatedValue"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_95FB9493_C207_456a_A0EF_B68899832EE8">
-				<source xmi:idref="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7">
-					<model ea_localid="2078" type="Class" name="epo:ProcurementElement"/>
+			<connector xmi:idref="EAID_FA7858FE_BA9B_4d0a_88C5_0D1CAE6FE311">
+				<source xmi:idref="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A">
+					<model ea_localid="1681" type="Class" name="epo:ReviewIrregularitySummary"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -43157,9 +45535,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_0CC18385_984E_4d4c_A942_07304CE66481">
+					<model ea_localid="1537" type="Enumeration" name="at-voc:irregularity-type"/>
+					<role name="epo:hasIrregularityType" visibility="Public" targetScope="instance"/>
 					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -43168,21 +45546,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3021"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="A unique identifier of the instance of the concept.&#xA;&#xA;Additional Information&#xA;&#xA;For example, in the case of the Procurement Identifier, this could be the European Public Procurement Identifier, and/or any other identifier provided by the buyer, the service provider or any other stakeholder.&#xA;&#xA;WG Approval 12/11/2019&#xA;"/>
+				<model ea_localid="2853"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="Additional information:&#xA;This relation corresponds in eForms to    BT-636	        Buyer Review Requests Irregularity Type"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+adms:identifier"/>
+				<labels rb="1" rt="+epo:hasIrregularityType"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_55AE0CEF_3CD9_464a_82E7_387507253B10">
-				<source xmi:idref="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07">
-					<model ea_localid="933" type="Class" name="epo:Purpose"/>
+			<connector xmi:idref="EAID_29EB89B4_BF73_4250_B00A_CDF53D99CBCD">
+				<source xmi:idref="EAID_92AE6E92_3A20_4642_A531_93ABFC476500">
+					<model ea_localid="1542" type="Class" name="epo:ReviewRequestSummary"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -43192,10 +45568,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo:hasTotalQuantity" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A">
+					<model ea_localid="1681" type="Class" name="epo:ReviewIrregularitySummary"/>
+					<role name="epo:hasReviewIrregularitySummary" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -43203,21 +45579,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2883"/>
+				<model ea_localid="2852"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The number of units required.&#xA;&#xA;Additional Information:&#xA;The quantity needs to go along with the unit. &#xA;&#xA;&#xA;&#xA;"/>
+				<documentation value="Additional information:&#xA;This relation corresponds in eForms to   BG-613	    Buyer Review Requests"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasTotalQuantity"/>
+				<labels rb="0..*" rt="+epo:hasReviewIrregularitySummary"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_74371426_1670_46df_8526_5A4910F24815">
-				<source xmi:idref="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07">
-					<model ea_localid="933" type="Class" name="epo:Purpose"/>
+			<connector xmi:idref="EAID_4C33CDC7_EDE9_461d_85E1_1ABB6B9E21EB">
+				<source xmi:idref="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1">
+					<model ea_localid="1677" type="Class" name="epo:ReviewObject"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -43227,10 +45603,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_E55F2451_5826_4907_B311_4F37313BAEF6">
-					<model ea_localid="970" type="Enumeration" name="at-voc:cpv"/>
-					<role name="epo:hasMainClassification" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1">
+					<model ea_localid="1677" type="Class" name="epo:ReviewObject"/>
+					<role name="epo:refersToPreviousReview" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -43238,52 +45614,55 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1407"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation/>
+				<model ea_localid="2846"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Additional information:&#xA;This relation corresponds in eForms to BT-785 &quot;Review Previous Identifier&quot;."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1..*" rt="+epo:hasMainClassification"/>
+				<labels rb="0..1" rt="+epo:refersToPreviousReview"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_95D11AFD_5F07_4159_ABF2_BA01D9E3FEE4">
-				<source xmi:idref="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07">
-					<model ea_localid="933" type="Class" name="epo:Purpose"/>
+			<connector xmi:idref="EAID_2C3C6FFD_7F77_424c_B8A1_C090490D5878">
+				<source xmi:idref="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC">
+					<model ea_localid="1543" type="Class" name="epo:ReviewRequest"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_E55F2451_5826_4907_B311_4F37313BAEF6">
-					<model ea_localid="970" type="Enumeration" name="at-voc:cpv"/>
-					<role name="epo:hasAdditionalClassification" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1">
+					<model ea_localid="1677" type="Class" name="epo:ReviewObject"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1406"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="2670"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasAdditionalClassification"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_6749101F_45CB_45ba_9792_E3508C6FE92A">
-				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+			<connector xmi:idref="EAID_6F34B051_9C2E_444e_83DD_D95F6EA9897B">
+				<source xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524">
+					<model ea_localid="1079" type="Class" name="epo-not:CompletionNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -43293,10 +45672,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
-					<model ea_localid="1952" type="Class" name="epo:Certificate"/>
-					<role name="epo:hasCertification" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1">
+					<model ea_localid="1677" type="Class" name="epo:ReviewObject"/>
+					<role name="epo:announcesReviewObject" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -43304,21 +45683,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3201"/>
+				<model ea_localid="4654"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation to the proof of conformance.&#xA;&#xA;WG approval 30/05/2023"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasCertification"/>
+				<labels rb="1..*" rt="+epo:announcesReviewObject"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_CA57E831_F2FE_4a87_9BA9_5CF8B7A9D5AB">
-				<source xmi:idref="EAID_02D4B752_188D_46ee_AF52_F2AAFF7E2E77">
-					<model ea_localid="3528" type="Class" name="epo-sub:CertificateInformation"/>
+			<connector xmi:idref="EAID_229C17AB_3D5F_4ffe_AC22_DE4C7CCE3C2E">
+				<source xmi:idref="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8">
+					<model ea_localid="3090" type="Class" name="epo:ReviewTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -43328,10 +45707,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
-					<model ea_localid="1952" type="Class" name="epo:Certificate"/>
-					<role name="epo-sub:summarisesInformationAboutCertificate" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_DCE733E5_38D7_4e94_A8B8_B385E9A6811B">
+					<model ea_localid="1351" type="Class" name="epo:ReviewProcedureInformationProvider"/>
+					<role name="epo:definesReviewProcedureInformationProvider" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -43339,21 +45718,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="5259"/>
+				<model ea_localid="4755"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating the Certificate that the information refers to.&#xA;&#xA;WG approval 12/03/2024 "/>
+				<documentation value="Relation indicating a ReviewTerm has a ReviewProcedureInformationProvider."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo-sub:summarisesInformationAboutCertificate"/>
+				<labels rb="0..1" rt="+epo:definesReviewProcedureInformationProvider"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_19D655E2_E290_486c_A489_DFE2AC9F7B9B">
-				<source xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
-					<model ea_localid="958" type="Class" name="epo:Tender"/>
+			<connector xmi:idref="EAID_384E8446_C9A6_4e30_9DD7_3219683AAD0C">
+				<source xmi:idref="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC">
+					<model ea_localid="1543" type="Class" name="epo:ReviewRequest"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -43363,10 +45742,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82">
-					<model ea_localid="964" type="Enumeration" name="at-voc:applicability"/>
-					<role name="epo:hasSubcontracting" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_0CC18385_984E_4d4c_A942_07304CE66481">
+					<model ea_localid="1537" type="Enumeration" name="at-voc:irregularity-type"/>
+					<role name="epo:hasAllegedIrregularityType" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -43374,19 +45753,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4722"/>
+				<model ea_localid="3131"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation/>
+				<documentation value="Additional information:&#xA;This relation corresponds in eForms to    BT-791	    Review Irregularity Type&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasSubcontracting"/>
+				<labels rb="1..*" rt="+epo:hasAllegedIrregularityType"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_73E0123E_9D07_49c6_BAB3_E937B9F25B43">
-				<source xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
-					<model ea_localid="958" type="Class" name="epo:Tender"/>
+			<connector xmi:idref="EAID_E1801D29_495B_4d90_9640_5358E5CE90C3">
+				<source xmi:idref="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC">
+					<model ea_localid="1543" type="Class" name="epo:ReviewRequest"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -43396,9 +45775,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F">
-					<model ea_localid="969" type="Enumeration" name="at-voc:country"/>
-					<role name="epo:hasItemCountryOfOrigin" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_E95530AB_B746_4056_8805_0F3BB79051BE">
+					<model ea_localid="1680" type="Enumeration" name="at-voc:remedy-type"/>
+					<role name="epo:requestsRemedyType" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -43407,54 +45786,53 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1510"/>
+				<model ea_localid="2849"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The source country of the product or service.&#xA;&#xA;Additional Information:&#xA;&#xA;The country of origin can be provided by the buyer as a requirement or by the tenderer information of the item to be provided.&#xA;&#xA;WG Approval 07/01/2020&#xA;&#xA;The codelist to be used is at-voc:country which is available at http://publications.europa.eu/resource/dataset/country"/>
+				<documentation value="Additional information:&#xA;This relation corresponds in eForms to     BT-792	  Review Remedy Type"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasItemCountryOfOrigin"/>
+				<labels rb="0..*" rt="+epo:requestsRemedyType"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D7964CE9_B09A_4855_B489_34E46CFF8E24">
-				<source xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
-					<model ea_localid="958" type="Class" name="epo:Tender"/>
+			<connector xmi:idref="EAID_3777662E_A9D8_4d59_AF6E_5DFBB174C5FA">
+				<source xmi:idref="EAID_92AE6E92_3A20_4642_A531_93ABFC476500">
+					<model ea_localid="1542" type="Class" name="epo:ReviewRequestSummary"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:hasFinancialOfferValue" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_4F81C811_16F5_4332_BAEA_9843D331872F">
+					<model ea_localid="944" type="Class" name="epo:StatisticalInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1361"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2669"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="The value offered by the Tenderer for a Lot.&#xA;&#xA;Additional Information:&#xA;This value is normally the one awarded for a winning Tender Lot. In case of negotiated procedures the original financial value may be reviewed and the offer updated.&#xA;&#xA;This corresponds to BT-720 in eForms."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasFinancialOfferValue"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_E453F729_4B4E_44c9_AD20_DD8131AF4BEF">
-				<source xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
-					<model ea_localid="958" type="Class" name="epo:Tender"/>
+			<connector xmi:idref="EAID_56C46ECB_7950_4db1_AA23_2C9AD7E8E999">
+				<source xmi:idref="EAID_92AE6E92_3A20_4642_A531_93ABFC476500">
+					<model ea_localid="1542" type="Class" name="epo:ReviewRequestSummary"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -43464,9 +45842,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
-					<model ea_localid="1628" type="Class" name="epo-sub:ESPD"/>
-					<role name="epo:isSupportedBy" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
+					<model ea_localid="906" type="Class" name="epo:Lot"/>
+					<role name="epo:concernsReviewSummaryForLot" visibility="Public" targetScope="instance"/>
 					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -43475,56 +45853,55 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2828"/>
+				<model ea_localid="2854"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relates to Lot review summary.&#xA;&#xA;Additional information:&#xA;This relation corresponds in eForms to   BT-13722	    Buyer Review Lot Identifier."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:isSupportedBy"/>
+				<labels rb="1" rt="+epo:concernsReviewSummaryForLot"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_688D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5">
-				<source xmi:idref="EAID_93ACA540_2668_42d3_BE40_C921C05C776E">
-					<model ea_localid="1685" type="Class" name="epo:TenderGroup"/>
+			<connector xmi:idref="EAID_829CE86D_DCFB_48b2_AA55_2065496F072C">
+				<source xmi:idref="EAID_FB996CB7_0FB9_4a30_8AA0_0ABAC3D0F2BD">
+					<model ea_localid="2945" type="Class" name="epo:TechnicalAbilitySummary"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
-					<model ea_localid="958" type="Class" name="epo:Tender"/>
-					<role name="epo:comprisesTender" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB">
+					<model ea_localid="2593" type="Class" name="epo:SelectionCriteriaSummary"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2866"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4515"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="Incorporates Tender."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1..*" rt="+epo:comprisesTender"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_67F11C76_D909_4610_841A_BB8035525574">
-				<source xmi:idref="EAID_93ACA540_2668_42d3_BE40_C921C05C776E">
-					<model ea_localid="1685" type="Class" name="epo:TenderGroup"/>
+			<connector xmi:idref="EAID_A78FA1C1_2940_4ad1_A3A2_FA8F430848B1">
+				<source xmi:idref="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122">
+					<model ea_localid="942" type="Class" name="epo:SelectionCriterion"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -43534,9 +45911,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_47C343CA_8534_4855_8BAE_9C5DE33229E3">
+					<model ea_localid="998" type="Enumeration" name="at-voc:usage"/>
+					<role name="epo:hasSelectionCriteriaUsage" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -43545,21 +45922,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4822"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="A unique identifier of the instance of the concept.&#xA;&#xA;Additional Information&#xA;&#xA;For example, in the case of the Procurement Identifier, this could be the European Public Procurement Identifier, and/or any other identifier provided by the buyer, the service provider or any other stakeholder.&#xA;&#xA;WG Approval 12/11/2019&#xA;"/>
+				<model ea_localid="3005"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="&#xA;Additional Information:&#xA;This corresponds in eForms to BT-748 Selection Criteria Used."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+adms:identifier"/>
+				<labels rb="0..1" rt="+epo:hasSelectionCriteriaUsage"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7A92C123_93F7_4d51_A677_A1E36D3B53C0">
-				<source xmi:idref="EAID_93ACA540_2668_42d3_BE40_C921C05C776E">
-					<model ea_localid="1685" type="Class" name="epo:TenderGroup"/>
+			<connector xmi:idref="EAID_AF66C86B_C371_4afb_8012_8F091434E4D3">
+				<source xmi:idref="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122">
+					<model ea_localid="942" type="Class" name="epo:SelectionCriterion"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -43569,9 +45944,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:hasTotalValue" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_FA62ED20_6A09_47b0_BE65_B3A78C349AC2">
+					<model ea_localid="992" type="Enumeration" name="at-voc:selection-criterion"/>
+					<role name="epo:hasSelectionCriterionType" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -43580,21 +45955,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2867"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="1392"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The classification of the selection criteria.&#xA;&#xA;&#xA;Additional Information:&#xA;&#xA;This corresponds in eForms to BT-747	 Selection Criteria Type.&#xA;&#xA;WG Approval 09/11/2021&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasTotalValue"/>
+				<labels rb="0..1" rt="+epo:hasSelectionCriterionType"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_0BDB5E69_CB31_4e1e_B095_115C894CFE58">
-				<source xmi:idref="EAID_A8D775E4_EEB9_4502_B8A1_C1DD5D555864">
-					<model ea_localid="3505" type="Class" name="cccev:EvidenceType"/>
+			<connector xmi:idref="EAID_5C87BC92_AF78_4f16_994C_2F6853BD9DA7">
+				<source xmi:idref="EAID_2DF96E3A_E135_465d_908F_EAB3689291DE">
+					<model ea_localid="943" type="Class" name="epo:SocialProcurement"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -43604,10 +45977,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_53AB9EFA_0DDD_4512_8CA7_9D132E537955">
+					<model ea_localid="993" type="Enumeration" name="at-voc:social-objective"/>
+					<role name="epo:fulfillsRequirement" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -43615,56 +45988,53 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="5243"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="Links a resource to an adms:Identifier class."/>
+				<model ea_localid="1389"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The requirement to which the concept meets.&#xA;WG Approval 09/11/2021&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+adms:identifier"/>
+				<labels rb="0..*" rt="+epo:fulfillsRequirement"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_11702782_CA5B_4035_84B7_1E5035469B29">
-				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
-					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
+			<connector xmi:idref="EAID_857D08F9_84F2_4d98_8718_882951247DF8">
+				<source xmi:idref="EAID_2DF96E3A_E135_465d_908F_EAB3689291DE">
+					<model ea_localid="943" type="Class" name="epo:SocialProcurement"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA">
+					<model ea_localid="945" type="Class" name="epo:StrategicProcurement"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3984"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1390"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="Links a resource to an adms:Identifier class."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+adms:identifier"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_12549564_CE07_4367_8550_00BC16191558">
-				<source xmi:idref="EAID_025C0172_297F_4458_9268_2B10478B6736">
-					<model ea_localid="3243" type="Class" name="epo-cat:CatalogueResponseLine"/>
+			<connector xmi:idref="EAID_90566F74_64BC_49c8_8076_1ECB982268EE">
+				<source xmi:idref="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C">
+					<model ea_localid="2059" type="Class" name="epo:SpecificDuration"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -43674,9 +46044,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo:hasUUID" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_EDCD6F3A_F86A_46ca_ACD1_13C3E1A4B7F9">
+					<model ea_localid="1700" type="Enumeration" name="time:TemporalUnit"/>
+					<role name="time:unitType" visibility="Public" targetScope="instance"/>
 					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -43685,56 +46055,53 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4907"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="A universally unique identifier for an instance of this document.&#xA;&#xA;WG Approval 12/05/2020&#xA;"/>
+				<model ea_localid="2889"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:hasUUID"/>
+				<labels rb="1" rt="+time:unitType"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_15464872_BFB6_40bb_84F1_8A3969FE662E">
-				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+			<connector xmi:idref="EAID_31D3A42A_B28E_449d_AF5F_9D6CCD87E6A1">
+				<source xmi:idref="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A">
+					<model ea_localid="1544" type="Class" name="epo:SubmissionStatisticalInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo:hasItemStandardID" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_4F81C811_16F5_4332_BAEA_9843D331872F">
+					<model ea_localid="944" type="Class" name="epo:StatisticalInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3020"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2790"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="The general identifier assigned to the concept based on a standard scheme.&#8203;&#xA;&#xA;Additional information: &#xA;For example the GTIN scheme (Global Trade Item Number).&#xA;&#xA;WG approval 16/05/2023"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasItemStandardID"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_20A26F01_4C0B_48e1_A688_6DFFDE0D20A5">
-				<source xmi:idref="EAID_905EBE80_E994_48ec_B0A6_4F3CEC5EEDC0">
-					<model ea_localid="3253" type="Class" name="eli:LegalResourceSubdivision"/>
+			<connector xmi:idref="EAID_1BB31111_F63D_4464_AA32_D22B32C1DF1F">
+				<source xmi:idref="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA">
+					<model ea_localid="945" type="Class" name="epo:StrategicProcurement"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -43744,9 +46111,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="eli:uri_schema" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_DFCCF9E6_D161_4a4e_8468_6429D56A1496">
+					<model ea_localid="963" type="Enumeration" name="at-voc:accessibility"/>
+					<role name="epo:includesAccessibilityCriterion" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -43755,33 +46122,31 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4942"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="Schema describing the URI of an ELI instance. ELI uses URI template specifications (IETF RFC 6570). Schemes should be associated with member states and will be published in a registry.&#xA;"/>
+				<model ea_localid="1372"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="Explanation as to whether accessibility Criterion are used or not.&#xA;WG Approval 09/11/2021&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+eli:uri_schema"/>
+				<labels rb="0..*" rt="+epo:includesAccessibilityCriterion"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_23CC2B92_731F_4428_B333_8582A36D1244">
-				<source xmi:idref="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9">
-					<model ea_localid="3466" type="Class" name="epo-sub:NationalPreQualificationData"/>
+			<connector xmi:idref="EAID_81D470D5_433B_4242_826E_974C4A3AEF87">
+				<source xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
+					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo-sub:providesOrganisationPreQualificationListingIdentifier" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA">
+					<model ea_localid="945" type="Class" name="epo:StrategicProcurement"/>
+					<role name="epo:fulfillsStrategicProcurement" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -43790,34 +46155,34 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="5181"/>
+				<model ea_localid="1493"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The identifier assigned to an economic operator in a national pre-qualification system or official list.&#xA;&#xA;WG approval 05/03/2024"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo-sub:providesOrganisationPreQualificationListi"/>
+				<labels rb="0..*" rt="+epo:fulfillsStrategicProcurement"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_31D80540_9E04_44d6_B0B4_339ED74111CC">
-				<source xmi:idref="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD">
-					<model ea_localid="1605" type="Class" name="epo-cat:Manufacturer"/>
+			<connector xmi:idref="EAID_7C98771E_06E0_4141_9CF5_2CFE5FEB856B">
+				<source xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
+					<model ea_localid="958" type="Class" name="epo:Tender"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo:hasManufacturerID" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E">
+					<model ea_localid="1650" type="Class" name="epo:SubcontractingEstimate"/>
+					<role name="epo:foreseesSubcontracting" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -43825,34 +46190,34 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3015"/>
+				<model ea_localid="1385"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The manufacturer's identifier for the item.&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasManufacturerID"/>
+				<labels rb="0..*" rt="+epo:foreseesSubcontracting"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_51A6863A_1079_4af7_AE53_091E3E0514AF">
-				<source xmi:idref="EAID_C215EC75_82FD_45d3_832A_B3989A897692">
-					<model ea_localid="2615" type="Class" name="epo-ful:GoodsItem"/>
+			<connector xmi:idref="EAID_24545C91_D269_4cfe_A646_9A2FDEE01B0F">
+				<source xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
+					<model ea_localid="958" type="Class" name="epo:Tender"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo-ful:hasTraceID" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7">
+					<model ea_localid="947" type="Class" name="epo:Subcontractor"/>
+					<role name="epo:specifiesSubcontractors" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -43860,21 +46225,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4021"/>
+				<model ea_localid="1557"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The identifier used for tracking the goods item&#xA;&#xA;Additional information:&#xA;An example is the EPC number used in RFID.&#xA;&#xA;WG approval 21/09/2023&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasTraceID"/>
+				<labels rb="0..*" rt="+epo:specifiesSubcontractors"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_5A707B7A_A266_46a0_9CA9_EBF5B2C9D483">
-				<source xmi:idref="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA">
-					<model ea_localid="2570" type="Class" name="epo-ful:TransportEquipment"/>
+			<connector xmi:idref="EAID_ED09AA70_1480_4e41_8F94_BA9A89E0B960">
+				<source xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
+					<model ea_localid="958" type="Class" name="epo:Tender"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -43884,10 +46249,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7">
+					<model ea_localid="947" type="Class" name="epo:Subcontractor"/>
+					<role name="epo:foreseesSubcontractor" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -43895,21 +46260,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4001"/>
+				<model ea_localid="5474"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+adms:identifier"/>
+				<labels rb="0..*" rt="+epo:foreseesSubcontractor"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_63091EE9_B21F_4dae_99AF_66217D43BDA9">
-				<source xmi:idref="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6">
-					<model ea_localid="2573" type="Class" name="epo-ful:ShipmentStage"/>
+			<connector xmi:idref="EAID_C8DDF2AD_D50E_4225_A715_E7C9368CEB39">
+				<source xmi:idref="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561">
+					<model ea_localid="948" type="Class" name="epo:SubcontractTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -43919,10 +46284,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_9134CB43_EE09_4c07_80C3_3F39DFD09011">
+					<model ea_localid="996" type="Enumeration" name="at-voc:subcontracting-obligation"/>
+					<role name="epo:hasSubcontractingObligation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -43930,21 +46295,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4004"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="1383"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The requirement the tender must meet with regard to subcontracting parts of the contract.&#xA;WG Approval 09/11/2021&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+adms:identifier"/>
+				<labels rb="0..*" rt="+epo:hasSubcontractingObligation"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_774EE008_B895_41f1_B319_1174DD83D564">
-				<source xmi:idref="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7">
-					<model ea_localid="3086" type="Class" name="epo-con:ContractModificationInformation"/>
+			<connector xmi:idref="EAID_6E3C7B53_979C_4020_95DB_31C0DA62F564">
+				<source xmi:idref="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A">
+					<model ea_localid="1544" type="Class" name="epo:SubmissionStatisticalInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -43954,9 +46317,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo:relatesToEFormSectionIdentifier" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_12955701_35A4_47c8_8EA6_28768E083EED">
+					<model ea_localid="1723" type="Enumeration" name="at-voc:received-submission-type"/>
+					<role name="epo:hasReceivedSubmissionType" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -43965,21 +46328,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4740"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
+				<model ea_localid="2932"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:relatesToEFormSectionIdentifier"/>
+				<labels rb="0..1" rt="+epo:hasReceivedSubmissionType"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_77553B39_DB4D_4388_9D1B_8C8E24EB522C">
-				<source xmi:idref="EAID_9E80131F_7D1C_452d_98B2_308983569ECB">
-					<model ea_localid="2575" type="Class" name="epo-ful:TransportMeans"/>
+			<connector xmi:idref="EAID_6D0203DA_A8A3_482a_B747_66A09DEF42FC">
+				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
+					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -43989,9 +46350,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo-ful:hasVehicleSegmentID" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_A8A23909_CD9D_402e_B37A_C9F795BD0521">
+					<model ea_localid="979" type="Enumeration" name="at-voc:missing-info-submission"/>
+					<role name="epo:hasLateSubmissionPermission" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -44000,21 +46361,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4327"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="1382"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="Whether economic operator-related information can be supplemented even after the submission deadline.&#xA;&#xA;Additional Information&#xA;This is specific to the information on the economic operator and not the actual offer. This does  not apply to the requests for clarification.&#xA;&#xA;WG Approval 21/07/2020&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasVehicleSegmentID"/>
+				<labels rb="0..1" rt="+epo:hasLateSubmissionPermission"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7DD90B0C_4D89_4d64_AC1D_F32A308572D4">
-				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
-					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
+			<connector xmi:idref="EAID_7BC31FFB_F53F_431c_AED5_36E1786ED85F">
+				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
+					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44024,9 +46383,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo-ful:hasFreightForwarderConsignmentID" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_73C42C68_C5D6_4b6c_AA94_2CA27746393B">
+					<model ea_localid="1343" type="Class" name="epo:TenderReceiver"/>
+					<role name="epo:definesTenderReceiver" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -44035,21 +46394,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4034"/>
+				<model ea_localid="3118"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating a SubmissionTerm has a TenderReceiver."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasFreightForwarderConsignmentID"/>
+				<labels rb="0..1" rt="+epo:definesTenderReceiver"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA">
-				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+			<connector xmi:idref="EAID_8A3EF8BD_C6F5_4027_9D0A_235327E62C6E">
+				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
+					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44059,10 +46418,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo:hasSellerItemID" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1FF5173E_4940_44db_A1A0_C190337F6440">
+					<model ea_localid="967" type="Enumeration" name="at-voc:communication-justification"/>
+					<role name="epo:hasNonElectronicSubmissionJustification" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -44070,21 +46429,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3019"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="The general identifier assigned to the concept as defined by the Seller.&#8203;&#xA;&#xA;WG approval 16/05/2023&#xA;"/>
+				<model ea_localid="1381"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="&#xA;Reason for not accepting electronic information.&#xA;&#xA;WG Approval 21/07/2020&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasSellerItemID"/>
+				<labels rb="0..*" rt="+epo:hasNonElectronicSubmissionJustification"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_96C5B633_908F_48e5_82F6_C10FBDBF1DE3">
-				<source xmi:idref="EAID_3C8EEF69_1346_4dbe_B505_7C2D920B97B9">
-					<model ea_localid="2610" type="Class" name="epo-ful:TransportEquipmentSeal"/>
+			<connector xmi:idref="EAID_8CA66645_D223_487b_B348_21446E4664A6">
+				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
+					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44094,9 +46451,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5">
+					<model ea_localid="988" type="Enumeration" name="at-voc:permission"/>
+					<role name="epo:hasVariantPermission" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -44105,21 +46462,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4000"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="1491"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The obligation or possibility for tenderers to submit variants or not.&#xA;&#xA;Additional Information:&#xA;&#xA;Variants are alternative ways to fulfil the buyer's needs as opposed to solutions indicated in the procurement documents.&#xA;&#xA;eForms: Whether tenderers are required, allowed or forbidden to submit tenders which fulfil the buyer's needs differently than as proposed in the procurement documents. &#xA;&#xA;Additional Information:&#xA;&#xA;Further conditions for submitting variant tenders are in the procurement documents.&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+adms:identifier"/>
+				<labels rb="0..1" rt="+epo:hasVariantPermission"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9843F34E_C9D3_471a_9622_B002A7A25EA7">
-				<source xmi:idref="EAID_8374872A_B283_4698_9E00_72FD255BAFCB">
-					<model ea_localid="3258" type="Class" name="eli:LegalExpression"/>
+			<connector xmi:idref="EAID_9B46D9F5_E71D_40fc_A50D_BE4367D5EE4E">
+				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
+					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44129,10 +46484,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="eli:uri_schema" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5">
+					<model ea_localid="988" type="Enumeration" name="at-voc:permission"/>
+					<role name="epo:hasESubmissionPermission" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -44140,21 +46495,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4941"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="Schema describing the URI of an ELI instance. ELI uses URI template specifications (IETF RFC 6570). Schemes should be associated with member states and will be published in a registry.&#xA;"/>
+				<model ea_localid="1379"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The requirements as to what extent electronic submission is allowed.&#xA;&#xA;WG Approval 03/10/2019&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+eli:uri_schema"/>
+				<labels rb="0..1" rt="+epo:hasESubmissionPermission"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9F290187_06CC_4af8_83C9_F475091E0C14">
-				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
-					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
+			<connector xmi:idref="EAID_BC7F270C_1A4E_400c_88ED_7EFEB868C4EC">
+				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
+					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44164,9 +46517,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo-ful:hasCarrierConsignmentID" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_FD0308FC_9EDA_4a54_A4B6_FBCE76BF76A2">
+					<model ea_localid="1344" type="Class" name="epo:TenderProcessor"/>
+					<role name="epo:definesTenderProcessor" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -44175,21 +46528,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4250"/>
+				<model ea_localid="2540"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating a SubmissionTerm has a TenderProcessor."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasCarrierConsignmentID"/>
+				<labels rb="0..1" rt="+epo:definesTenderProcessor"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A489FF3B_9E63_4b65_9418_542A437B67E4">
-				<source xmi:idref="EAID_9E80131F_7D1C_452d_98B2_308983569ECB">
-					<model ea_localid="2575" type="Class" name="epo-ful:TransportMeans"/>
+			<connector xmi:idref="EAID_C144677A_178B_495d_A1CC_20D0D20B3AD0">
+				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
+					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44199,10 +46552,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo-ful:hasVehicleID" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_8B37BCB9_9B2F_4a90_8339_DA7B0472F42E">
+					<model ea_localid="995" type="Enumeration" name="at-voc:subcontracting-indication"/>
+					<role name="epo:hasTenderSubcontractingInformation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -44210,21 +46563,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4006"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="1377"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The information about subcontracting that must be indicated in the tender.&#xA;&#xA;WG  Approval 10/10/2019&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo-ful:hasVehicleID"/>
+				<labels rb="0..*" rt="+epo:hasTenderSubcontractingInformation"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_AA0E8762_9556_4ad9_8F4A_5A66B59C8A95">
-				<source xmi:idref="EAID_3124967E_D23F_4c3b_9B72_E02C23A08D68">
-					<model ea_localid="3506" type="Class" name="cccev:EvidenceTypeList"/>
+			<connector xmi:idref="EAID_C325A5AA_AAE1_4e55_A542_A867A1BED99D">
+				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
+					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44234,9 +46585,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5">
+					<model ea_localid="988" type="Enumeration" name="at-voc:permission"/>
+					<role name="epo:hasECataloguePermission" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -44245,21 +46596,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="5242"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="Links a resource to an adms:Identifier class."/>
+				<model ea_localid="1376"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The extent to which electronic catalogues may be used in tenders.&#xA;&#xA;WG Approval 03/10/2019&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+adms:identifier"/>
+				<labels rb="0..1" rt="+epo:hasECataloguePermission"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_ACCA405B_7FF7_41ad_9ACB_A1015C643C97">
-				<source xmi:idref="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E">
-					<model ea_localid="1632" type="Class" name="epo-cat:Batch"/>
+			<connector xmi:idref="EAID_E2C29363_440C_4c85_8C4E_38DED0468EB4">
+				<source xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
+					<model ea_localid="949" type="Class" name="epo:SubmissionTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44269,10 +46618,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo:hasBatchID" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90">
+					<model ea_localid="976" type="Enumeration" name="at-voc:language"/>
+					<role name="epo:hasLanguage" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -44280,68 +46629,65 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3016"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="The identifier assigned to a specific batch of the produced Item.&#xA;WG Approval 16/05/2023&#xA;"/>
+				<model ea_localid="1375"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="Language in which the submitted information is to be expressed. &#xA;&#xA;WG Approval 21/07/2020&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasBatchID"/>
+				<labels rb="0..*" rt="+epo:hasLanguage"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_BBC722BA_3236_4fcb_B51A_14A66F3D627C">
-				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+			<connector xmi:idref="EAID_80B8D836_6545_4db6_8C20_4A9289C81C12">
+				<source xmi:idref="EAID_DC5A8DC6_4D0A_4432_B667_CE2C1E6D5A96">
+					<model ea_localid="950" type="Class" name="epo:System"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo:hasSerialID" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1">
+					<model ea_localid="852" type="Class" name="foaf:Agent"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4374"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1374"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="The identifier assigned to the specific instance of the produced concept.&#xA;WG Approval 16/05/2023&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasSerialID"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C7C433B7_9297_4921_9069_80DF68AD408A">
-				<source xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8">
-					<model ea_localid="2023" type="Class" name="epo-ful:ShipmentInformation"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+			<connector xmi:idref="EAID_EBF47D81_D8E3_4eda_9351_165A2D6D972E">
+				<source xmi:idref="EAID_DC5A8DC6_4D0A_4432_B667_CE2C1E6D5A96">
+					<model ea_localid="950" type="Class" name="epo:System"/>
+					<role name="epo:ownsSystem" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1">
+					<model ea_localid="852" type="Class" name="foaf:Agent"/>
+					<role name="epo:isOwnedByAgent" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -44350,21 +46696,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3419"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<model ea_localid="1695"/>
+				<properties ea_type="Association" direction="Bi-Directional"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Links a resource to an adms:Identifier class."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+adms:identifier"/>
+				<labels lb="0..*" lt="+epo:ownsSystem" rb="0..1" rt="+epo:isOwnedByAgent"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044">
-				<source xmi:idref="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7">
-					<model ea_localid="2584" type="Class" name="epo-cat:Line"/>
+			<connector xmi:idref="EAID_8FF77444_1F49_4895_AA8E_5C76444F3AE1">
+				<source xmi:idref="EAID_3780AA50_D898_4068_B300_47B46651CA0A">
+					<model ea_localid="953" type="Class" name="epo:Technique"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44374,9 +46720,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_47C343CA_8534_4855_8BAE_9C5DE33229E3">
+					<model ea_localid="998" type="Enumeration" name="at-voc:usage"/>
+					<role name="epo:hasUsage" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -44385,21 +46731,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3998"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="Links a resource to an adms:Identifier class."/>
+				<model ea_localid="1562"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The codelist to be used is at-voc:usage which is available at http://publications.europa.eu/resource/dataset/usage&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+adms:identifier"/>
+				<labels rb="0..1" rt="+epo:hasUsage"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D42B1380_78A6_4579_B0FD_C3609EBD8AFD">
-				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
-					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
+			<connector xmi:idref="EAID_2D4516BD_7CD7_4f69_89C8_D3FC52D7CF0C">
+				<source xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A">
+					<model ea_localid="917" type="Class" name="epo:PlannedProcurementPart"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44409,10 +46753,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo-ord:hasSellerOrderID" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_3780AA50_D898_4068_B300_47B46651CA0A">
+					<model ea_localid="953" type="Class" name="epo:Technique"/>
+					<role name="epo:foreseesTechnique" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -44420,21 +46764,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4929"/>
+				<model ea_localid="3181"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ord:hasSellerOrderID"/>
+				<labels rb="0..*" rt="+epo:foreseesTechnique"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_DA6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D">
-				<source xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD">
-					<model ea_localid="2621" type="Class" name="epo-ful:AbstractContainer"/>
+			<connector xmi:idref="EAID_ADE68ED4_8A73_411c_B751_1F0998CC86A7">
+				<source xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
+					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44444,10 +46788,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_3780AA50_D898_4068_B300_47B46651CA0A">
+					<model ea_localid="953" type="Class" name="epo:Technique"/>
+					<role name="epo:usesTechnique" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -44455,21 +46799,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4003"/>
+				<model ea_localid="3180"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Links a resource to an adms:Identifier class."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+adms:identifier"/>
+				<labels rb="0..*" rt="+epo:usesTechnique"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_E507D198_1A41_4b43_873A_F9E88411186D">
-				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+			<connector xmi:idref="EAID_00497249_92E0_435e_9C45_B9A2F9CBFE43">
+				<source xmi:idref="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B">
+					<model ea_localid="1370" type="Class" name="epo:TenderAwardOutcome"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44479,10 +46823,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo:hasManufacturerItemID" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
+					<model ea_localid="958" type="Class" name="epo:Tender"/>
+					<role name="epo:concernsTender" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -44490,21 +46834,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3018"/>
+				<model ea_localid="2498"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The general identifier assigned to the concept as defined by the Manufacturer. &#8203;&#xA;&#xA;WG approval 16/05/2023&#xA;"/>
+				<documentation value="Relates to Tender. &#xA;&#xA;WG approval 14/05/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasManufacturerItemID"/>
+				<labels rb="1" rt="+epo:concernsTender"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_ECEFDC69_19B4_47d7_A201_D8391B5C67DF">
-				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+			<connector xmi:idref="EAID_24ED3FAD_FABC_4b24_A3E6_B0420EB7CF2A">
+				<source xmi:idref="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B">
+					<model ea_localid="1370" type="Class" name="epo:TenderAwardOutcome"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44514,9 +46858,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo:hasBuyerItemID" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3">
+					<model ea_localid="962" type="Class" name="epo:Winner"/>
+					<role name="epo:indicatesAwardToWinner" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -44525,21 +46869,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3522"/>
+				<model ea_localid="2497"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The general identifier assigned to the concept as defined by the Buyer.&#8203;&#xA;&#xA;WG approval 16/05/2023&#xA;"/>
+				<documentation value="Reveals the winner to whom the tender award outcome is attributed."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasBuyerItemID"/>
+				<labels rb="0..1" rt="+epo:indicatesAwardToWinner"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F0951C5B_94E2_4a5f_BF21_25D103CB3656">
-				<source xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A">
-					<model ea_localid="2087" type="Class" name="epo-ord:DeliveryInformation"/>
+			<connector xmi:idref="EAID_61636EE3_DE81_4083_BF9B_6F607A63A921">
+				<source xmi:idref="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3">
+					<model ea_localid="962" type="Class" name="epo:Winner"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44549,9 +46893,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo-ful:hasTrackingID" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53">
+					<model ea_localid="956" type="Class" name="epo:Tenderer"/>
+					<role name="epo:needsToBeATenderer" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -44560,33 +46904,33 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3982"/>
+				<model ea_localid="2469"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The Winner must be a Tenderer."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasTrackingID"/>
+				<labels rb="0..1" rt="+epo:needsToBeATenderer"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F3CD32F8_8180_4939_A987_53BA66264912">
-				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
-					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
+			<connector xmi:idref="EAID_E026EBD4_4329_4e57_9F78_AF7887C44E46">
+				<source xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
+					<model ea_localid="958" type="Class" name="epo:Tender"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
-					<model ea_localid="1020" type="Class" name="adms:Identifier"/>
-					<role name="epo-ful:hasConsigneeConsignmentID" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53">
+					<model ea_localid="956" type="Class" name="epo:Tenderer"/>
+					<role name="epo:isSubmitedBy" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -44595,55 +46939,56 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4033"/>
+				<model ea_localid="1366"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating the submission of a tender by an economic operator.&#xA;WG approval 18/05/2021"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasConsigneeConsignmentID"/>
+				<labels rb="0..1" rt="+epo:isSubmitedBy"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9501DE7B_F539_4409_8D54_7B950268D75C">
-				<source xmi:idref="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969">
-					<model ea_localid="1698" type="Class" name="epo:Duration"/>
+			<connector xmi:idref="EAID_818697AF_821C_40da_B5DE_D7ED82169378">
+				<source xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
+					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F8F2DEF8_6045_44d5_93B9_E57CE8023BE9">
-					<model ea_localid="3252" type="Class" name="time:Duration"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D">
+					<model ea_localid="1368" type="Class" name="epo:Term"/>
+					<role name="epo:isSubjectToTerm" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4930"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="2981"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..*" rt="+epo:isSubjectToTerm"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_45B983F5_7502_49f2_984C_17FF6E47F8F9">
-				<source xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
-					<model ea_localid="1831" type="Class" name="epo-cat:Price"/>
+			<connector xmi:idref="EAID_78ABF07D_FFDF_40a2_8CAF_4B1C7067546E">
+				<source xmi:idref="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0">
+					<model ea_localid="3084" type="Class" name="epo:VehicleInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44653,66 +46998,63 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969">
-					<model ea_localid="1698" type="Class" name="epo:Duration"/>
-					<role name="epo-cat:hasExpectedDeliveryTime" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_F565346A_74A1_4bf9_82F9_EE632CBBD88D">
+					<model ea_localid="3083" type="Enumeration" name="at-voc:vehicle-category"/>
+					<role name="epo:specifiesCleanVehicleDirectiveVehicleCategory" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation value="&#xA;"/>
+					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3058"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="The expected amount of time between the order and delivery of an item. &#xA;&#xA;WG approval 26/07/2022"/>
+				<model ea_localid="4731"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:hasExpectedDeliveryTime"/>
+				<labels rb="0..1" rt="+epo:specifiesCleanVehicleDirectiveVehicleCategory"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F8285143_A232_43ae_AFC8_89D40A9529FD">
-				<source xmi:idref="EAID_7D0E71D7_D624_4144_8134_2500CE9AB392">
-					<model ea_localid="2060" type="Class" name="epo:IndefiniteDuration"/>
+			<connector xmi:idref="EAID_8F9F898E_D644_43bd_B368_6604C3E040EC">
+				<source xmi:idref="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0">
+					<model ea_localid="3084" type="Class" name="epo:VehicleInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969">
-					<model ea_localid="1698" type="Class" name="epo:Duration"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_63483BB6_C796_4631_87DA_3F3808C4744F">
+					<model ea_localid="3082" type="Enumeration" name="at-voc:cvd-contract-type"/>
+					<role name="epo:specifiesCleanVehicleDirectiveContractType" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3318"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
+				<model ea_localid="4730"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo:specifiesCleanVehicleDirectiveContractType"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_FE0B0FB5_E0B6_41e2_AA82_ECF06C845021">
-				<source xmi:idref="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C">
-					<model ea_localid="2059" type="Class" name="epo:SpecificDuration"/>
+			<connector xmi:idref="EAID_19AD8C15_4D9D_48f2_A3E1_A997E86942D2">
+				<source xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+					<model ea_localid="913" type="Class" name="org:Organization"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44722,8 +47064,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969">
-					<model ea_localid="1698" type="Class" name="epo:Duration"/>
+				<target xmi:idref="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1">
+					<model ea_localid="852" type="Class" name="foaf:Agent"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44733,7 +47075,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3317"/>
+				<model ea_localid="1448"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -44744,55 +47086,56 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_E9E2A1B8_A705_4847_8FE6_3B40BD241A4B">
-				<source xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+			<connector xmi:idref="EAID_24AB8D4E_3151_4d4e_B951_BAA8F8436033">
+				<source xmi:idref="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53">
+					<model ea_localid="1902" type="Class" name="foaf:Person"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_FBD046CD_CD18_4d96_99E0_63CAC8A5D594">
-					<model ea_localid="1034" type="Enumeration" name="at-voc:currency"/>
-					<role name="epo:hasCurrency" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1">
+					<model ea_localid="852" type="Class" name="foaf:Agent"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1730"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The identifier of the currency as in the standard code list used. &#xA;&#xA;"/>
+				<model ea_localid="3091"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasCurrency"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_202AF5A1_B4FE_48a4_91D4_F6387465413F">
-				<source xmi:idref="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1">
-					<model ea_localid="2041" type="Class" name="epo-ord:AllowanceChargeInformation"/>
+			<connector xmi:idref="EAID_498900B2_4B2A_411b_B5EB_19C2D921F4D1">
+				<source xmi:idref="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53">
+					<model ea_localid="1902" type="Class" name="foaf:Person"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:isCalculatedOn" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
+					<model ea_localid="1952" type="Class" name="epo:Certificate"/>
+					<role name="epo:hasCertification" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -44800,21 +47143,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4245"/>
+				<model ea_localid="4578"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The monetary amount to which the multiplier factor is applied in calculating the amount of this allowance or charge.&#xA;&#xA;"/>
+				<documentation value="Relation to the proof of conformance.&#xA;&#xA;WG approval 30/05/2023"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:isCalculatedOn"/>
-				<extendedProperties virtualInheritance="0"/>
+				<labels rb="0..*" rt="+epo:hasCertification"/>
+				<extendedProperties/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_2729D2D0_C843_497f_B19D_1727246FC1BD">
-				<source xmi:idref="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F">
-					<model ea_localid="3087" type="Class" name="epo-con:ContractAmendment"/>
+			<connector xmi:idref="EAID_3F693B40_13CE_47d1_A051_E627959E09EF">
+				<source xmi:idref="EAID_9099AF4F_0019_4768_B85A_99820F3E6307">
+					<model ea_localid="2618" type="Class" name="epo-ful:TransportMeansOperator"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44824,9 +47167,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:updatesContractValue" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53">
+					<model ea_localid="1902" type="Class" name="foaf:Person"/>
+					<role name="epo:playedBy" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -44835,91 +47178,88 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4724"/>
+				<model ea_localid="4026"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:updatesContractValue"/>
+				<labels rb="0..1" rt="+epo:playedBy"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_29D3C49F_AF44_49ad_8519_B199CADD080B">
-				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
-					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
+			<connector xmi:idref="EAID_F79A58B0_3229_4f09_A0DE_6D0C5CD5A716">
+				<source xmi:idref="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225">
+					<model ea_localid="916" type="Class" name="person:Person"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo-ord:hasTotalTaxInclusiveAmount" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53">
+					<model ea_localid="1902" type="Class" name="foaf:Person"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4309"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1438"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ord:hasTotalTaxInclusiveAmount"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_2C64F9E7_B02B_4433_AB2C_0A6E23A8559E">
-				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
-					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+			<connector xmi:idref="EAID_626183B8_93AC_4300_B227_85988E5F2016">
+				<source xmi:idref="EAID_29678A10_6473_461a_BE84_76269B5BBD68">
+					<model ea_localid="851" type="Class" name="locn:Address"/>
+					<role visibility="Public"/>
+					<type aggregation="none"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="AllowDuplicates=0;Derived=0;Navigable=Non-Navigable;Owned=0;Union=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo-ord:hasTotalTaxExclusiveAmount" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40">
+					<model ea_localid="986" type="Enumeration" name="at-voc:nuts"/>
+					<role name="epo:hasNutsCode" visibility="Public"/>
+					<type multiplicity="0..1" aggregation="none"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="AllowDuplicates=0;Derived=0;Navigable=Navigable;Owned=0;Union=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4308"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
+				<model ea_localid="2568"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ord:hasTotalTaxExclusiveAmount"/>
-				<extendedProperties virtualInheritance="0"/>
+				<labels rb="0..1" rt="+epo:hasNutsCode"/>
+				<extendedProperties/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_2E9FE66A_E025_4563_9A59_461990838D96">
-				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
-					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
+			<connector xmi:idref="EAID_D0F25E0B_E148_41e7_8C52_BAE14F5149F6">
+				<source xmi:idref="EAID_29678A10_6473_461a_BE84_76269B5BBD68">
+					<model ea_localid="851" type="Class" name="locn:Address"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44929,9 +47269,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo-ful:hasConsignmentInvoiceValue" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F">
+					<model ea_localid="969" type="Enumeration" name="at-voc:country"/>
+					<role name="epo:hasCountryCode" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -44940,33 +47280,31 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4052"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="Declared amount of the Consignment.&#xA;&#xA;Additional Information:&#xA;&#xA;This is a logistics information needed for logistics, security measures, customs check, etc."/>
+				<model ea_localid="1707"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasConsignmentInvoiceValue"/>
+				<labels rb="0..1" rt="+epo:hasCountryCode"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_470D1B16_C07B_4868_91B2_799578663395">
-				<source xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4">
-					<model ea_localid="2818" type="Class" name="epo-ord:TaxInformation"/>
+			<connector xmi:idref="EAID_28236B4B_9308_46ad_9581_3601B37AA6A4">
+				<source xmi:idref="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225">
+					<model ea_localid="916" type="Class" name="person:Person"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:isCalculatedOn" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_29678A10_6473_461a_BE84_76269B5BBD68">
+					<model ea_localid="851" type="Class" name="locn:Address"/>
+					<role name="cv:registeredAddress" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -44975,21 +47313,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4322"/>
+				<model ea_localid="1507"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The monetary amount to which the multiplier factor is applied in calculating the amount of this allowance or charge."/>
+				<documentation value="The registered address relationship links a Resource with the legally registered Address.&#xA;&#xA;Additional Information:&#xA;It is the address to which formal communications can be sent, such as the postal address."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:isCalculatedOn"/>
+				<labels rb="0..1" rt="+cv:registeredAddress"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_5009F883_10B2_4e9c_96A3_A1F92BE8EA63">
-				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
-					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
+			<connector xmi:idref="EAID_6A50E4FC_E8DA_47c5_AD39_5BA2A66950B9">
+				<source xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+					<model ea_localid="913" type="Class" name="org:Organization"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44999,9 +47337,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo-ful:hasConsignmentFreeOnBoardValue" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_29678A10_6473_461a_BE84_76269B5BBD68">
+					<model ea_localid="851" type="Class" name="locn:Address"/>
+					<role name="cv:registeredAddress" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -45010,34 +47348,34 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4254"/>
+				<model ea_localid="1750"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The registered address relationship links a Resource with the legally registered Address.&#xA;&#xA;Additional Information:&#xA;It is the address to which formal communications can be sent, such as the postal address.&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasConsignmentFreeOnBoardValue"/>
+				<labels rb="0..1" rt="+cv:registeredAddress"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_516CC611_B255_4c67_AAF8_2E19960E553F">
-				<source xmi:idref="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1">
-					<model ea_localid="2041" type="Class" name="epo-ord:AllowanceChargeInformation"/>
+			<connector xmi:idref="EAID_9F23612C_1865_4c8b_82ED_0BAA7D433501">
+				<source xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+					<model ea_localid="913" type="Class" name="org:Organization"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo-cat:hasAmount" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_29678A10_6473_461a_BE84_76269B5BBD68">
+					<model ea_localid="851" type="Class" name="locn:Address"/>
+					<role name="locn:address" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -45045,21 +47383,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3213"/>
+				<model ea_localid="1506"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The predetermined monetary value charged in addition to the price.&#xA;&#xA;WG approval 26/07/2022"/>
+				<documentation value="Associates any Resource with the corresponding Address.&#xA;&#xA;Additional Information:&#xA;Asserting the address relationship implies that the Resource has an Address."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo-cat:hasAmount"/>
+				<labels rb="0..*" rt="+locn:address"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_569C582B_2F50_4a11_B7B6_50CA2F0A9B94">
-				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
-					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
+			<connector xmi:idref="EAID_15FE118D_5443_4723_8887_BFF48DC77200">
+				<source xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+					<model ea_localid="913" type="Class" name="org:Organization"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45069,9 +47407,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo-ful:hasConsignmentDeclaredStatisticsValue" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_B64484AC_23D5_423f_A683_B6FC29EE98CC">
+					<model ea_localid="978" type="Enumeration" name="at-voc:main-activity"/>
+					<role name="epo:hasMainActivity" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -45080,21 +47418,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4253"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="1668"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The principal sectoral area in which an organisation operates.&#xA;&#xA;Additional information:&#xA;&#xA;The activities associated with buyers are derived from the top level of the Classification of the functions of the government (COFOG) from the United Nations Statistics Division.&#xA;&#xA;The activities associated with buyer are derived from sectors explicitly falling within the sectoral directive (2014/25/EU Art. 8 - Art. 14).&#xA;&#xA;WG Approval 05/05/2020&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasConsignmentDeclaredStatisticsValue"/>
+				<labels rb="0..1" rt="+epo:hasMainActivity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7092648E_ABC4_4408_B3EA_A725F5A385F7">
-				<source xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
-					<model ea_localid="1831" type="Class" name="epo-cat:Price"/>
+			<connector xmi:idref="EAID_1FFF54A3_B491_40f9_AB43_E5A825C5F2E2">
+				<source xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+					<model ea_localid="913" type="Class" name="org:Organization"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45104,32 +47440,30 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo-cat:hasNetMonetaryValue" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F">
+					<model ea_localid="969" type="Enumeration" name="at-voc:country"/>
+					<role name="epo:hasRegistrationCountry" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation value="The price amount of an Item exclusive of taxes and after substracting price discounts. "/>
+					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3055"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
+				<model ea_localid="4451"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo-cat:hasNetMonetaryValue"/>
+				<labels rb="0..1" rt="+epo:hasRegistrationCountry"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7AAF3614_44A0_4944_8E1A_EF574D760E6F">
-				<source xmi:idref="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31">
-					<model ea_localid="2905" type="Class" name="epo-con:Deliverable"/>
+			<connector xmi:idref="EAID_2FF93267_E672_481d_B370_202D9A0110E0">
+				<source xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+					<model ea_localid="913" type="Class" name="org:Organization"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45139,10 +47473,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:hasTotalValue" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+					<model ea_localid="913" type="Class" name="org:Organization"/>
+					<role name="org:subOrganizationOf" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -45150,34 +47484,34 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4463"/>
+				<model ea_localid="4823"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Represents hierarchical containment of Organizations or OrganizationalUnits; indicates an Organization which contains this Organization.&#xA;&#xA;WG 31/08/2023"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasTotalValue"/>
+				<labels rb="0..*" rt="+org:subOrganizationOf"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_87123434_C2AD_43de_925D_13E9A7667A18">
-				<source xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4">
-					<model ea_localid="2818" type="Class" name="epo-ord:TaxInformation"/>
+			<connector xmi:idref="EAID_D01BEE04_A51F_434f_9F2B_CD75C658FF42">
+				<source xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+					<model ea_localid="913" type="Class" name="org:Organization"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo-cat:hasAmount" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
+					<model ea_localid="1952" type="Class" name="epo:Certificate"/>
+					<role name="epo:hasCertification" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -45185,21 +47519,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4321"/>
+				<model ea_localid="4576"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The predetermined monetary value charged in addition to the price.&#xA;&#xA;WG approval 26/07/2022&#xA;&#xA;"/>
+				<documentation value="Relation to the proof of conformance.&#xA;&#xA;WG approval 30/05/2023"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:hasAmount"/>
-				<extendedProperties virtualInheritance="0"/>
+				<labels rb="0..*" rt="+epo:hasCertification"/>
+				<extendedProperties/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_8DBBB829_4470_4b0d_A142_494C41C8807D">
-				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
-					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
+			<connector xmi:idref="EAID_D8B16DE0_0613_42f0_811D_F82085D6A825">
+				<source xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+					<model ea_localid="913" type="Class" name="org:Organization"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45209,10 +47543,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo-ord:hasTotalLineAmount" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_5FC03FB6_FD84_4bb6_988F_5C88024446CE">
+					<model ea_localid="966" type="Enumeration" name="at-voc:buyer-legal-type"/>
+					<role name="epo:hasBuyerLegalType" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -45220,19 +47554,17 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4307"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="1656"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="A category that indicates the right of an Organisation to play the role of a buyer.&#xA;&#xA;Additional Information:&#xA;The category also effects the rules that the buyer has to abide to within the public procurement procedure.&#xA;WG 07/09/2021&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo-ord:hasTotalLineAmount"/>
+				<labels rb="0..1" rt="+epo:hasBuyerLegalType"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9BF032E2_6893_45df_95FE_A08E92EA8618">
+			<connector xmi:idref="EAID_B6D90197_EC7F_4a01_8047_2DAC846D9C03">
 				<source xmi:idref="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9">
 					<model ea_localid="3466" type="Class" name="epo-sub:NationalPreQualificationData"/>
 					<role visibility="Public" targetScope="instance"/>
@@ -45244,10 +47576,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo-sub:providesOrganisationFinancialCapability" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+					<model ea_localid="913" type="Class" name="org:Organization"/>
+					<role name="epo-sub:concernsOrganisation" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -45255,21 +47587,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="5180"/>
+				<model ea_localid="5177"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="A monetary amount representing the financial capability of the Organization.&#xA;&#xA;Additional information:&#xA;Used to represent the general Turnover of the Organization (for statistical purposes).&#xA;&#xA;WG approval 05/03/2024"/>
+				<documentation value="Relates to Organization.&#xA;&#xA;WG approval 05/03/2024&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-sub:providesOrganisationFinancialCapability"/>
+				<labels rb="1" rt="+epo-sub:concernsOrganisation"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A110770D_19E8_400c_A438_44EEAB172389">
-				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
-					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
+			<connector xmi:idref="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F">
+				<source xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
+					<model ea_localid="1628" type="Class" name="epo-sub:ESPD"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45277,12 +47609,12 @@
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo-ord:hasTotalAllowanceAmount" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+					<model ea_localid="913" type="Class" name="org:Organization"/>
+					<role name="epo-sub:providesInformationOn" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -45290,21 +47622,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4310"/>
+				<model ea_localid="5257"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Offers information about an instance of a concept.&#xA;&#xA;WG approval 05/03/2024"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ord:hasTotalAllowanceAmount"/>
+				<labels rb="0..*" rt="+epo-sub:providesInformationOn"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_AB852C7E_4390_46da_9255_1C4C8BE7B02F">
-				<source xmi:idref="EAID_C215EC75_82FD_45d3_832A_B3989A897692">
-					<model ea_localid="2615" type="Class" name="epo-ful:GoodsItem"/>
+			<connector xmi:idref="EAID_677B606B_352C_459b_9644_C85CAC550728">
+				<source xmi:idref="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225">
+					<model ea_localid="916" type="Class" name="person:Person"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45314,9 +47646,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo-ful:hasDeclaredStatisticalValue" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F">
+					<model ea_localid="969" type="Enumeration" name="at-voc:country"/>
+					<role name="epo:hasNationality" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -45325,56 +47657,52 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4022"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="1437"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo-ful:hasDeclaredStatisticalValue"/>
+				<labels rb="0..*" rt="+epo:hasNationality"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C3F576CC_0DFC_40d6_86C4_6F47177DB0C6">
-				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
-					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+			<connector xmi:idref="EAID_7E6F9511_A2DD_4f1c_B8AA_9EA312803C2B">
+				<source xmi:idref="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225">
+					<model ea_localid="916" type="Class" name="person:Person"/>
+					<role visibility="Public"/>
+					<type aggregation="none"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="AllowDuplicates=0;Derived=0;Navigable=Non-Navigable;Owned=0;Union=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo-ord:hasRoundingAmount" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F">
+					<model ea_localid="969" type="Enumeration" name="at-voc:country"/>
+					<role name="epo:hasCountryOfBirth" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="AllowDuplicates=0;Derived=0;Navigable=Navigable;Owned=0;Union=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4313"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="2567"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The country in which the Person was born.&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ord:hasRoundingAmount"/>
-				<extendedProperties virtualInheritance="0"/>
+				<labels rb="0..1" rt="+epo:hasCountryOfBirth"/>
+				<extendedProperties/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C753CDC6_88B6_449b_B44C_0F56A31472A7">
-				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
-					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
+			<connector xmi:idref="EAID_2EC2BFAF_50AE_496d_A93E_27A2FA651CF4">
+				<source xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524">
+					<model ea_localid="1079" type="Class" name="epo-not:CompletionNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45384,10 +47712,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo-ord:hasPrepaidAmount" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8">
+					<model ea_localid="854" type="Class" name="epo:AwardDecision"/>
+					<role name="epo:refersToAwardDecision" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -45395,21 +47723,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4312"/>
+				<model ea_localid="4646"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ord:hasPrepaidAmount"/>
+				<labels rb="0..*" rt="+epo:refersToAwardDecision"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_CBE972DE_D8B8_42a5_A6A1_F386873985BC">
-				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
-					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
+			<connector xmi:idref="EAID_5465A41A_7AD8_4020_9E57_C032F2801A7A">
+				<source xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2">
+					<model ea_localid="1077" type="Class" name="epo-not:ResultNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45419,10 +47747,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo-ord:hasAmountDueForPayment" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8">
+					<model ea_localid="854" type="Class" name="epo:AwardDecision"/>
+					<role name="epo:announcesAwardDecision" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -45430,21 +47758,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4314"/>
+				<model ea_localid="2705"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo-ord:hasAmountDueForPayment"/>
+				<labels rb="0..*" rt="+epo:announcesAwardDecision"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F78CF3B1_3FB3_43b9_B9AB_1FE660C3663F">
-				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
-					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
+			<connector xmi:idref="EAID_A1441146_4BC0_49e9_847D_7D2636FCB6FA">
+				<source xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257">
+					<model ea_localid="1078" type="Class" name="epo-not:ContractModificationNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45454,10 +47782,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo-ord:hasTotalChargeAmount" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8">
+					<model ea_localid="854" type="Class" name="epo:AwardDecision"/>
+					<role name="epo:refersToAwardDecision" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -45465,21 +47793,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4311"/>
+				<model ea_localid="4658"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ord:hasTotalChargeAmount"/>
+				<labels rb="0..*" rt="+epo:refersToAwardDecision"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_007A256B_E0B5_4a62_B8D7_2BC14F331BE5">
-				<source xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
-					<model ea_localid="915" type="Class" name="epo:Period"/>
+			<connector xmi:idref="EAID_EBAA0FEE_B552_4003_8B98_ADD4600E7BA1">
+				<source xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C">
+					<model ea_localid="1076" type="Class" name="epo-not:DirectAwardPrenotificationNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45489,10 +47817,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_5A01D361_6509_447f_B318_F20F23FBF81F">
-					<model ea_localid="997" type="Enumeration" name="at-voc:timeperiod"/>
-					<role name="epo:hasTimePeriod" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8">
+					<model ea_localid="854" type="Class" name="epo:AwardDecision"/>
+					<role name="epo:announcesAwardDecision" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -45500,19 +47828,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1443"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="&#xA;&#xA;"/>
+				<model ea_localid="4483"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1..*" rt="+epo:hasTimePeriod"/>
+				<labels rb="0..*" rt="+epo:announcesAwardDecision"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_11C78626_167C_4c06_AF8A_1D37420731A9">
-				<source xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8">
-					<model ea_localid="2023" type="Class" name="epo-ful:ShipmentInformation"/>
+			<connector xmi:idref="EAID_0823E4D3_4706_4097_A6E7_D6BCEF598E62">
+				<source xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
+					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45522,9 +47852,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
-					<model ea_localid="915" type="Class" name="epo:Period"/>
-					<role name="epo-ful:hasEstimatedDeliveryPeriod" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07">
+					<model ea_localid="933" type="Class" name="epo:Purpose"/>
+					<role name="epo:hasPurpose" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -45533,21 +47863,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3423"/>
+				<model ea_localid="3128"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating the Purpose of a concept."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasEstimatedDeliveryPeriod"/>
+				<labels rb="0..1" rt="+epo:hasPurpose"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_33FC7129_7479_45ab_AECD_F356DB6C1872">
-				<source xmi:idref="EAID_A8D775E4_EEB9_4502_B8A1_C1DD5D555864">
-					<model ea_localid="3505" type="Class" name="cccev:EvidenceType"/>
+			<connector xmi:idref="EAID_2FC633C9_64DB_4b46_9190_197D4A4F4C63">
+				<source xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
+					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45557,9 +47887,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
-					<model ea_localid="915" type="Class" name="epo:Period"/>
-					<role name="cccev:validityPeriodConstraint" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66">
+					<model ea_localid="977" type="Enumeration" name="at-voc:legal-basis"/>
+					<role name="epo:hasLegalBasis" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -45568,56 +47898,53 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="5239"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="Temporal condition on the validity period of the Evidence Type.&#xA;&#xA;Additional Information:&#xA;E.g. A Belgian birth evidence is valid for X months after emission. To express constraints on the validity period that must hold when assessing the evidence (e.g. the certificate of good conduct cannot be issued more than 3 months ago), we refer to the Constraint class."/>
+				<model ea_localid="1424"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The legal basis under which the procurement procedure takes place.&#xA;&#xA;Additional Information: &#xA;For example European Directives or Regulations, national laws etc.&#xA;The recommended code list is the example for the legal basis at the European level.&#xA;&#xA;WG 04/04/2023&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+cccev:validityPeriodConstraint"/>
+				<labels rb="0..*" rt="+epo:hasLegalBasis"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_6D569FED_815F_45f4_87EA_C0E83DC5C9AF">
-				<source xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
-					<model ea_localid="1831" type="Class" name="epo-cat:Price"/>
+			<connector xmi:idref="EAID_AB768772_FAC4_4353_A1C6_F384FEC304AE">
+				<source xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
+					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
-					<model ea_localid="915" type="Class" name="epo:Period"/>
-					<role name="epo-cat:hasPriceValidity" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7">
+					<model ea_localid="2078" type="Class" name="epo:ProcurementElement"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation value="The period of time when the Item can be ordered to the given price.&#xA;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1755"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3343"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo-cat:hasPriceValidity"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_89C3F218_90EF_42ed_B918_7EEB88718C50">
-				<source xmi:idref="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB">
-					<model ea_localid="3096" type="Class" name="epo-ord:OrderResponseInformation"/>
+			<connector xmi:idref="EAID_AFFFCDAE_C459_4420_9649_6F7949D3D9BA">
+				<source xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A">
+					<model ea_localid="917" type="Class" name="epo:PlannedProcurementPart"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45627,9 +47954,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
-					<model ea_localid="915" type="Class" name="epo:Period"/>
-					<role name="epo-ord:hasDeliveryPeriod" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
+					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
+					<role name="epo:foreseesProcurementObject" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -45638,91 +47965,89 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4763"/>
+				<model ea_localid="4441"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating the instance of a Procurement Object that is planned.&#xA;&#xA;Additional Information:&#xA;The properties of the Procurement Object that is foreseen should be read as foreseen properties. &#xA;For example, Procedure isSMESuitable should be read as Procedure foreseesToBeSMESuitable.&#xA;For example, Procedure isFundedBy should be read as Procedure foreseesToBeFundedBy."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ord:hasDeliveryPeriod"/>
+				<labels rb="0..1" rt="+epo:foreseesProcurementObject"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_8FF88923_D9FB_4937_B866_FABECBC1DB55">
-				<source xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B">
-					<model ea_localid="1057" type="Class" name="epo-cat:CatalogueLine"/>
+			<connector xmi:idref="EAID_B8BA8A30_8A22_4475_A8A7_C0037581B6D3">
+				<source xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
+					<model ea_localid="922" type="Class" name="epo:Procedure"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
-					<model ea_localid="915" type="Class" name="epo:Period"/>
-					<role name="epo-cat:hasCatalogueLineValidity" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
+					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1754"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2936"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="The relation indicating until when a Catalogue Line instance is applicable.&#xA;&#xA;WG approval 21/09/2023"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:hasCatalogueLineValidity"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9EDDC1AB_FC05_462d_A479_433862DD01D8">
-				<source xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0">
-					<model ea_localid="1056" type="Class" name="epo-cat:Catalogue"/>
+			<connector xmi:idref="EAID_BE41CCFB_8495_440b_ADCE_908A980E0342">
+				<source xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
+					<model ea_localid="906" type="Class" name="epo:Lot"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
-					<model ea_localid="915" type="Class" name="epo:Period"/>
-					<role name="epo:hasValidityPeriod" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
+					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4916"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2659"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="The relation indicating until when a given instance of a concept is applicable.&#xA;&#xA;WG approval 30/05/2023"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasValidityPeriod"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_B2FBB3C3_8542_4cd9_8B7E_A25D4A6C9048">
-				<source xmi:idref="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC">
-					<model ea_localid="3467" type="Class" name="epo-sub:Response"/>
+			<connector xmi:idref="EAID_20732599_332F_4f0e_BFE6_593632EDB11F">
+				<source xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
+					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45732,10 +48057,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
-					<model ea_localid="915" type="Class" name="epo:Period"/>
-					<role name="epo-sub:refersToApplicablePeriod" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
+					<model ea_localid="906" type="Class" name="epo:Lot"/>
+					<role name="epo:setsGroupingContextForLot" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -45743,21 +48068,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="5193"/>
+				<model ea_localid="2780"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating the period to which the Response shall apply.&#xA;&#xA;WG approval 12/03/2024"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-sub:refersToApplicablePeriod"/>
+				<labels rb="1..*" rt="+epo:setsGroupingContextForLot"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_DCA21CBC_3D4F_480a_B24B_49A69CC51624">
-				<source xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A">
-					<model ea_localid="2087" type="Class" name="epo-ord:DeliveryInformation"/>
+			<connector xmi:idref="EAID_3656734D_7238_4738_9F80_EC054ABA2E24">
+				<source xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524">
+					<model ea_localid="1079" type="Class" name="epo-not:CompletionNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45767,10 +48092,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
-					<model ea_localid="915" type="Class" name="epo:Period"/>
-					<role name="epo-ord:hasDeliveryPeriod" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
+					<model ea_localid="906" type="Class" name="epo:Lot"/>
+					<role name="epo:refersToLot" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -45778,21 +48103,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3281"/>
+				<model ea_localid="4647"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ord:hasDeliveryPeriod"/>
+				<labels rb="1..*" rt="+epo:refersToLot"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_30CBA4D5_2CA0_4043_A8BC_8FBCF102380D">
-				<source xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
+			<connector xmi:idref="EAID_389050E1_4285_45aa_87A9_6A9BA62CD554">
+				<source xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C">
+					<model ea_localid="1076" type="Class" name="epo-not:DirectAwardPrenotificationNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45802,10 +48127,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3">
-					<model ea_localid="1035" type="Enumeration" name="at-voc:measurement-unit"/>
-					<role name="epo:hasUnitCode" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
+					<model ea_localid="906" type="Class" name="epo:Lot"/>
+					<role name="epo:announcesLot" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -45813,19 +48138,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2428"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="4641"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:hasUnitCode"/>
+				<labels rb="1..*" rt="+epo:announcesLot"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_0167DB54_9519_42f6_BD3B_F46B589F376C">
-				<source xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD">
-					<model ea_localid="2621" type="Class" name="epo-ful:AbstractContainer"/>
+			<connector xmi:idref="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547">
+				<source xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
+					<model ea_localid="958" type="Class" name="epo:Tender"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45835,10 +48162,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-ful:hasGrossWeight" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
+					<model ea_localid="906" type="Class" name="epo:Lot"/>
+					<role name="epo:isSubmittedForLot" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -45846,21 +48173,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3436"/>
+				<model ea_localid="2783"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasGrossWeight"/>
+				<labels rb="1" rt="+epo:isSubmittedForLot"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_05490F76_8D40_4d74_97D4_F3871039E80A">
-				<source xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD">
-					<model ea_localid="2621" type="Class" name="epo-ful:AbstractContainer"/>
+			<connector xmi:idref="EAID_53A06CD6_3F60_4e8f_A32A_669CA4829E33">
+				<source xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257">
+					<model ea_localid="1078" type="Class" name="epo-not:ContractModificationNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45870,10 +48197,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-ful:hasNetWeight" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
+					<model ea_localid="906" type="Class" name="epo:Lot"/>
+					<role name="epo:refersToLot" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -45881,21 +48208,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4043"/>
+				<model ea_localid="4480"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasNetWeight"/>
+				<labels rb="1..*" rt="+epo:refersToLot"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_0AC5D04E_7364_4118_9D94_CE93A68B3CF9">
-				<source xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A">
-					<model ea_localid="2037" type="Class" name="epo-ord:OrderLine"/>
+			<connector xmi:idref="EAID_55B64699_B98C_49f8_AAA8_01BAEEF0DD49">
+				<source xmi:idref="EAID_17662AEF_1321_446a_AE42_0583F7417A79">
+					<model ea_localid="1075" type="Class" name="epo-not:CompetitionNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45905,10 +48232,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-cat:hasQuantity" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
+					<model ea_localid="906" type="Class" name="epo:Lot"/>
+					<role name="epo:announcesLot" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -45916,21 +48243,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3279"/>
+				<model ea_localid="2402"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo-cat:hasQuantity"/>
+				<labels rb="1..*" rt="+epo:announcesLot"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_0F1AB34D_EA8C_44fb_B232_AA4B138F066B">
-				<source xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD">
-					<model ea_localid="2621" type="Class" name="epo-ful:AbstractContainer"/>
+			<connector xmi:idref="EAID_7355842B_BD0C_4fab_8681_C210E308328D">
+				<source xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2">
+					<model ea_localid="1077" type="Class" name="epo-not:ResultNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45940,10 +48267,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-ful:hasLength" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
+					<model ea_localid="906" type="Class" name="epo:Lot"/>
+					<role name="epo:refersToLot" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -45951,21 +48278,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4048"/>
+				<model ea_localid="2607"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasLength"/>
+				<labels rb="1..*" rt="+epo:refersToLot"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_11D3CF7A_4949_410c_A7E5_91AB91646B43">
-				<source xmi:idref="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73">
-					<model ea_localid="3236" type="Class" name="epo-ful:ReceiptAdviceLine"/>
+			<connector xmi:idref="EAID_A959BE8D_107A_4aaf_BE64_567414A2ABCC">
+				<source xmi:idref="EAID_1CD63756_49D3_460c_8DDF_82EB3F869963">
+					<model ea_localid="3580" type="Class" name="epo-inv:Invoice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45975,10 +48302,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-ful:hasOversupplyQuantity" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
+					<model ea_localid="906" type="Class" name="epo:Lot"/>
+					<role name="epo:hasLotReference" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -45986,104 +48313,103 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4891"/>
+				<model ea_localid="5348"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasOversupplyQuantity"/>
+				<labels rb="1..*" rt="+epo:hasLotReference"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_1F622DE3_2DEE_491f_A5F1_B592E89F9030">
-				<source xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
-					<model ea_localid="1831" type="Class" name="epo-cat:Price"/>
+			<connector xmi:idref="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349">
+				<source xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
+					<model ea_localid="922" type="Class" name="epo:Procedure"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-cat:hasQuantityThreshold" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
+					<model ea_localid="906" type="Class" name="epo:Lot"/>
+					<role name="epo:hasProcurementScopeDividedIntoLot" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation value="The minimum quantity of the item that can be ordered to the given net monetary value."/>
+					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3057"/>
+				<model ea_localid="1467"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:hasQuantityThreshold"/>
+				<labels rb="1..*" rt="+epo:hasProcurementScopeDividedIntoLot"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_2ECAEC7F_2186_4280_A2C0_6DC585D1EE96">
-				<source xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD">
-					<model ea_localid="2621" type="Class" name="epo-ful:AbstractContainer"/>
+			<connector xmi:idref="EAID_71953D29_84AD_4774_9664_258E887283AF">
+				<source xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A">
+					<model ea_localid="917" type="Class" name="epo:PlannedProcurementPart"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-ful:hasGrossVolume" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7">
+					<model ea_localid="2078" type="Class" name="epo:ProcurementElement"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3431"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2660"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasGrossVolume"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65">
-				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+			<connector xmi:idref="EAID_5A3E83F2_4A0C_4707_ACA1_C8D3B87F7C00">
+				<source xmi:idref="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B">
+					<model ea_localid="1074" type="Class" name="epo-not:PlanningNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-cat:hasNetQuantity" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A">
+					<model ea_localid="917" type="Class" name="epo:PlannedProcurementPart"/>
+					<role name="epo:announcesPlannedProcurementPart" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -46091,56 +48417,55 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3027"/>
+				<model ea_localid="1433"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The net quantity of the item that is contained in each consumable unit, excluding any packaging materials.&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:hasNetQuantity"/>
+				<labels rb="0..*" rt="+epo:announcesPlannedProcurementPart"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_3D54F6F9_658D_40fe_9D16_D79F46DB945C">
-				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
-					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
+			<connector xmi:idref="EAID_8A689597_C8A3_475b_AD2A_EA61AB152656">
+				<source xmi:idref="EAID_A7E3EEA1_BBD5_409a_9717_8E5FF181CF7E">
+					<model ea_localid="2983" type="Note"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-ful:hasNetWeight" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A">
+					<model ea_localid="917" type="Class" name="epo:PlannedProcurementPart"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4251"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<model ea_localid="4560"/>
+				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasNetWeight"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_45480564_D6B2_41da_8694_DC63D52825C1">
-				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
-					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
+			<connector xmi:idref="EAID_B62DE754_3523_45c7_9426_333EF3B4B423">
+				<source xmi:idref="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C">
+					<model ea_localid="1948" type="Class" name="epo:CertificationLabel"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -46150,9 +48475,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-ful:hasChargeableWeight" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_7C286914_0A87_4d10_9FFD_8653AC16BD03">
+					<model ea_localid="1949" type="Enumeration" name="at-voc-new:certification-label-type"/>
+					<role name="epo:hasLabelType" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -46161,21 +48486,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4252"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="3194"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The label type such environmental, quality, social etc."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasChargeableWeight"/>
+				<labels rb="0..1" rt="+epo:hasLabelType"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_4BA4CF11_20FC_48b0_A739_471F732B8482">
-				<source xmi:idref="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73">
-					<model ea_localid="3236" type="Class" name="epo-ful:ReceiptAdviceLine"/>
+			<connector xmi:idref="EAID_C3BED690_3A74_4118_8357_6957359310FB">
+				<source xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
+					<model ea_localid="1952" type="Class" name="epo:Certificate"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -46185,9 +48508,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-ful:hasReceivedQuantity" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C">
+					<model ea_localid="1948" type="Class" name="epo:CertificationLabel"/>
+					<role name="epo:attestedByLabel" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -46196,21 +48519,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4890"/>
+				<model ea_localid="3192"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating which label the certificate is about. &#xA;&#xA;WG approval 28/07/2022"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasReceivedQuantity"/>
+				<labels rb="0..1" rt="+epo:attestedByLabel"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_5C5BD66A_585D_4646_9A7B_894EA99DED44">
-				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
-					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
+			<connector xmi:idref="EAID_169198B9_544A_4d67_9273_0F076E0C1306">
+				<source xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
+					<model ea_localid="922" type="Class" name="epo:Procedure"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -46220,10 +48543,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-ful:hasTransportHandlingUnitQuantity" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_9303CE6E_F83F_4762_A306_7FCBDE0E5A37">
+					<model ea_localid="989" type="Enumeration" name="at-voc:procurement-procedure-type"/>
+					<role name="epo:hasProcedureType" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -46231,21 +48554,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3985"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="1427"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="Identification of the Procedure used.&#xA;&#xA;WG Approval 09/06/2020&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasTransportHandlingUnitQuantity"/>
+				<labels rb="1" rt="+epo:hasProcedureType"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_65E8EC44_CB4C_4aa9_8218_75D01ED44538">
-				<source xmi:idref="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC">
-					<model ea_localid="2117" type="Class" name="epo-ful:DespatchLine"/>
+			<connector xmi:idref="EAID_A5762169_952E_4db0_9FE7_6B4A895F2AF1">
+				<source xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2">
+					<model ea_localid="1077" type="Class" name="epo-not:ResultNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -46255,9 +48576,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-ful:hasDespatchedQuantity" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
+					<model ea_localid="922" type="Class" name="epo:Procedure"/>
+					<role name="epo:refersToProcedure" visibility="Public" targetScope="instance"/>
 					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -46266,21 +48587,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3426"/>
+				<model ea_localid="2604"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Quantity despatched for delivered."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo-ful:hasDespatchedQuantity"/>
+				<labels rb="1" rt="+epo:refersToProcedure"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_75378C4F_ABAD_440f_8E1B_502A7CDA0486">
-				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
-					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
+			<connector xmi:idref="EAID_AEF23C3F_F74B_434a_AA2D_59AF706E79E6">
+				<source xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257">
+					<model ea_localid="1078" type="Class" name="epo-not:ContractModificationNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -46290,10 +48611,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-ful:hasLoadingLength" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
+					<model ea_localid="922" type="Class" name="epo:Procedure"/>
+					<role name="epo:refersToProcedure" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -46301,21 +48622,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4035"/>
+				<model ea_localid="4487"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasLoadingLength"/>
+				<labels rb="1" rt="+epo:refersToProcedure"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_76005691_B905_4be3_99BF_394E56A591CE">
-				<source xmi:idref="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73">
-					<model ea_localid="3236" type="Class" name="epo-ful:ReceiptAdviceLine"/>
+			<connector xmi:idref="EAID_B1307E49_0838_4569_819E_D05D699E0983">
+				<source xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C">
+					<model ea_localid="1076" type="Class" name="epo-not:DirectAwardPrenotificationNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -46325,10 +48646,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-ful:hasShortQuantity" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
+					<model ea_localid="922" type="Class" name="epo:Procedure"/>
+					<role name="epo:announcesProcedure" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -46336,21 +48657,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4889"/>
+				<model ea_localid="2872"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasShortQuantity"/>
+				<labels rb="1" rt="+epo:announcesProcedure"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_770594A4_09FD_4b6e_8D27_8D44BA5CA36A">
-				<source xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD">
-					<model ea_localid="2621" type="Class" name="epo-ful:AbstractContainer"/>
+			<connector xmi:idref="EAID_E69DD4EA_847D_4a36_96C4_9709B72BA620">
+				<source xmi:idref="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB">
+					<model ea_localid="1664" type="Class" name="epo-acc:ESPDRequest"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -46360,10 +48681,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-ful:hasWidth" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
+					<model ea_localid="922" type="Class" name="epo:Procedure"/>
+					<role name="epo:concernsProcedure" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -46371,21 +48692,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4050"/>
+				<model ea_localid="4775"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relates to Procedure.&#xA;&#xA;WG approval 05/03/2024&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasWidth"/>
+				<labels rb="1" rt="+epo:concernsProcedure"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_838E60F9_C54C_4c80_88A3_D705701F1971">
-				<source xmi:idref="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31">
-					<model ea_localid="2905" type="Class" name="epo-con:Deliverable"/>
+			<connector xmi:idref="EAID_F365A241_4CD0_4009_A42F_041D198E70E4">
+				<source xmi:idref="EAID_17662AEF_1321_446a_AE42_0583F7417A79">
+					<model ea_localid="1075" type="Class" name="epo-not:CompetitionNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -46395,10 +48716,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-cat:hasQuantity" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
+					<model ea_localid="922" type="Class" name="epo:Procedure"/>
+					<role name="epo:announcesProcedure" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -46406,21 +48727,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4454"/>
+				<model ea_localid="2401"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:hasQuantity"/>
+				<labels rb="1" rt="+epo:announcesProcedure"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_87C6E00F_DAEB_4e79_8340_AC2FC83206DA">
-				<source xmi:idref="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9">
-					<model ea_localid="3466" type="Class" name="epo-sub:NationalPreQualificationData"/>
+			<connector xmi:idref="EAID_F5AC099A_F1E0_4926_9F7B_6C2B6C33321B">
+				<source xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524">
+					<model ea_localid="1079" type="Class" name="epo-not:CompletionNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -46430,10 +48751,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-sub:providesOrganisationEmployeeQuantity" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
+					<model ea_localid="922" type="Class" name="epo:Procedure"/>
+					<role name="epo:refersToProcedure" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -46441,21 +48762,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="5179"/>
+				<model ea_localid="4485"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The number of people hired by the Organization.&#xA;&#xA;WG approval 05/03/2024"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-sub:providesOrganisationEmployeeQuantity"/>
+				<labels rb="1" rt="+epo:refersToProcedure"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_87DEA454_B158_4e44_91D6_F1D258049A37">
-				<source xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD">
-					<model ea_localid="2621" type="Class" name="epo-ful:AbstractContainer"/>
+			<connector xmi:idref="EAID_97176015_1FBF_4d9c_9A77_C246A6F21E71">
+				<source xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
+					<model ea_localid="1952" type="Class" name="epo:Certificate"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -46465,9 +48786,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-ful:hasHeight" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1">
+					<model ea_localid="1951" type="Class" name="epo:Certifier"/>
+					<role name="epo:issuedByCertifier" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -46476,21 +48797,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4049"/>
+				<model ea_localid="3193"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating the Certifier responsible for providing the ItemCertificate.&#xA;&#xA;Additional Information:&#xA;Certifier is a role played by an organisation.&#xA;&#xA;WG approval 26/07/2022"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasHeight"/>
+				<labels rb="0..1" rt="+epo:issuedByCertifier"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_8C56C81B_B46D_49ef_B3BF_333FDA416F39">
-				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
-					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
+			<connector xmi:idref="EAID_17DACA2B_8A10_4516_8C96_D5EA3AE635E9">
+				<source xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257">
+					<model ea_localid="1078" type="Class" name="epo-not:ContractModificationNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -46500,10 +48821,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-ful:hasGrossVolume" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
+					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
+					<role name="epo:refersToLotGroup" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -46511,21 +48832,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3421"/>
+				<model ea_localid="4656"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasGrossVolume"/>
+				<labels rb="0..*" rt="+epo:refersToLotGroup"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_95D24239_8F4D_44c8_97D1_1C26296607DA">
-				<source xmi:idref="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC">
-					<model ea_localid="2117" type="Class" name="epo-ful:DespatchLine"/>
+			<connector xmi:idref="EAID_7B5EC3B7_635F_49aa_B61D_661F42799A98">
+				<source xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
+					<model ea_localid="958" type="Class" name="epo:Tender"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -46535,9 +48856,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-ful:hasOutstandingQuantity" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
+					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
+					<role name="epo:isSubjectToGrouping" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -46546,21 +48867,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3427"/>
+				<model ea_localid="2781"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasOutstandingQuantity"/>
+				<labels rb="0..1" rt="+epo:isSubjectToGrouping"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9EA3B8C3_695C_4b42_8481_D40EEC904171">
-				<source xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
-					<model ea_localid="1831" type="Class" name="epo-cat:Price"/>
+			<connector xmi:idref="EAID_896CC936_0C78_48b9_A44A_1D010626BE9B">
+				<source xmi:idref="EAID_17662AEF_1321_446a_AE42_0583F7417A79">
+					<model ea_localid="1075" type="Class" name="epo-not:CompetitionNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -46570,10 +48891,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-cat:hasBaseQuantity" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
+					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
+					<role name="epo:announcesLotGroup" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -46581,21 +48902,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3060"/>
+				<model ea_localid="2426"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The quantity at which the net monetary value applies."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:hasBaseQuantity"/>
+				<labels rb="0..*" rt="+epo:announcesLotGroup"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A0FABF7A_1814_4dd4_BD97_28BD0C9F2F49">
-				<source xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
-					<model ea_localid="1831" type="Class" name="epo-cat:Price"/>
+			<connector xmi:idref="EAID_BCCB407C_08A7_467b_8826_322D82AB6DB0">
+				<source xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2">
+					<model ea_localid="1077" type="Class" name="epo-not:ResultNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -46605,32 +48926,32 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-cat:hasOrderabableUnitFactorRate" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
+					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
+					<role name="epo:refersToLotGroup" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation value="The factor by which the base unit of the price can be converted to orderable unit.&#xA;&#xA;Additional information:&#xA;This is needed when the base price is provided different than the orderable unit. For example, when selling paper, the price may be set per page, but the  orderable unit is a package of 500 pieces. Therefore the price needs to be converted to the orderable unit. &#xA;&#xA;"/>
+					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3056"/>
+				<model ea_localid="2617"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:hasOrderabableUnitFactorRate"/>
+				<labels rb="0..*" rt="+epo:refersToLotGroup"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_B1577190_0947_4041_ACDC_BC0C377734AF">
-				<source xmi:idref="EAID_BB1AAA4C_E66B_4fde_A0B6_1A30FC13503B">
-					<model ea_localid="2622" type="Class" name="epo-ful:TemperatureSpecification"/>
+			<connector xmi:idref="EAID_C6F18DD0_9007_48f0_9959_5EE6A49DDD1B">
+				<source xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C">
+					<model ea_localid="1076" type="Class" name="epo-not:DirectAwardPrenotificationNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -46640,10 +48961,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-ful:hasMaximumTemperature" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
+					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
+					<role name="epo:announcesLotGroup" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -46651,21 +48972,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4046"/>
+				<model ea_localid="4643"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasMaximumTemperature"/>
+				<labels rb="0..*" rt="+epo:announcesLotGroup"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_B4F0448C_1741_4b38_9973_F506CB883BA2">
-				<source xmi:idref="EAID_98A91DEA_2E1F_4f19_B161_E4D3999D0A73">
-					<model ea_localid="3236" type="Class" name="epo-ful:ReceiptAdviceLine"/>
+			<connector xmi:idref="EAID_D6AB3946_257D_4382_A283_8978FB00BD51">
+				<source xmi:idref="EAID_93ACA540_2668_42d3_BE40_C921C05C776E">
+					<model ea_localid="1685" type="Class" name="epo:TenderGroup"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -46675,10 +48996,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-ful:hasRejectedQuantity" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
+					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
+					<role name="epo:isSubmittedForLotGroup" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -46686,21 +49007,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4892"/>
+				<model ea_localid="2865"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasRejectedQuantity"/>
+				<labels rb="1" rt="+epo:isSubmittedForLotGroup"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_B9C9C412_36FA_46d5_AA00_34CA1CC60CA2">
-				<source xmi:idref="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4">
-					<model ea_localid="1940" type="Class" name="epo-cat:ItemProperty"/>
+			<connector xmi:idref="EAID_DB36A935_6B61_49a0_A901_D1A6B9C4D5A7">
+				<source xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524">
+					<model ea_localid="1079" type="Class" name="epo-not:CompletionNotice"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -46710,10 +49031,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-cat:hasQualifiedValue" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
+					<model ea_localid="907" type="Class" name="epo:LotGroup"/>
+					<role name="epo:refersToLotGroup" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -46721,21 +49042,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3168"/>
+				<model ea_localid="4648"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Qualified value of the property, which is defined in a classification scheme.&#xA;&#xA;Additional Information:&#xA;For example, the (0173-1#02-AAA026#007) drilling diameter of an item has value of 12 inches. &#xA;&#xA;WG approval 28/07/2022"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:hasQualifiedValue"/>
+				<labels rb="0..*" rt="+epo:refersToLotGroup"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C5E4577A_5BDB_4176_9418_BB9B2E957222">
-				<source xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD">
-					<model ea_localid="2621" type="Class" name="epo-ful:AbstractContainer"/>
+			<connector xmi:idref="EAID_74371426_1670_46df_8526_5A4910F24815">
+				<source xmi:idref="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07">
+					<model ea_localid="933" type="Class" name="epo:Purpose"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -46745,10 +49066,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-ful:hasTotalGoodsItemQuantity" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_E55F2451_5826_4907_B311_4F37313BAEF6">
+					<model ea_localid="970" type="Enumeration" name="at-voc:cpv"/>
+					<role name="epo:hasMainClassification" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -46756,21 +49077,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4037"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
+				<model ea_localid="1407"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasTotalGoodsItemQuantity"/>
+				<labels rb="1..*" rt="+epo:hasMainClassification"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_E93A74BB_614F_4b1c_AE59_F45CD626BB7A">
-				<source xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B">
-					<model ea_localid="1057" type="Class" name="epo-cat:CatalogueLine"/>
+			<connector xmi:idref="EAID_95D11AFD_5F07_4159_ABF2_BA01D9E3FEE4">
+				<source xmi:idref="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07">
+					<model ea_localid="933" type="Class" name="epo:Purpose"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -46780,10 +49099,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-cat:hasMinimumQuantityGuaranteedForDelivery" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_E55F2451_5826_4907_B311_4F37313BAEF6">
+					<model ea_localid="970" type="Enumeration" name="at-voc:cpv"/>
+					<role name="epo:hasAdditionalClassification" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -46791,21 +49110,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3026"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="The minimum quantity of an item that is guaranteed by the seller to be delivered.&#xA;&#xA;"/>
+				<model ea_localid="1406"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:hasMinimumQuantityGuaranteedForDelivery"/>
+				<labels rb="0..*" rt="+epo:hasAdditionalClassification"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F475E438_48A3_41f5_A736_268C91FF8AF2">
-				<source xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B">
-					<model ea_localid="1057" type="Class" name="epo-cat:CatalogueLine"/>
+			<connector xmi:idref="EAID_6749101F_45CB_45ba_9792_E3508C6FE92A">
+				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
+					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -46815,10 +49132,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-cat:hasMaximumOrderQuantity" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
+					<model ea_localid="1952" type="Class" name="epo:Certificate"/>
+					<role name="epo:hasCertification" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -46826,21 +49143,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3025"/>
+				<model ea_localid="3201"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The maximum number of orderable units that can be ordered according to details provided in the catalogue line, such as price.&#xA;"/>
+				<documentation value="Relation to the proof of conformance.&#xA;&#xA;WG approval 30/05/2023"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:hasMaximumOrderQuantity"/>
+				<labels rb="0..*" rt="+epo:hasCertification"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F70CA1D5_5E5E_4028_8583_6B810BB672CD">
-				<source xmi:idref="EAID_BB1AAA4C_E66B_4fde_A0B6_1A30FC13503B">
-					<model ea_localid="2622" type="Class" name="epo-ful:TemperatureSpecification"/>
+			<connector xmi:idref="EAID_CA57E831_F2FE_4a87_9BA9_5CF8B7A9D5AB">
+				<source xmi:idref="EAID_02D4B752_188D_46ee_AF52_F2AAFF7E2E77">
+					<model ea_localid="3528" type="Class" name="epo-sub:CertificateInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -46850,10 +49167,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-ful:hasMinimumTemperature" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
+					<model ea_localid="1952" type="Class" name="epo:Certificate"/>
+					<role name="epo-sub:summarisesInformationAboutCertificate" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -46861,21 +49178,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4045"/>
+				<model ea_localid="5259"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating the Certificate that the information refers to.&#xA;&#xA;WG approval 12/03/2024 "/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasMinimumTemperature"/>
+				<labels rb="1" rt="+epo-sub:summarisesInformationAboutCertificate"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F93A2AAD_C014_4fa4_88EE_23DE2339DB3C">
-				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
-					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
+			<connector xmi:idref="EAID_19D655E2_E290_486c_A489_DFE2AC9F7B9B">
+				<source xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
+					<model ea_localid="958" type="Class" name="epo:Tender"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -46885,9 +49202,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-ful:hasTotalGoodsItemQuantity" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82">
+					<model ea_localid="964" type="Enumeration" name="at-voc:applicability"/>
+					<role name="epo:hasSubcontracting" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -46896,21 +49213,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4036"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
+				<model ea_localid="4722"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasTotalGoodsItemQuantity"/>
+				<labels rb="0..1" rt="+epo:hasSubcontracting"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F9F5CFA7_D31A_4c48_80EF_346FB3152195">
-				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
-					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
+			<connector xmi:idref="EAID_73E0123E_9D07_49c6_BAB3_E937B9F25B43">
+				<source xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
+					<model ea_localid="958" type="Class" name="epo:Tender"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -46920,10 +49235,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-ful:hasGrossWeight" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F">
+					<model ea_localid="969" type="Enumeration" name="at-voc:country"/>
+					<role name="epo:hasItemCountryOfOrigin" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -46931,21 +49246,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3420"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="1510"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The source country of the product or service.&#xA;&#xA;Additional Information:&#xA;&#xA;The country of origin can be provided by the buyer as a requirement or by the tenderer information of the item to be provided.&#xA;&#xA;WG Approval 07/01/2020&#xA;&#xA;The codelist to be used is at-voc:country which is available at http://publications.europa.eu/resource/dataset/country"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasGrossWeight"/>
+				<labels rb="0..*" rt="+epo:hasItemCountryOfOrigin"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_FA2388C8_1471_4d6b_9B9F_2E0BBE858668">
-				<source xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD">
-					<model ea_localid="2621" type="Class" name="epo-ful:AbstractContainer"/>
+			<connector xmi:idref="EAID_E453F729_4B4E_44c9_AD20_DD8131AF4BEF">
+				<source xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
+					<model ea_localid="958" type="Class" name="epo:Tender"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -46955,10 +49268,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
-					<model ea_localid="1022" type="Class" name="epo:Quantity"/>
-					<role name="epo-ful:hasNetVolume" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
+					<model ea_localid="1628" type="Class" name="epo-sub:ESPD"/>
+					<role name="epo:isSupportedBy" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -46966,21 +49279,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4042"/>
+				<model ea_localid="2828"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasNetVolume"/>
+				<labels rb="1" rt="+epo:isSupportedBy"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_90566F74_64BC_49c8_8076_1ECB982268EE">
-				<source xmi:idref="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C">
-					<model ea_localid="2059" type="Class" name="epo:SpecificDuration"/>
+			<connector xmi:idref="EAID_688D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5">
+				<source xmi:idref="EAID_93ACA540_2668_42d3_BE40_C921C05C776E">
+					<model ea_localid="1685" type="Class" name="epo:TenderGroup"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -46990,10 +49303,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_EDCD6F3A_F86A_46ca_ACD1_13C3E1A4B7F9">
-					<model ea_localid="1700" type="Enumeration" name="time:TemporalUnit"/>
-					<role name="time:unitType" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
+					<model ea_localid="958" type="Class" name="epo:Tender"/>
+					<role name="epo:comprisesTender" visibility="Public" targetScope="instance"/>
+					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -47001,11 +49314,13 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2889"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation/>
+				<model ea_localid="2866"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Incorporates Tender."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+time:unitType"/>
+				<labels rb="1..*" rt="+epo:comprisesTender"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -47063,13 +49378,13 @@
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation value="The source country of the product or service.&#xA;&#xA;Additional Information:&#xA;&#xA;The country of origin can be provided by  the buyer as a requirement or by the tenderer information of the item to be provided.&#xA;&#xA;WG Approval 07/01/2020&#xA;"/>
+					<documentation value="&#xA;"/>
 					<xrefs/>
 					<tags/>
 				</target>
 				<model ea_localid="2642"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation/>
+				<documentation value="The source country of the product or service.&#xA;&#xA;Additional Information:&#xA;&#xA;The country of origin can be provided by  the buyer as a requirement or by the tenderer information of the item to be provided.&#xA;&#xA;WG Approval 07/01/2020"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels rb="0..1" rt="+epo-cat:hasCountryOfOrigin"/>
 				<extendedProperties virtualInheritance="0"/>
@@ -47416,6 +49731,40 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_3452502E_9900_4175_9794_D484025607E7">
+				<source xmi:idref="EAID_C0E81714_CC78_4bd5_B8F5_31F967E74257">
+					<model ea_localid="3651" type="Object" name="Regulation 1370"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66">
+					<model ea_localid="977" type="Enumeration" name="at-voc:legal-basis"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5479"/>
+				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_3AC3215E_68C1_470f_880A_9FAE9B53D8B9">
 				<source xmi:idref="EAID_F89732E3_0046_41b6_B90C_EF55511242C8">
 					<model ea_localid="1114" type="Object" name="Directive 24"/>
@@ -47450,6 +49799,40 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_4F2CCAB3_E0D4_434a_869E_D874CC918E17">
+				<source xmi:idref="EAID_64AA7AC6_F248_4162_BC6F_4434B8DC0F67">
+					<model ea_localid="3650" type="Object" name="Regulation 1046"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66">
+					<model ea_localid="977" type="Enumeration" name="at-voc:legal-basis"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5478"/>
+				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
+				<documentation/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_8E647BBA_AE2A_4ca3_9144_41548E3A43AB">
 				<source xmi:idref="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A">
 					<model ea_localid="1115" type="Object" name="Directive 25"/>
@@ -48269,8 +50652,8 @@
 		<primitivetypes>
 			<packagedElement xmi:type="uml:Package" xmi:id="EAPrimitiveTypesPackage" name="EA_PrimitiveTypes_Package">
 				<packagedElement xmi:type="uml:Package" xmi:id="EAJavaTypesPackage" name="EA_Java_Types_Package">
-					<packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_xsd_decimal" name="xsd:decimal"/>
 					<packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_rdf_PlainLiteral" name="rdf:PlainLiteral"/>
+					<packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_xsd_decimal" name="xsd:decimal"/>
 					<packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_xsd_anyURI" name="xsd:anyURI"/>
 					<packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_xsd_boolean" name="xsd:boolean"/>
 					<packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_xsd_dateTime" name="xsd:dateTime"/>
@@ -48298,8 +50681,62 @@
 			</uml:Profile>
 		</profiles>
 		<diagrams>
+			<diagram xmi:id="EAID_BE36C015_6DEA_4e64_88D7_DCA46A2951B5">
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" localID="315" owner="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="1"/>
+				<properties name="main objects over time" type="Logical"/>
+				<project author="lps" version="1.0" created="2022-03-29 16:15:17" modified="2023-09-11 13:44:34"/>
+				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=850;DocSize.cy=1098;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=1;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=9E332D65;"/>
+				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=0;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;SW1=360;SW2=466;SW3=399;SW4=445;SW5=366;SW6=411;"/>
+				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
+				<extendedProperties/>
+				<elements>
+					<element geometry="Left=1399;Top=352;Right=1584;Bottom=388;" subject="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" seqno="1" style="DUID=36E5059C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1412;Top=193;Right=1555;Bottom=236;" subject="EAID_E7437025_771F_4143_BE33_620A29646687" seqno="2" style="DUID=5B0AAE38;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=408;Top=23;Right=640;Bottom=160;" subject="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" seqno="3" style="DUID=A2F88BA1;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=2054;Top=691;Right=2292;Bottom=802;" subject="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" seqno="4" style="NSL=0;DUID=27A937A9;"/>
+					<element geometry="Left=36;Top=60;Right=217;Bottom=121;" subject="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" seqno="5" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=E84E1D99;"/>
+					<element geometry="Left=1347;Top=76;Right=1620;Bottom=148;" subject="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" seqno="6" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=4581E1F3;"/>
+					<element geometry="Left=907;Top=603;Right=1078;Bottom=662;" subject="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" seqno="7" style="DUID=638C7CF6;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=460;Top=207;Right=747;Bottom=308;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="8" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;AttCustom=0;OpCustom=0;RzO=1;DUID=4B459512;"/>
+					<element geometry="Left=2086;Top=532;Right=2260;Bottom=602;" subject="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" seqno="9" style="NSL=0;DUID=82E4D1AC;"/>
+					<element geometry="Left=850;Top=415;Right=1069;Bottom=500;" subject="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" seqno="10" style="DUID=3EE6AB1B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1721;Top=417;Right=1937;Bottom=496;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="11" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=CD853710;"/>
+					<element geometry="Left=1257;Top=526;Right=1435;Bottom=585;" subject="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B" seqno="12" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=84B0B29A;"/>
+					<element geometry="Left=1242;Top=270;Right=1515;Bottom=342;" subject="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" seqno="13" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=C3404CFA;"/>
+					<element geometry="Left=2105;Top=428;Right=2403;Bottom=487;" subject="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" seqno="14" style="DUID=AF079676;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=408;Top=426;Right=655;Bottom=488;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="15" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=6D3EFD14;"/>
+					<element geometry="Left=494;Top=603;Right=665;Bottom=662;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="16" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=9078C52C;"/>
+					<element geometry="SX=-6;SY=6;EX=-6;EY=-24;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=120:CY=14:OX=19:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D6AB3946_257D_4382_A283_8978FB00BD51" style="Mode=3;EOID=9078C52C;SOID=638C7CF6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=42;SY=1;EX=71;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_36C907D3_6701_4489_9BBA_3C0E1D4E25A8" style="Mode=3;EOID=5B0AAE38;SOID=36E5059C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=118:CY=14:OX=78:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9663763E_2F48_4952_926C_444F368462AA" style="Mode=3;EOID=27A937A9;SOID=82E4D1AC;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=10;SY=0;EX=10;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=63:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_20732599_332F_4f0e_BFE6_593632EDB11F" style="Mode=3;EOID=6D3EFD14;SOID=9078C52C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-100;SY=-6;EX=-112;EY=-18;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BE41CCFB_8495_440b_ADCE_908A980E0342" style="Mode=3;EOID=A2F88BA1;SOID=6D3EFD14;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B8BA8A30_8A22_4475_A8A7_C0037581B6D3" style="Mode=3;EOID=A2F88BA1;SOID=4B459512;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-38;SY=-11;EX=-41;EY=-6;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=148:CY=27:OX=106:OY=-64:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=6D3EFD14;SOID=4B459512;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=63;SY=0;EX=0;EY=-7;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=135:CY=14:OX=-22:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_AFFFCDAE_C459_4420_9649_6F7949D3D9BA" style="Mode=3;EOID=A2F88BA1;SOID=E84E1D99;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-1;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=155:CY=14:OX=16:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-2:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1611:-215$1611:-555$;" subject="EAID_AF4C01E9_6CF5_410f_83E6_3CAF530D5403" style="Mode=3;EOID=84B0B29A;SOID=5B0AAE38;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=4;SX=0;SY=14;EX=34;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=96:CY=14:OX=18:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547" style="Mode=3;EOID=6D3EFD14;SOID=3EE6AB1B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=102;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=118:CY=14:OX=121:OY=-27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2254:-396$633:-396$;" subject="EAID_6CDB7A9B_1395_4587_9F41_FE45FA8A0605" style="Mode=3;EOID=6D3EFD14;SOID=AF079676;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=1;SY=-1;EX=27;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=92:CY=14:OX=53:OY=18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_688D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5" style="Mode=3;EOID=3EE6AB1B;SOID=638C7CF6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=47;SY=-2;EX=-10;EY=-2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=127:CY=14:OX=76:OY=-11:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_CF215D61_0282_4111_B11C_CBD651205C58" style="Mode=3;EOID=5B0AAE38;SOID=4581E1F3;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-7;EX=47;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=71:CY=14:OX=41:OY=-32:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=2:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=578:-313$;" subject="EAID_96BA801A_E8C8_4628_94BC_1C90816E0487" style="Mode=3;EOID=6D3EFD14;SOID=C3404CFA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=84;SY=-12;EX=-9;EY=-12;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F241B2E1_47C3_4512_8EBE_A60BD8ED070A" style="Mode=3;EOID=5B0AAE38;SOID=C3404CFA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=1;SY=0;EX=0;EY=-25;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87:CY=14:OX=19:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1347:-482$;" subject="EAID_00497249_92E0_435e_9C45_B9A2F9CBFE43" style="Mode=3;EOID=3EE6AB1B;SOID=84B0B29A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=3;SX=-5;SY=0;EX=-89;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=55:OY=25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1824:-705$442:-705$;" subject="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7" style="Mode=3;EOID=6D3EFD14;SOID=CD853710;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=4;SX=14;SY=10;EX=14;EY=6;$LLB=;LLT=;LMT=;LMB=;LRT=CX=84:CY=14:OX=15:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=3:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_EEE75552_13BB_48c2_A5D7_18A876BF10CF" style="Mode=3;EOID=3EE6AB1B;SOID=CD853710;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=4;SX=0;SY=11;EX=0;EY=-1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=4:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_25DE37BE_E478_4159_8F53_7F49CAD18053" style="Mode=3;EOID=CD853710;SOID=AF079676;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-82;SY=0;EX=0;EY=21;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=105:CY=14:OX=14:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=877:-611$;" subject="EAID_7B5EC3B7_635F_49aa_B61D_661F42799A98" style="Mode=3;EOID=9078C52C;SOID=3EE6AB1B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="width=360;" subject="EAID_F3B6CE1F_FF40_415c_BDAA_C6F1A8CD9A98" style="swimlane;name=planning;class=;partition=1;description=OE0={E6781D26-CD82-4c7b-A53A-502157F5F45A}:;"/>
+					<element geometry="width=466;" subject="EAID_41387F28_11CA_4ad4_AEA5_951E1BAAB8D6" style="swimlane;name=competition;class=;partition=2;description=OE0={2046EF02-69A1-4fa0-BF42-2A6E50CAF4E6}:OE1={31976DD6-F85A-4940-AC62-FA4769B4D88C}:OE2={8F3A6A54-584E-4f65-80B0-0C345D6703F4}:OE3={8D49E47D-4538-44e7-BAA8-68D1BF528FF5}:;"/>
+					<element geometry="width=399;" subject="EAID_DECDBD87_13CB_4dc3_BB0B_86FCF0F23E5F" style="swimlane;name=[result / DAP] submission;class=;partition=3;description=OE0={811D4703-55F7-4d6e-B8D8-207479C15419}:OE1={93ACA540-2668-42d3-BE40-C921C05C776E}:;"/>
+					<element geometry="width=445;" subject="EAID_475A6F35_D920_4167_9AB1_562DA185DF05" style="swimlane;name=[result / DAP] award;class=;partition=4;description=OE0={49935879-5AF2-42ce-A416-3E77939F9B7A}:OE1={58CE0F8A-1B9B-418e-B4D4-D8AE4F96B00B}:OE2={B7007F0A-6B30-4fc5-8AC2-D7789CCFB7F8}:OE3={E7437025-771F-4143-BE33-620A29646687}:OE4={22455012-00DF-4dd8-AD48-245A5F11A4D5}:;"/>
+					<element geometry="width=366;" subject="EAID_088CE548_BD49_46db_A0D6_6A0278EE43B9" style="swimlane;name=[result / DAP] contract;class=;partition=5;description=OE0={76E69B0B-4A6E-4901-8372-75A07B6AB066}:;"/>
+					<element geometry="width=411;" subject="EAID_2B3B1B3B_5A39_4ad2_AABE_E06F6D204AB3" style="swimlane;name=completion;class=;partition=6;description=OE0={48AED17D-D6F4-484c-B2BD-3FD3B49365EE}:OE1={86BEE806-DF2C-4395-95C9-B8B685B22E32}:OE2={F3C0E775-3943-40b1-B59A-3107FF9B30BC}:;"/>
+				</elements>
+			</diagram>
 			<diagram xmi:id="EAID_7C7E5BCA_D4BF_435c_9C21_FBFDE3637417">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" localID="337" owner="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684"/>
+				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" localID="337" owner="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A"/>
 				<properties name="epo overview" type="Logical"/>
 				<project author="lps" version="1.0" created="2022-05-13 14:20:29" modified="2023-09-12 14:26:59"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=1;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=791;DocSize.cy=1134;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
@@ -48354,66 +50791,12 @@
 					<element geometry="width=1517;" subject="EAID_9D12E2D2_3867_476f_ABB0_B0C6B362D4C5" style="swimlane;name=aspect views;class=;partition=4;description=OE0={F889D07C-8647-44f2-9C6E-449B3E20BCF2}:OE1={A3FE9B4C-382E-40dc-958E-D9BF99277B20}:OE2={BF31E977-E54E-4706-9C28-3C22B15A8113}:OE3={68D5E5EA-FC7A-4339-81EA-0B04F7E45A43}:OE4={DE4D587C-087C-40fa-B63D-56DEA2854500}:OE5={4C442DBD-D8E5-4d12-A2A1-A7DEA1E5A1B0}:OE6={954E4827-D178-4ebc-9EE2-A6F61F870DB6}:OE7={DF46765F-128C-4cd8-8E8A-A6EC221BAB4F}:OE8={2F3555E6-B9A6-4208-9A19-747532DBC93F}:OE9={03490E2B-19F2-47c3-BE70-0ED3FC280AF1}:OE10={24F90E61-753D-4cf6-8358-F904A686244F}:OE11={03EE3ECF-9EFF-4bf9-A068-667A0CDFBA55}:OE12={B4D0C52E-CCFA-47ce-BC07-A09D9044B69E}:OE13={9AC5B7BC-A46F-4781-BEC6-8F4C43A57375}:OE14={B4C14031-6888-4fe3-A7BA-FCC3A6DFD2D4}:OE15={34185A69-499F-47f1-8C0E-32D2FDF93E0A}:OE16={BC642D11-1E40-47fb-B461-D8E61394AC5F}:OE17={6D0F1BE0-EAAB-45e5-A5E4-27CEF50C4AEE}:OE18={28150437-F427-4fd1-A8F1-E76DB6160274}:OE19={DD64E73D-237E-4f7a-9F41-C132E65F5A8C}:OE20={8A4B2A45-E204-4d18-923B-C062EFED7F92}:OE21={40B3A0DE-5AC9-467f-A6C8-9365E51D44B5}:OE22={5774D0B1-FD6B-4941-9166-7C66D155CDF2}:OE23={EABD8F02-7B1E-48f0-A20E-C4A2122FB1CD}:OE24={A07ACD80-0370-46e1-9700-9AB5F7313EA7}:OE25={FBF5331A-BB9B-4776-8349-0AFFD331805A}:OE26={C8769750-6B24-4bcb-A1CC-44703211E656}:OE27={20C55572-E53F-4e04-A828-75F42C4318A2}:OE28={FBCD0D5C-5298-43ea-8182-0CD2C2717FB5}:OE29={DA25DD8C-13A3-468b-9508-6BD01DF20BAF}:OE30={D4B88387-1DF7-47e8-A57F-3E11F136E2A8}:;"/>
 				</elements>
 			</diagram>
-			<diagram xmi:id="EAID_BE36C015_6DEA_4e64_88D7_DCA46A2951B5">
-				<model package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" localID="315" owner="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="1"/>
-				<properties name="main objects over time" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-03-29 16:15:17" modified="2023-09-11 13:44:34"/>
-				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=850;DocSize.cy=1098;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=1;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=9E332D65;"/>
-				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=0;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;SW1=360;SW2=466;SW3=399;SW4=445;SW5=366;SW6=411;"/>
-				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
-				<extendedProperties/>
-				<elements>
-					<element geometry="Left=1399;Top=352;Right=1584;Bottom=388;" subject="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" seqno="1" style="DUID=36E5059C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1412;Top=193;Right=1555;Bottom=236;" subject="EAID_E7437025_771F_4143_BE33_620A29646687" seqno="2" style="DUID=5B0AAE38;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=408;Top=23;Right=640;Bottom=160;" subject="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" seqno="3" style="DUID=A2F88BA1;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=2054;Top=691;Right=2292;Bottom=802;" subject="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" seqno="4" style="NSL=0;DUID=27A937A9;"/>
-					<element geometry="Left=36;Top=60;Right=217;Bottom=121;" subject="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" seqno="5" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=E84E1D99;"/>
-					<element geometry="Left=1347;Top=76;Right=1620;Bottom=148;" subject="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" seqno="6" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=4581E1F3;"/>
-					<element geometry="Left=907;Top=603;Right=1078;Bottom=662;" subject="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" seqno="7" style="DUID=638C7CF6;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=460;Top=207;Right=747;Bottom=308;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="8" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;AttCustom=0;OpCustom=0;RzO=1;DUID=4B459512;"/>
-					<element geometry="Left=2086;Top=532;Right=2260;Bottom=602;" subject="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" seqno="9" style="NSL=0;DUID=82E4D1AC;"/>
-					<element geometry="Left=850;Top=415;Right=1069;Bottom=500;" subject="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" seqno="10" style="DUID=3EE6AB1B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1721;Top=417;Right=1937;Bottom=496;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="11" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=CD853710;"/>
-					<element geometry="Left=1257;Top=526;Right=1435;Bottom=585;" subject="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B" seqno="12" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=84B0B29A;"/>
-					<element geometry="Left=1242;Top=270;Right=1515;Bottom=342;" subject="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" seqno="13" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=C3404CFA;"/>
-					<element geometry="Left=2105;Top=428;Right=2403;Bottom=487;" subject="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" seqno="14" style="DUID=AF079676;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=408;Top=426;Right=655;Bottom=488;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="15" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=6D3EFD14;"/>
-					<element geometry="Left=494;Top=603;Right=665;Bottom=662;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="16" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=9078C52C;"/>
-					<element geometry="SX=-6;SY=6;EX=-6;EY=-24;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=120:CY=14:OX=19:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D6AB3946_257D_4382_A283_8978FB00BD51" style="Mode=3;EOID=9078C52C;SOID=638C7CF6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=42;SY=1;EX=71;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_36C907D3_6701_4489_9BBA_3C0E1D4E25A8" style="Mode=3;EOID=5B0AAE38;SOID=36E5059C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=118:CY=14:OX=78:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9663763E_2F48_4952_926C_444F368462AA" style="Mode=3;EOID=27A937A9;SOID=82E4D1AC;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=10;SY=0;EX=10;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=63:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_20732599_332F_4f0e_BFE6_593632EDB11F" style="Mode=3;EOID=6D3EFD14;SOID=9078C52C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-100;SY=-6;EX=-112;EY=-18;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BE41CCFB_8495_440b_ADCE_908A980E0342" style="Mode=3;EOID=A2F88BA1;SOID=6D3EFD14;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B8BA8A30_8A22_4475_A8A7_C0037581B6D3" style="Mode=3;EOID=A2F88BA1;SOID=4B459512;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-38;SY=-11;EX=-41;EY=-6;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=148:CY=27:OX=106:OY=-64:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=6D3EFD14;SOID=4B459512;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=63;SY=0;EX=0;EY=-7;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=135:CY=14:OX=-22:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_AFFFCDAE_C459_4420_9649_6F7949D3D9BA" style="Mode=3;EOID=A2F88BA1;SOID=E84E1D99;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=-1;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=155:CY=14:OX=16:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-2:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1611:-215$1611:-555$;" subject="EAID_AF4C01E9_6CF5_410f_83E6_3CAF530D5403" style="Mode=3;EOID=84B0B29A;SOID=5B0AAE38;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=4;SX=0;SY=14;EX=34;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=96:CY=14:OX=18:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547" style="Mode=3;EOID=6D3EFD14;SOID=3EE6AB1B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=102;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=118:CY=14:OX=121:OY=-27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2254:-396$633:-396$;" subject="EAID_6CDB7A9B_1395_4587_9F41_FE45FA8A0605" style="Mode=3;EOID=6D3EFD14;SOID=AF079676;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=1;SY=-1;EX=27;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=92:CY=14:OX=53:OY=18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_688D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5" style="Mode=3;EOID=3EE6AB1B;SOID=638C7CF6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=47;SY=-2;EX=-10;EY=-2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=127:CY=14:OX=76:OY=-11:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_CF215D61_0282_4111_B11C_CBD651205C58" style="Mode=3;EOID=5B0AAE38;SOID=4581E1F3;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=-7;EX=47;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=71:CY=14:OX=41:OY=-32:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=2:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=578:-313$;" subject="EAID_96BA801A_E8C8_4628_94BC_1C90816E0487" style="Mode=3;EOID=6D3EFD14;SOID=C3404CFA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=84;SY=-12;EX=-9;EY=-12;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F241B2E1_47C3_4512_8EBE_A60BD8ED070A" style="Mode=3;EOID=5B0AAE38;SOID=C3404CFA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=1;SY=0;EX=0;EY=-25;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87:CY=14:OX=19:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1347:-482$;" subject="EAID_00497249_92E0_435e_9C45_B9A2F9CBFE43" style="Mode=3;EOID=3EE6AB1B;SOID=84B0B29A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=3;SX=-5;SY=0;EX=-89;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=55:OY=25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1824:-705$442:-705$;" subject="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7" style="Mode=3;EOID=6D3EFD14;SOID=CD853710;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=4;SX=14;SY=10;EX=14;EY=6;$LLB=;LLT=;LMT=;LMB=;LRT=CX=84:CY=14:OX=15:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=3:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_EEE75552_13BB_48c2_A5D7_18A876BF10CF" style="Mode=3;EOID=3EE6AB1B;SOID=CD853710;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=4;SX=0;SY=11;EX=0;EY=-1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=4:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_25DE37BE_E478_4159_8F53_7F49CAD18053" style="Mode=3;EOID=CD853710;SOID=AF079676;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-82;SY=0;EX=0;EY=21;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=105:CY=14:OX=14:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=877:-611$;" subject="EAID_7B5EC3B7_635F_49aa_B61D_661F42799A98" style="Mode=3;EOID=9078C52C;SOID=3EE6AB1B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="width=360;" subject="EAID_F3B6CE1F_FF40_415c_BDAA_C6F1A8CD9A98" style="swimlane;name=planning;class=;partition=1;description=OE0={E6781D26-CD82-4c7b-A53A-502157F5F45A}:;"/>
-					<element geometry="width=466;" subject="EAID_41387F28_11CA_4ad4_AEA5_951E1BAAB8D6" style="swimlane;name=competition;class=;partition=2;description=OE0={2046EF02-69A1-4fa0-BF42-2A6E50CAF4E6}:OE1={31976DD6-F85A-4940-AC62-FA4769B4D88C}:OE2={8F3A6A54-584E-4f65-80B0-0C345D6703F4}:OE3={8D49E47D-4538-44e7-BAA8-68D1BF528FF5}:;"/>
-					<element geometry="width=399;" subject="EAID_DECDBD87_13CB_4dc3_BB0B_86FCF0F23E5F" style="swimlane;name=[result / DAP] submission;class=;partition=3;description=OE0={811D4703-55F7-4d6e-B8D8-207479C15419}:OE1={93ACA540-2668-42d3-BE40-C921C05C776E}:;"/>
-					<element geometry="width=445;" subject="EAID_475A6F35_D920_4167_9AB1_562DA185DF05" style="swimlane;name=[result / DAP] award;class=;partition=4;description=OE0={49935879-5AF2-42ce-A416-3E77939F9B7A}:OE1={58CE0F8A-1B9B-418e-B4D4-D8AE4F96B00B}:OE2={B7007F0A-6B30-4fc5-8AC2-D7789CCFB7F8}:OE3={E7437025-771F-4143-BE33-620A29646687}:OE4={22455012-00DF-4dd8-AD48-245A5F11A4D5}:;"/>
-					<element geometry="width=366;" subject="EAID_088CE548_BD49_46db_A0D6_6A0278EE43B9" style="swimlane;name=[result / DAP] contract;class=;partition=5;description=OE0={76E69B0B-4A6E-4901-8372-75A07B6AB066}:;"/>
-					<element geometry="width=411;" subject="EAID_2B3B1B3B_5A39_4ad2_AABE_E06F6D204AB3" style="swimlane;name=completion;class=;partition=6;description=OE0={48AED17D-D6F4-484c-B2BD-3FD3B49365EE}:OE1={86BEE806-DF2C-4395-95C9-B8B685B22E32}:OE2={F3C0E775-3943-40b1-B59A-3107FF9B30BC}:;"/>
-				</elements>
-			</diagram>
 			<diagram xmi:id="EAID_4BA59459_2BE8_4a2a_9BD6_72CB34B74A87">
 				<model package="EAPK_B734BB7B_9769_4212_99E0_41BB15EB13D0" localID="307" owner="EAPK_B734BB7B_9769_4212_99E0_41BB15EB13D0" tpos="3"/>
 				<properties name="monetary value - competition" type="Logical"/>
-				<project author="andreea" version="1.0" created="2022-03-17 12:20:39" modified="2024-03-12 11:50:28"/>
+				<project author="andreea" version="1.0" created="2022-03-17 12:20:39" modified="2024-07-18 16:05:35"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=5B098779;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=9CAD52CB;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
@@ -48423,31 +50806,31 @@
 					<element geometry="Left=480;Top=889;Right=758;Bottom=995;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="3" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=64C23572;"/>
 					<element geometry="Left=1088;Top=820;Right=1200;Bottom=875;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="4" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=FFC9F4E0;"/>
 					<element geometry="Left=1297;Top=521;Right=1558;Bottom=645;" subject="EAID_44E7963D_28F5_4263_835A_24C87816F40C" seqno="5" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=54913BF5;"/>
-					<element geometry="Left=1058;Top=702;Right=1229;Bottom=772;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="6" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=4CADD5DD;"/>
+					<element geometry="Left=1058;Top=702;Right=1237;Bottom=772;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="6" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=4CADD5DD;"/>
 					<element geometry="Left=1058;Top=34;Right=1229;Bottom=104;" subject="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" seqno="7" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=C44AADC4;"/>
 					<element geometry="Left=1338;Top=401;Right=1516;Bottom=447;" subject="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496" seqno="8" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=2C5289FA;"/>
 					<element geometry="Left=99;Top=341;Right=189;Bottom=401;" subject="EAID_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82" seqno="9" style="DUID=F6AFA4D5;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=50;Top=54;Right=294;Bottom=191;" subject="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" seqno="10" style="DUID=82003F67;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=491;Top=456;Right=806;Bottom=736;" subject="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" seqno="11" style="DUID=2FE36D05;NSL=0;"/>
+					<element geometry="Left=523;Top=456;Right=838;Bottom=736;" subject="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" seqno="11" style="DUID=2FE36D05;NSL=0;"/>
 					<element geometry="Left=180;Top=210;Right=399;Bottom=293;" subject="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" seqno="12" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=7A72742F;"/>
 					<element geometry="Left=508;Top=210;Right=728;Bottom=315;" subject="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" seqno="13" style="DUID=071A8B71;"/>
-					<element geometry="Left=245;Top=401;Right=465;Bottom=486;" subject="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E" seqno="14" style="DUID=C66B8DCA;NSL=0;"/>
+					<element geometry="Left=244;Top=390;Right=512;Bottom=501;" subject="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E" seqno="14" style="DUID=C66B8DCA;NSL=0;"/>
 					<element geometry="Left=921;Top=210;Right=1229;Bottom=456;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="15" style="NSL=0;DUID=01BFF175;"/>
 					<element geometry="EDGE=3;SX=-2;SY=10;EX=66;EY=10;$LLB=;LLT=;LMT=;LMB=;LRT=CX=101:CY=14:OX=59:OY=-23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_77A962A1_6ADC_4a69_9C87_1543CFCC17D9" style="Mode=3;EOID=01BFF175;SOID=C44AADC4;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_47C8CD49_71D8_4ef9_919E_87DD36154F85" style="Mode=3;EOID=071A8B71;SOID=7A72742F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=1;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=57:OY=-21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=145:-251$;" subject="EAID_19D655E2_E290_486c_A489_DFE2AC9F7B9B" style="Mode=3;EOID=F6AFA4D5;SOID=7A72742F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=3;EX=0;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=117:CY=14:OX=66:OY=-31:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7C98771E_06E0_4141_9CF5_2CFE5FEB856B" style="Mode=3;EOID=C66B8DCA;SOID=7A72742F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=3;EX=10;EY=0;SX=10;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=117:CY=14:OX=58:OY=-29:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7C98771E_06E0_4141_9CF5_2CFE5FEB856B" style="Mode=3;EOID=C66B8DCA;SOID=7A72742F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;EX=0;EY=-13;SX=-54;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=105:CY=14:OX=-12:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=235:-750$;" subject="EAID_7B5EC3B7_635F_49aa_B61D_661F42799A98" style="Mode=3;EOID=4CADD5DD;SOID=7A72742F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;SX=-88;SY=0;EX=0;EY=15;$LLB=;LLT=;LMT=;LMB=;LRT=CX=96:CY=14:OX=-22:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=201:-832$;" subject="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547" style="Mode=3;EOID=FFC9F4E0;SOID=7A72742F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=-48;EX=0;EY=23;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=157:CY=27:OX=-3:OY=-13:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=2:OY=5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_C35EEDCE_0633_482d_BA4A_4553057B7C23" style="Mode=3;EOID=01BFF175;SOID=071A8B71;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=39;SY=37;EX=4;EY=-1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=152:CY=27:OX=-2:OY=-11:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=2:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_91D18452_424C_4f36_8E1E_BF993F4D765A" style="Mode=3;EOID=01BFF175;SOID=071A8B71;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=4;SY=-21;EX=4;EY=96;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=122:CY=27:OX=-19:OY=-10:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_72A6C38F_77C6_4480_A13E_A5E9A66D9379" style="Mode=3;EOID=01BFF175;SOID=071A8B71;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=73:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_E9E2A1B8_A705_4847_8FE6_3B40BD241A4B" style="Mode=3;EOID=A663CE36;SOID=01BFF175;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=-28;EX=-104;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=153:CY=14:OX=139:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=971:-617$;" subject="EAID_98D513D4_9622_4217_94D7_26E6E451AF0C" style="Mode=3;EOID=01BFF175;SOID=2FE36D05;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=-61;EX=-17;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=155:CY=14:OX=142:OY=7:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1058:-650$;" subject="EAID_3127E296_9886_44bc_86E7_B4E433F87208" style="Mode=3;EOID=01BFF175;SOID=2FE36D05;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-24;EX=-104;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=153:CY=14:OX=139:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=971:-620$;" subject="EAID_98D513D4_9622_4217_94D7_26E6E451AF0C" style="Mode=3;EOID=01BFF175;SOID=2FE36D05;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-58;EX=-17;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=155:CY=14:OX=142:OY=7:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1058:-654$;" subject="EAID_3127E296_9886_44bc_86E7_B4E433F87208" style="Mode=3;EOID=01BFF175;SOID=2FE36D05;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=0;EY=-32;SX=85;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=117:CY=14:OX=-49:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=1:OY=5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=374:-365$;" subject="EAID_D7964CE9_B09A_4855_B489_34E46CFF8E24" style="Mode=3;EOID=01BFF175;SOID=7A72742F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=6;SY=-8;EX=-89;EY=-61;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=80:CY=14:OX=18:OY=5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_EBC0DED2_0415_4ef8_A495_71F8920238AD" style="Mode=3;EOID=01BFF175;SOID=2C5289FA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=-29;EX=1;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=57:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=619:-151$;" subject="EAID_93203FD8_0FBB_48f1_B54C_5FBB7973D2FA" style="Mode=3;EOID=071A8B71;SOID=82003F67;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-42;EX=3;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=57:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=621:-164$;" subject="EAID_93203FD8_0FBB_48f1_B54C_5FBB7973D2FA" style="Mode=3;EOID=071A8B71;SOID=82003F67;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=64;SY=0;EX=132;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=221:CY=14:OX=209:OY=9:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC" style="Mode=3;EOID=01BFF175;SOID=4CADD5DD;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-13;SY=2;EX=55;EY=2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=101:CY=14:OX=86:OY=12:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_72A7614C_D179_4558_8F62_2FA41A99DF74" style="Mode=3;EOID=01BFF175;SOID=4CADD5DD;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;SX=2;SY=-7;EX=1;EY=-7;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=72:OY=-16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_20732599_332F_4f0e_BFE6_593632EDB11F" style="Mode=3;EOID=FFC9F4E0;SOID=4CADD5DD;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -48459,15 +50842,15 @@
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_71953D29_84AD_4774_9664_258E887283AF" style="Mode=3;EOID=C44AADC4;SOID=64D1F3B0;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=-14;EX=-106;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=221:CY=14:OX=110:OY=-25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=969:-136$;" subject="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8" style="Mode=3;EOID=01BFF175;SOID=82003F67;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=0;SY=48;EX=0;EY=-5;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_AB768772_FAC4_4353_A1C6_F384FEC304AE" style="Mode=3;EOID=C44AADC4;SOID=82003F67;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=2;SX=0;SY=9;EX=0;EY=-101;$LLB=;LLT=;LMT=;LMB=;LRT=CX=137:CY=27:OX=-10:OY=-10:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-18:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_55AE269D_7874_4515_A52E_6EBA9F23871A" style="Mode=3;EOID=01BFF175;SOID=C66B8DCA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;SX=0;SY=9;EX=0;EY=-101;$LLB=;LLT=;LMT=;LMB=;LRT=CX=160:CY=14:OX=-16:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-18:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_55AE269D_7874_4515_A52E_6EBA9F23871A" style="Mode=3;EOID=01BFF175;SOID=C66B8DCA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_147ECFF1_21DD_4c94_B672_811B0C917F55">
 				<model package="EAPK_B734BB7B_9769_4212_99E0_41BB15EB13D0" localID="308" owner="EAPK_B734BB7B_9769_4212_99E0_41BB15EB13D0" tpos="4"/>
 				<properties name="monetary value - award" type="Logical"/>
-				<project author="andreea" version="1.0" created="2022-03-17 18:18:50" modified="2024-03-12 11:50:25"/>
+				<project author="andreea" version="1.0" created="2022-03-17 18:18:50" modified="2024-07-16 14:25:49"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=43DFCF9E;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=46732A97;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
@@ -48477,22 +50860,23 @@
 					<element geometry="Left=368;Top=456;Right=471;Bottom=526;" subject="EAID_E7437025_771F_4143_BE33_620A29646687" seqno="3" style="DUID=B15588FF;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=353;Top=606;Right=487;Bottom=676;" subject="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" seqno="4" style="DUID=512EC1B6;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=28;Top=606;Right=301;Bottom=676;" subject="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" seqno="5" style="DUID=974A00B8;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=250;Top=252;Right=369;Bottom=295;" subject="EAID_C451EC7C_9778_40f3_B90C_6DEFC3C6D8BB" seqno="6" style="DUID=D009B4B3;"/>
-					<element geometry="Left=130;Top=194;Right=288;Bottom=240;" subject="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" seqno="7" style="NSL=0;DUID=34F9229E;"/>
+					<element geometry="Left=471;Top=362;Right=590;Bottom=405;" subject="EAID_C451EC7C_9778_40f3_B90C_6DEFC3C6D8BB" seqno="6" style="DUID=D009B4B3;"/>
+					<element geometry="Left=135;Top=189;Right=293;Bottom=244;" subject="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" seqno="7" style="NSL=0;DUID=34F9229E;"/>
 					<element geometry="Left=1339;Top=616;Right=1563;Bottom=688;" subject="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" seqno="8" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=CDF60883;"/>
 					<element geometry="Left=1019;Top=603;Right=1238;Bottom=701;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="9" style="DUID=7F9AE94F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=675;Top=431;Right=948;Bottom=551;" subject="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" seqno="10" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=40682DAF;"/>
 					<element geometry="Left=739;Top=628;Right=884;Bottom=677;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="11" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=42AD69D9;"/>
-					<element geometry="Left=124;Top=330;Right=295;Bottom=392;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="12" style="DUID=6927BFA6;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=587;Top=49;Right=997;Bottom=270;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="13" style="NSL=0;DUID=9CF1A160;"/>
+					<element geometry="Left=124;Top=330;Right=303;Bottom=405;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="12" style="DUID=6927BFA6;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=587;Top=49;Right=997;Bottom=290;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="13" style="NSL=0;DUID=9CF1A160;"/>
 					<element geometry="Left=87;Top=54;Right=313;Bottom=181;" subject="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" seqno="14" style="NSL=0;DUID=E6CAA722;"/>
 					<element geometry="SX=-3;SY=0;EX=-3;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F241B2E1_47C3_4512_8EBE_A60BD8ED070A" style="Mode=3;EOID=B15588FF;SOID=40682DAF;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=52;SY=1;EX=52;EY=1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_7B5EC3B7_635F_49aa_B61D_661F42799A98" style="Mode=3;EOID=6927BFA6;SOID=CDF60883;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547" style="Mode=3;EOID=42AD69D9;SOID=CDF60883;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="EDGE=1;SX=21;SY=0;EX=0;EY=-103;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87:CY=14:OX=-28:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=434:-262$;" subject="EAID_D257E7B8_BA32_4888_BB1A_167306D6B16C" style="Mode=3;EOID=9CF1A160;SOID=B15588FF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=-36;SY=0;EX=0;EY=-77;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=-42:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=377:-236$;" subject="EAID_547A511C_F377_4405_82EA_14ABA20458B6" style="Mode=3;EOID=9CF1A160;SOID=B15588FF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=18;SY=0;EX=0;EY=-112;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87:CY=14:OX=-28:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=437:-281$;" subject="EAID_D257E7B8_BA32_4888_BB1A_167306D6B16C" style="Mode=3;EOID=9CF1A160;SOID=B15588FF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-39;SY=0;EX=0;EY=-84;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=-42:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=380:-253$;" subject="EAID_547A511C_F377_4405_82EA_14ABA20458B6" style="Mode=3;EOID=9CF1A160;SOID=B15588FF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=1;SY=-14;EX=2;EY=-14;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=55:OY=-15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4B36ABDE_C6FC_4a8d_93CA_CC7ACC63568D" style="Mode=3;EOID=6927BFA6;SOID=34F9229E;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-4;SY=12;EX=-205;EY=-72;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=217:CY=14:OX=-18:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_01B7EE24_F987_4c92_B06C_0EA23C9FD1C7" style="Mode=3;EOID=9CF1A160;SOID=34F9229E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-5;SY=23;EX=-205;EY=-59;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=217:CY=14:OX=-18:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_01B7EE24_F987_4c92_B06C_0EA23C9FD1C7" style="Mode=3;EOID=9CF1A160;SOID=34F9229E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-1;SY=-15;EX=-1;EY=-21;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=227:CY=14:OX=-20:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F890093A_076E_4f9b_9823_548DE5751CA7" style="Mode=3;EOID=9CF1A160;SOID=34F9229E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-2;SY=11;EX=-2;EY=11;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=203:CY=14:OX=-30:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_653ADA02_9DFC_48b4_A935_786F35AF2AFB" style="Mode=3;EOID=9CF1A160;SOID=E6CAA722;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=8;SY=63;EX=-1;EY=46;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=117:CY=14:OX=-63:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_C8D53635_0827_4589_A374_A1CFC018D076" style="Mode=3;EOID=9CF1A160;SOID=E6CAA722;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=9;SY=40;EX=-2;EY=19;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=229:CY=14:OX=-27:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-1:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_079E96B7_4324_4eba_B071_A8B833BDA1EF" style="Mode=3;EOID=9CF1A160;SOID=E6CAA722;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -48505,15 +50889,15 @@
 					<element geometry="SX=-88;SY=-18;EX=-88;EY=-18;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=203:CY=14:OX=101:OY=43:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_8E7619CE_95A4_4f77_A6DC_62DFC84C122D" style="Mode=3;EOID=9CF1A160;SOID=40682DAF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=31;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=120:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1481:-33$31:-33$31:-361$;" subject="EAID_D6AB3946_257D_4382_A283_8978FB00BD51" style="Mode=3;EOID=6927BFA6;SOID=D3750C89;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=92:CY=14:OX=61:OY=-26:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_688D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5" style="Mode=3;EOID=CDF60883;SOID=D3750C89;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-5;SY=0;EX=0;EY=72;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=81:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1445:-87$;" subject="EAID_7A92C123_93F7_4d51_A677_A1E36D3B53C0" style="Mode=3;EOID=9CF1A160;SOID=D3750C89;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-5;SY=0;EX=0;EY=76;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=81:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1445:-93$;" subject="EAID_7A92C123_93F7_4d51_A677_A1E36D3B53C0" style="Mode=3;EOID=9CF1A160;SOID=D3750C89;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=-13;EX=-146;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=646:-366$;" subject="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC" style="Mode=3;EOID=9CF1A160;SOID=6927BFA6;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="SX=0;SY=-1;EX=0;EY=1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=600:-354$;" subject="EAID_72A7614C_D179_4558_8F62_2FA41A99DF74" style="Mode=3;EOID=9CF1A160;SOID=6927BFA6;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_20732599_332F_4f0e_BFE6_593632EDB11F" style="Mode=3;EOID=42AD69D9;SOID=6927BFA6;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SX=-5;SY=0;EX=0;EY=27;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=94:CY=14:OX=17:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1123:-132$;" subject="EAID_3220FB6D_76C7_486a_9953_EA1E6D255A89" style="Mode=3;EOID=9CF1A160;SOID=7F9AE94F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-5;SY=0;EX=0;EY=34;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=94:CY=14:OX=17:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1123:-135$;" subject="EAID_3220FB6D_76C7_486a_9953_EA1E6D255A89" style="Mode=3;EOID=9CF1A160;SOID=7F9AE94F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=13:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7" style="Mode=3;EOID=42AD69D9;SOID=7F9AE94F;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=2;EX=0;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=84:CY=14:OX=-13:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_EEE75552_13BB_48c2_A5D7_18A876BF10CF" style="Mode=3;EOID=CDF60883;SOID=7F9AE94F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=0;SY=0;EX=0;EY=-6;$LLB=;LLT=;LMT=;LMB=;LRT=CX=127:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=164:-497$;" subject="EAID_CF215D61_0282_4111_B11C_CBD651205C58" style="Mode=3;EOID=B15588FF;SOID=974A00B8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EX=0;EY=0;SX=0;SY=-52;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=73:CY=14:OX=48:OY=-24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1062:-211$;" subject="EAID_E9E2A1B8_A705_4847_8FE6_3B40BD241A4B" style="Mode=3;EOID=D055603A;SOID=9CF1A160;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=0;EY=0;SX=0;SY=-44;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=73:CY=14:OX=48:OY=-24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1062:-213$;" subject="EAID_E9E2A1B8_A705_4847_8FE6_3B40BD241A4B" style="Mode=3;EOID=D055603A;SOID=9CF1A160;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_A2669D8B_ED55_4aef_B387_F43B34E94682">
@@ -48602,9 +50986,9 @@
 			<diagram xmi:id="EAID_4FF9AAC8_5E59_49bd_A037_CBB07F6B2BA8">
 				<model package="EAPK_4200ABB9_EB75_4f04_8F9A_4D873BD27C72" localID="339" owner="EAPK_4200ABB9_EB75_4f04_8F9A_4D873BD27C72" tpos="2"/>
 				<properties name="competition" type="Logical"/>
-				<project author="andreea" version="1.0" created="2022-05-16 11:37:28" modified="2024-03-12 11:52:10"/>
+				<project author="andreea" version="1.0" created="2022-05-16 11:37:28" modified="2024-07-23 10:36:03"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=D6729659;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=5CCD1D29;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
@@ -48638,29 +51022,30 @@
 					<element geometry="Left=2093;Top=1592;Right=2295;Bottom=1745;" subject="EAID_29678A10_6473_461a_BE84_76269B5BBD68" seqno="27" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=0F0DA707;"/>
 					<element geometry="Left=2467;Top=1152;Right=2638;Bottom=1222;" subject="EAID_2424C22E_B54F_4b6f_BA47_E78DE21C76DE" seqno="28" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=E785484B;"/>
 					<element geometry="Left=1119;Top=1094;Right=1240;Bottom=1206;" subject="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" seqno="29" style="DUID=2675274A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1980;Top=783;Right=2152;Bottom=882;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="30" style="DUID=5E982AA3;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1980;Top=783;Right=2159;Bottom=882;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="30" style="DUID=5E982AA3;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=2293;Top=960;Right=2704;Bottom=1061;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="31" style="NSL=0;DUID=29138D4B;"/>
 					<element geometry="Left=993;Top=639;Right=1154;Bottom=739;" subject="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" seqno="32" style="DUID=188945D1;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1341;Top=1251;Right=1532;Bottom=1321;" subject="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" seqno="33" style="DUID=A4B4E859;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1781;Top=1587;Right=1990;Bottom=1750;" subject="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" seqno="34" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=232C7D31;"/>
 					<element geometry="Left=2534;Top=1609;Right=2787;Bottom=1733;" subject="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" seqno="35" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=AC2143B9;"/>
 					<element geometry="Left=2312;Top=431;Right=2402;Bottom=491;" subject="EAID_02014F61_A766_467e_BD3D_7F41689C651B" seqno="36" style="DUID=891D9DB1;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="SX=-63;SY=0;EX=-60;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=108:CY=14:OX=55:OY=35:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1202:-255$2850:-255$2850:-1958$2134:-1958$;" subject="EAID_A8CBD7C1_E82A_4979_98A5_58BD6A43131C" style="Mode=3;EOID=0F0DA707;SOID=EA7F007D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=-16;EY=0;SX=0;SY=-68;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=165:CY=14:OX=87:OY=-28:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2177:-461$;" subject="EAID_A02EFC84_74F8_415f_B4C7_BC3E17610EF7" style="Mode=3;EOID=4B7F9A88;SOID=B424C8ED;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;SX=0;SY=26;EX=0;EY=8;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87:CY=14:OX=-9:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-12:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4714A192_0DFA_49f4_AB11_165E12CB38A6" style="Mode=3;EOID=1CEB784C;SOID=0749C1EC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=14;SY=8;EX=18;EY=10;$LLB=;LLT=;LMT=;LMB=;LRT=CX=160:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1C8C734E_FD33_4153_9939_FA613CEB5D22" style="Mode=3;EOID=2675274A;SOID=B17A3BF6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=65;EX=63;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1272:-1111$;" subject="EAID_B8BA8A30_8A22_4475_A8A7_C0037581B6D3" style="Mode=3;EOID=B575EB03;SOID=B17A3BF6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-122;SY=0;EX=-4;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=189:CY=14:OX=206:OY=-27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1598:-1440$1021:-1440$;" subject="EAID_28460B26_E1D3_4c16_AB2B_CBE8A5D24AC5" style="Mode=3;EOID=0749C1EC;SOID=B17A3BF6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;EX=0;EY=10;SX=-82;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=80:CY=14:OX=5:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=1:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1638:-1525$;" subject="EAID_9B2D6DCC_5092_48cf_878A_8035A42A43F9" style="Mode=3;EOID=1CEB784C;SOID=B17A3BF6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=1;SY=1;EX=1;EY=1;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_84F5E9DD_96DE_4ca7_8CA6_9C68826B377B" style="Mode=3;EOID=CF6DA6FE;SOID=5F256B8F;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EX=0;EY=-57;SX=1;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=143:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=1369:-1927$;" subject="EAID_46812517_A9DA_432d_A7B8_F5FEC69BBDA5" style="Mode=3;EOID=33490495;SOID=1CEB784C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=0;EY=-57;SX=1;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=143:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=1369:-1927$;" subject="EAID_46812517_A9DA_432d_A7B8_F5FEC69BBDA5" style="Mode=3;EOID=33490495;SOID=1CEB784C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=0;SY=-15;EX=0;EY=-6;$LLB=;LLT=;LMT=;LMB=;LRT=CX=143:CY=14:OX=23:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_E076346D_AFB2_421a_BBA1_4FFA393BE7FA" style="Mode=3;EOID=0749C1EC;SOID=1CEB784C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;EX=0;EY=-16;SX=19;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=768:-705$;" subject="EAID_8DB5DB8D_4E96_4679_A104_F62859765981" style="Mode=3;EOID=188945D1;SOID=03D5539A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=0;SY=-85;EX=-8;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1171:-952$;" subject="EAID_6248DC7A_ACC5_4553_92ED_5A488B7D6FC6" style="Mode=3;EOID=2675274A;SOID=03D5539A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=0;SY=0;EX=-31;EY=-21;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_1E3BD6A4_59D5_435a_9472_AFC131D1E7F2" style="Mode=3;EOID=4B477F82;SOID=C510196B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=113:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_BA97DF04_90AD_4153_8BC2_8F80AD12DA02" style="Mode=3;EOID=54F3A151;SOID=B424C8ED;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=3;SX=-131;SY=0;EX=0;EY=5;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1743:-615$;" subject="EAID_D62CD782_93C6_480f_BE3B_872E1A0882C0" style="Mode=3;EOID=4B477F82;SOID=B424C8ED;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=2;SX=0;SY=26;EX=0;EY=8;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87:CY=14:OX=-9:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-12:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4714A192_0DFA_49f4_AB11_165E12CB38A6" style="Mode=3;EOID=1CEB784C;SOID=0749C1EC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EX=-16;EY=0;SX=0;SY=-68;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=165:CY=14:OX=87:OY=-28:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2177:-461$;" subject="EAID_A02EFC84_74F8_415f_B4C7_BC3E17610EF7" style="Mode=3;EOID=4B7F9A88;SOID=B424C8ED;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=1;SY=0;EX=1;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=60:OY=14:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=C5C7EE57;SOID=B17A3BF6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=98;EX=4;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=133:CY=14:OX=74:OY=-21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F593B546_502A_413a_8694_914903478877" style="Mode=3;EOID=C510196B;SOID=B424C8ED;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=32;SY=0;EX=0;EY=-53;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=-23:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1752:-703$;" subject="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4" style="Mode=3;EOID=6B779533;SOID=C5C7EE57;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-63;SY=0;EX=-60;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=108:CY=14:OX=55:OY=35:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1202:-255$2850:-255$2850:-1958$2134:-1958$;" subject="EAID_A8CBD7C1_E82A_4979_98A5_58BD6A43131C" style="Mode=3;EOID=0F0DA707;SOID=EA7F007D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=0;EY=38;SX=0;SY=9;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=549:-457$549:-1112$;" subject="EAID_15042E3E_B61C_4d75_BF56_83000481AB12" style="Mode=3;EOID=2675274A;SOID=EA7F007D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;SX=-30;SY=0;EX=0;EY=40;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1228:-649$;" subject="EAID_85E14E41_3BA7_4783_A633_615CD23835C1" style="Mode=3;EOID=188945D1;SOID=EA7F007D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;SX=105;SY=0;EX=0;EY=-10;$LLB=;LLT=;LMT=;LMB=;LRT=CX=221:CY=14:OX=122:OY=-81:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1314:-1020$;" subject="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8" style="Mode=3;EOID=29138D4B;SOID=B575EB03;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -48673,7 +51058,7 @@
 					<element geometry="EX=-10;EY=0;SX=0;SY=-18;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=76:CY=14:OX=42:OY=-37:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2390:-1204$;" subject="EAID_8A0DF9CA_F904_4d6e_850E_F68332FB1B0B" style="Mode=3;EOID=FD35F253;SOID=4B7F9A88;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-6;SY=-3;EX=-6;EY=-3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=56:CY=14:OX=44:OY=-31:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_C70B3C1A_A0BD_494b_BEE6_89F708783872" style="Mode=3;EOID=0F0DA707;SOID=4B7F9A88;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=64:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F48E8C16_CD7F_4664_8346_839CB32AF64E" style="Mode=3;EOID=E785484B;SOID=4B7F9A88;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=98;EX=4;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=133:CY=14:OX=74:OY=-21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F593B546_502A_413a_8694_914903478877" style="Mode=3;EOID=C510196B;SOID=B424C8ED;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=3;SX=-131;SY=0;EX=0;EY=5;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1743:-615$;" subject="EAID_D62CD782_93C6_480f_BE3B_872E1A0882C0" style="Mode=3;EOID=4B477F82;SOID=B424C8ED;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=0;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=110:CY=14:OX=6:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_277C636A_D943_484f_A80D_69ACBFA6147C" style="Mode=3;EOID=A8BD16CA;SOID=6B779533;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=2;SY=0;EX=0;EY=24;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=-12:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-7:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1887:-1412$;" subject="EAID_7E6F9511_A2DD_4f1c_B8AA_9EA312803C2B" style="Mode=3;EOID=3AF03FEB;SOID=232C7D31;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=-25;SY=-9;EX=-33;EY=-9;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=0:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_28236B4B_9308_46ad_9581_3601B37AA6A4" style="Mode=3;EOID=0F0DA707;SOID=232C7D31;Color=-1;LWidth=0;Hidden=0;"/>
@@ -48689,29 +51074,29 @@
 					<element geometry="SX=-47;SY=0;EX=0;EY=-18;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=3:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=2:OY=9:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2147:-1454$;" subject="EAID_D0F25E0B_E148_41e7_8C52_BAE14F5149F6" style="Mode=3;EOID=3AF03FEB;SOID=0F0DA707;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=16;SY=0;EX=0;EY=-12;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=117:CY=14:OX=18:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1736:-1547$;" subject="EAID_D01E7677_5AC2_42b1_AA17_2A8EC003CCFE" style="Mode=3;EOID=1CEB784C;SOID=B17A3BF6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=78:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D65C20FC_D382_4766_9563_4C96020D607C" style="Mode=3;EOID=7E836D99;SOID=6B779533;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=1;SY=0;EX=1;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=60:OY=14:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=C5C7EE57;SOID=B17A3BF6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=13:OY=-5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_91E24989_0AB1_44de_AF48_1EE54018D9E5" style="Mode=3;EOID=891D9DB1;SOID=7E836D99;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=6;SY=0;EX=0;EY=-54;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=143:CY=14:OX=-26:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1442:-886$;" subject="EAID_34156914_725C_4a26_B380_6FDE59360DAF" style="Mode=3;EOID=C5C7EE57;SOID=A4B4E859;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=60;SY=0;EX=0;EY=-5;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=-3:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-1:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1496:-1181$;" subject="EAID_5A6933BC_AE5B_4536_B67E_B79F177247C7" style="Mode=3;EOID=B17A3BF6;SOID=A4B4E859;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-42;SY=0;EX=0;EY=-35;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1394:-1185$;" subject="EAID_A1817A7D_9F04_479b_8F89_5D58DD92BF3C" style="Mode=3;EOID=2675274A;SOID=A4B4E859;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=1;EX=-48;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=61:OY=33:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2018:-1339$;" subject="EAID_44CFA3B0_EE66_4ace_9069_38D7A3B7A01C" style="Mode=3;EOID=5E982AA3;SOID=A45BADAF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-6;SY=0;EX=0;EY=-19;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1005:-1169$;" subject="EAID_4C36EE86_0569_4453_9E13_5EC63FC08031" style="Mode=3;EOID=2675274A;SOID=A45BADAF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=0;SY=34;EX=-6;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=41:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=833:-1306$;" subject="EAID_1605A6CC_6F4E_42f1_80CD_0C45E80E9AEE" style="Mode=3;EOID=04DCE457;SOID=A45BADAF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=14;SY=0;EX=0;EY=-39;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=132:CY=14:OX=36:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2083:-728$;" subject="EAID_505234FB_4CE0_475f_A94B_6552B0F5A59A" style="Mode=3;EOID=188945D1;SOID=5E982AA3;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=12;SY=13;EX=12;EY=-28;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_20732599_332F_4f0e_BFE6_593632EDB11F" style="Mode=3;EOID=C5C7EE57;SOID=5E982AA3;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=49;EY=0;SX=0;SY=-6;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=101:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2547:-838$;" subject="EAID_72A7614C_D179_4558_8F62_2FA41A99DF74" style="Mode=3;EOID=29138D4B;SOID=5E982AA3;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=0;SY=-34;EX=-84;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=221:CY=14:OX=79:OY=-49:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2414:-866$;" subject="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC" style="Mode=3;EOID=29138D4B;SOID=5E982AA3;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=25;EX=-3;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=82:OY=24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2607:-807$;" subject="EAID_FC7073E1_3362_472f_B087_27A619B6C819" style="Mode=3;EOID=6B779533;SOID=5E982AA3;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-44;SY=0;EX=0;EY=-10;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=132:CY=14:OX=11:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1676:-699$;" subject="EAID_7DEB98FB_35C4_4015_80BE_9C778A0BA2A5" style="Mode=3;EOID=188945D1;SOID=C5C7EE57;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BE41CCFB_8495_440b_ADCE_908A980E0342" style="Mode=3;EOID=B575EB03;SOID=C5C7EE57;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=13:OY=-5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_91E24989_0AB1_44de_AF48_1EE54018D9E5" style="Mode=3;EOID=891D9DB1;SOID=7E836D99;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=52;SY=0;EX=0;EY=-4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=76:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2246:-1474$;" subject="EAID_626183B8_93AC_4300_B227_85988E5F2016" style="Mode=3;EOID=FD35F253;SOID=0F0DA707;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_47122B38_736F_476f_9668_E7EFAD723B51">
 				<model package="EAPK_4200ABB9_EB75_4f04_8F9A_4D873BD27C72" localID="341" owner="EAPK_4200ABB9_EB75_4f04_8F9A_4D873BD27C72" tpos="3"/>
 				<properties name="submission" type="Logical"/>
-				<project author="andreea" version="1.0" created="2022-05-16 13:24:02" modified="2024-03-12 11:52:31"/>
+				<project author="andreea" version="1.0" created="2022-05-16 13:24:02" modified="2024-07-23 10:36:23"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=3599A7BB;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=90499566;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
@@ -48722,16 +51107,17 @@
 					<element geometry="Left=1315;Top=607;Right=1609;Bottom=726;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="4" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=23BB9043;"/>
 					<element geometry="Left=915;Top=363;Right=1134;Bottom=475;" subject="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" seqno="5" style="DUID=0C3EFD81;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1041;Top=227;Right=1137;Bottom=297;" subject="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" seqno="6" style="DUID=8B6C1D12;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1244;Top=376;Right=1494;Bottom=461;" subject="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E" seqno="7" style="NSL=0;DUID=2C0D97E7;"/>
+					<element geometry="Left=1244;Top=376;Right=1512;Bottom=487;" subject="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E" seqno="7" style="NSL=0;DUID=2C0D97E7;"/>
 					<element geometry="Left=926;Top=636;Right=1122;Bottom=696;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="8" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=1047C5FC;"/>
 					<element geometry="Left=157;Top=841;Right=363;Bottom=925;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="9" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=08A7AD2B;"/>
 					<element geometry="Left=466;Top=475;Right=733;Bottom=566;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="10" style="NSL=0;DUID=6D996FC6;"/>
 					<element geometry="SX=42;SY=0;EX=0;EY=22;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=221:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=302:-498$;" subject="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC" style="Mode=3;EOID=6D996FC6;SOID=08A7AD2B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-69;SY=0;EX=0;EY=-2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=78:CY=14:OX=42:OY=30:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_E026EBD4_4329_4e57_9F78_AF7887C44E46" style="Mode=3;EOID=147CB9E8;SOID=0C3EFD81;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;EX=-6;EY=-10;SX=-6;SY=15;$LLB=;LLT=;LMT=;LMB=;LRT=CX=94:CY=27:OX=15:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7C98771E_06E0_4141_9CF5_2CFE5FEB856B" style="Mode=3;EOID=2C0D97E7;SOID=0C3EFD81;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=58;SY=0;EX=0;EY=-11;$LLB=;LLT=;LMT=;LMB=;LRT=CX=117:CY=14:OX=83:OY=24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_24545C91_D269_4cfe_A646_9A2FDEE01B0F" style="Mode=3;EOID=8B6C1D12;SOID=0C3EFD81;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=86;SY=7;EX=28;EY=-4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=117:CY=14:OX=83:OY=24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_24545C91_D269_4cfe_A646_9A2FDEE01B0F" style="Mode=3;EOID=8B6C1D12;SOID=0C3EFD81;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=0;SY=52;EX=-83;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=105:CY=14:OX=66:OY=-60:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=177:-367$;" subject="EAID_7B5EC3B7_635F_49aa_B61D_661F42799A98" style="Mode=3;EOID=08A7AD2B;SOID=0C3EFD81;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;SX=60;SY=0;EX=-14;EY=-1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=96:CY=14:OX=52:OY=-23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547" style="Mode=3;EOID=1047C5FC;SOID=0C3EFD81;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=113:CY=14:OX=33:OY=39:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_ED09AA70_1480_4e41_8F94_BA9A89E0B960" style="Mode=3;EOID=8B6C1D12;SOID=0C3EFD81;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=0;EY=19;SX=-73;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=117:CY=14:OX=13:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=1:OY=5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=951:-501$;" subject="EAID_D7964CE9_B09A_4855_B489_34E46CFF8E24" style="Mode=3;EOID=6D996FC6;SOID=0C3EFD81;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=-1;SY=-5;EX=-1;EY=-5;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=20:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=1047C5FC;SOID=23BB9043;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-128;SY=-4;EX=-67;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=155:CY=14:OX=66:OY=19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3127E296_9886_44bc_86E7_B4E433F87208" style="Mode=3;EOID=6D996FC6;SOID=78916526;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -48747,9 +51133,9 @@
 			<diagram xmi:id="EAID_0717D631_676D_41e7_B708_35BFDDC475A8">
 				<model package="EAPK_4200ABB9_EB75_4f04_8F9A_4D873BD27C72" localID="342" owner="EAPK_4200ABB9_EB75_4f04_8F9A_4D873BD27C72" tpos="4"/>
 				<properties name="award" type="Logical"/>
-				<project author="andreea" version="1.0" created="2022-05-16 14:40:16" modified="2024-03-12 11:54:29"/>
+				<project author="andreea" version="1.0" created="2022-05-16 14:40:16" modified="2024-07-23 10:37:23"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=3D9D3618;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=66C6DB7E;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
@@ -48758,16 +51144,17 @@
 					<element geometry="Left=419;Top=367;Right=544;Bottom=473;" subject="EAID_E7437025_771F_4143_BE33_620A29646687" seqno="2" style="DUID=9FE1D609;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=180;Top=174;Right=340;Bottom=219;" subject="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" seqno="3" style="NSL=0;DUID=6D633F68;"/>
 					<element geometry="Left=345;Top=527;Right=618;Bottom=599;" subject="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" seqno="4" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=EDFF9BD8;"/>
-					<element geometry="Left=1129;Top=624;Right=1353;Bottom=711;" subject="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" seqno="5" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=DC1F1B20;"/>
+					<element geometry="Left=1129;Top=625;Right=1353;Bottom=712;" subject="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" seqno="5" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=DC1F1B20;"/>
 					<element geometry="Left=1152;Top=415;Right=1330;Bottom=474;" subject="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B" seqno="6" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=57CD5DA0;"/>
 					<element geometry="Left=1176;Top=295;Right=1305;Bottom=343;" subject="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3" seqno="7" style="DUID=D726B8C9;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=740;Top=363;Right=1037;Bottom=425;" subject="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" seqno="8" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=04A55CEB;"/>
 					<element geometry="Left=793;Top=635;Right=940;Bottom=701;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="9" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=01E3736F;"/>
-					<element geometry="Left=197;Top=395;Right=368;Bottom=457;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="10" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=D8E84BCE;"/>
-					<element geometry="Left=653;Top=22;Right=1065;Bottom=275;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="11" style="NSL=0;DUID=2D796B8E;"/>
+					<element geometry="Left=197;Top=395;Right=376;Bottom=470;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="10" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=D8E84BCE;"/>
+					<element geometry="Left=653;Top=22;Right=1065;Bottom=295;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="11" style="NSL=0;DUID=2D796B8E;"/>
 					<element geometry="Left=147;Top=22;Right=373;Bottom=165;" subject="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" seqno="12" style="NSL=0;DUID=054B25E1;"/>
 					<element geometry="SX=52;SY=1;EX=52;EY=1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_7B5EC3B7_635F_49aa_B61D_661F42799A98" style="Mode=3;EOID=D8E84BCE;SOID=DC1F1B20;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="SX=15;SY=13;EX=-3;EY=-53;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=217:CY=14:OX=-15:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_01B7EE24_F987_4c92_B06C_0EA23C9FD1C7" style="Mode=3;EOID=2D796B8E;SOID=6D633F68;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=3;SY=-19;EX=4;EY=-31;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=227:CY=14:OX=-12:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F890093A_076E_4f9b_9823_548DE5751CA7" style="Mode=3;EOID=2D796B8E;SOID=6D633F68;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=9;EY=16;SX=9;SY=16;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=203:CY=14:OX=-25:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_653ADA02_9DFC_48b4_A935_786F35AF2AFB" style="Mode=3;EOID=2D796B8E;SOID=054B25E1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=5;SY=63;EX=5;EY=87;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=117:CY=14:OX=-24:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_C8D53635_0827_4589_A374_A1CFC018D076" style="Mode=3;EOID=2D796B8E;SOID=054B25E1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=10;SY=-18;EX=10;EY=37;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=229:CY=14:OX=-18:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=1:OY=5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_079E96B7_4324_4eba_B071_A8B833BDA1EF" style="Mode=3;EOID=2D796B8E;SOID=054B25E1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -48775,21 +51162,21 @@
 					<element geometry="EDGE=2;SX=23;SY=-49;EX=16;EY=-14;$LLB=;LLT=;LMT=;LMB=;LRT=CX=206:CY=14:OX=-23:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_510F8DDB_DB12_48df_92AE_A27F7DFCCAC3" style="Mode=3;EOID=2D796B8E;SOID=054B25E1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-6;SY=-1;EX=-6;EY=1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=71:CY=14:OX=43:OY=-14:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=2:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_96BA801A_E8C8_4628_94BC_1C90816E0487" style="Mode=3;EOID=01E3736F;SOID=04A55CEB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=2;EY=17;SX=2;SY=17;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F241B2E1_47C3_4512_8EBE_A60BD8ED070A" style="Mode=3;EOID=9FE1D609;SOID=04A55CEB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-71;SY=-2;EX=-83;EY=-1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=193:CY=14:OX=103:OY=36:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1E87247C_598C_4f96_8D8A_71BD69D25161" style="Mode=3;EOID=2D796B8E;SOID=04A55CEB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-71;SY=-2;EX=-83;EY=-1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=193:CY=14:OX=135:OY=23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1E87247C_598C_4f96_8D8A_71BD69D25161" style="Mode=3;EOID=2D796B8E;SOID=04A55CEB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=16;SY=4;EX=-30;EY=25;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=55:OY=-15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4B36ABDE_C6FC_4a8d_93CA_CC7ACC63568D" style="Mode=3;EOID=D8E84BCE;SOID=6D633F68;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=-67;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1247:-198$;" subject="EAID_D7964CE9_B09A_4855_B489_34E46CFF8E24" style="Mode=3;EOID=2D796B8E;SOID=DC1F1B20;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="SX=-7;SY=0;EX=0;EY=-36;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=726:-456$;" subject="EAID_36C907D3_6701_4489_9BBA_3C0E1D4E25A8" style="Mode=3;EOID=9FE1D609;SOID=2BFD77E8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=0;SY=43;EX=0;EY=-13;$LLB=;LLT=;LMT=;LMB=;LRT=CX=96:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547" style="Mode=3;EOID=01E3736F;SOID=DC1F1B20;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=79;SY=0;EDGE=1;EX=0;EY=-90;$LLB=;LLT=;LMT=;LMB=;LRT=CX=221:CY=14:OX=-29:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=361:-238$;" subject="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC" style="Mode=3;EOID=2D796B8E;SOID=D8E84BCE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=65;SY=0;EDGE=1;EX=0;EY=-63;$LLB=;LLT=;LMT=;LMB=;LRT=CX=101:CY=14:OX=-39:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=347:-211$;" subject="EAID_72A7614C_D179_4558_8F62_2FA41A99DF74" style="Mode=3;EOID=2D796B8E;SOID=D8E84BCE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=75;SY=0;EDGE=1;EX=0;EY=-103;$LLB=;LLT=;LMT=;LMB=;LRT=CX=221:CY=14:OX=-29:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=361:-261$;" subject="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC" style="Mode=3;EOID=2D796B8E;SOID=D8E84BCE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=63;SY=0;EDGE=1;EX=0;EY=-78;$LLB=;LLT=;LMT=;LMB=;LRT=CX=101:CY=14:OX=-39:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=349:-236$;" subject="EAID_72A7614C_D179_4558_8F62_2FA41A99DF74" style="Mode=3;EOID=2D796B8E;SOID=D8E84BCE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;SX=-19;SY=0;EX=0;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=263:-668$;" subject="EAID_20732599_332F_4f0e_BFE6_593632EDB11F" style="Mode=3;EOID=01E3736F;SOID=D8E84BCE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=26;SY=-3;EX=-5;EY=-2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=124:CY=14:OX=87:OY=27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_24ED3FAD_FABC_4b24_A3E6_B0420EB7CF2A" style="Mode=3;EOID=D726B8C9;SOID=57CD5DA0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;SX=-9;SY=0;EX=62;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87:CY=14:OX=46:OY=-26:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_00497249_92E0_435e_9C45_B9A2F9CBFE43" style="Mode=3;EOID=DC1F1B20;SOID=57CD5DA0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=36;EX=0;EY=6;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=127:CY=14:OX=69:OY=25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-2:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_CF215D61_0282_4111_B11C_CBD651205C58" style="Mode=3;EOID=9FE1D609;SOID=EDFF9BD8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=3;SY=0;EX=0;EY=-119;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87:CY=14:OX=-33:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=484:-267$;" subject="EAID_D257E7B8_BA32_4888_BB1A_167306D6B16C" style="Mode=3;EOID=2D796B8E;SOID=9FE1D609;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=1;SY=0;EX=0;EY=-126;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87:CY=14:OX=-29:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=482:-284$;" subject="EAID_D257E7B8_BA32_4888_BB1A_167306D6B16C" style="Mode=3;EOID=2D796B8E;SOID=9FE1D609;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=3;SY=-16;EX=-88;EY=-11;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=155:CY=14:OX=-22:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-3:OY=-33:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_AF4C01E9_6CF5_410f_83E6_3CAF530D5403" style="Mode=3;EOID=57CD5DA0;SOID=9FE1D609;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=0;SY=46;EX=-155;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=47:OY=21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=704:-374$;" subject="EAID_547A511C_F377_4405_82EA_14ABA20458B6" style="Mode=3;EOID=2D796B8E;SOID=9FE1D609;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=63;SY=-2;EX=82;EY=-10;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=203:CY=14:OX=113:OY=53:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_8E7619CE_95A4_4f77_A6DC_62DFC84C122D" style="Mode=3;EOID=2D796B8E;SOID=04A55CEB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=63;SY=-2;EX=82;EY=-10;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=203:CY=14:OX=130:OY=47:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_8E7619CE_95A4_4f77_A6DC_62DFC84C122D" style="Mode=3;EOID=2D796B8E;SOID=04A55CEB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_C31DC6F6_AFC8_4f2d_A78D_1C226568295B">
@@ -48835,14 +51222,14 @@
 			<diagram xmi:id="EAID_B023DE7D_2242_4a87_8ED4_8DCE14AD388C">
 				<model package="EAPK_73E8F652_9D0B_4be2_A5D2_5EC0D734782C" localID="237" owner="EAPK_73E8F652_9D0B_4be2_A5D2_5EC0D734782C" tpos="1"/>
 				<properties name="procurement object hierarchy" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-01-18 11:59:09" modified="2023-09-11 16:03:19"/>
+				<project author="lps" version="1.0" created="2022-01-18 11:59:09" modified="2024-07-09 16:29:23"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=850;DocSize.cy=1098;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=1;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=9C32C247;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=E1C4A645;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=991;Top=73;Right=1198;Bottom=161;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="1" style="DUID=B8E8B66C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=990;Top=73;Right=1197;Bottom=161;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="1" style="DUID=B8E8B66C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=901;Top=320;Right=991;Bottom=348;" subject="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4" seqno="2" style="DUID=FC1FDB3B;NSL=0;"/>
 					<element geometry="Left=1049;Top=431;Right=1139;Bottom=465;" subject="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07" seqno="3" style="DUID=0FC63CDB;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=576;Top=74;Right=750;Bottom=159;" subject="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" seqno="4" style="DUID=F4E9F7AB;"/>
@@ -48851,7 +51238,7 @@
 					<element geometry="Left=145;Top=475;Right=423;Bottom=586;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="7" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;AttCustom=0;OpCustom=0;RzO=1;DUID=9BCB082E;"/>
 					<element geometry="Left=310;Top=270;Right=542;Bottom=397;" subject="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" seqno="8" style="DUID=0F5E48DC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=464;Top=512;Right=576;Bottom=550;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="9" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=10852AC7;"/>
-					<element geometry="Left=1009;Top=302;Right=1180;Bottom=363;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="10" style="DUID=F332EE56;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1004;Top=296;Right=1183;Bottom=371;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="10" style="DUID=F332EE56;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="EDGE=1;SX=-13;SY=-1;EX=-81;EY=-43;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=15:OY=30:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-14:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_EC04B8A5_6281_4f14_8017_204CCE05A2CC" style="Mode=3;EOID=B8E8B66C;SOID=FC1FDB3B;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=1;SY=-6;EX=1;EY=-6;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_AB768772_FAC4_4353_A1C6_F384FEC304AE" style="Mode=3;EOID=F4E9F7AB;SOID=0F5E48DC;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_0823E4D3_4706_4097_A6E7_D6BCEF598E62" style="Mode=3;EOID=0FC63CDB;SOID=0F5E48DC;Color=-1;LWidth=0;Hidden=1;"/>
@@ -48962,13 +51349,14 @@
 					<element geometry="Left=688;Top=476;Right=966;Bottom=587;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="21" style="DUID=C1D2D067;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1577;Top=431;Right=1842;Bottom=603;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="22" style="DUID=86800DEB;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="EDGE=4;SX=0;SY=-17;EX=74;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=80:CY=14:OX=56:OY=-32:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=428:-548$;" subject="EAID_9B2D6DCC_5092_48cf_878A_8035A42A43F9" style="Mode=3;EOID=64B33488;SOID=C1D2D067;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=96;EY=0;SX=0;SY=52;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=69:CY=14:OX=49:OY=-24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1805:-134$;" subject="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF" style="Mode=3;EOID=86800DEB;SOID=E3AA0701;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=0;SY=45;EX=-37;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=50:OY=57:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1672:-846$;" subject="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7" style="Mode=3;EOID=86800DEB;SOID=F434B350;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-119;SY=0;EX=0;EY=-10;$LLB=;LLT=;LMT=;LMB=;LRT=CX=176:CY=14:OX=9:OY=-6:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=708:-265$;" subject="EAID_DB9BB27E_7F36_41c3_8166_36C3538F2F3A" style="Mode=3;EOID=52E7EBFE;SOID=C1D2D067;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=0;SY=0;EX=2;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=-19:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=86800DEB;SOID=C1D2D067;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=0;SY=13;EX=12;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=117:CY=14:OX=66:OY=-90:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=366:-518$;" subject="EAID_D01E7677_5AC2_42b1_AA17_2A8EC003CCFE" style="Mode=3;EOID=64B33488;SOID=C1D2D067;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-13;SY=10;EX=-13;EY=10;$LLB=;LLT=;LMT=;LMB=;LRT=CX=98:CY=14:OX=72:OY=17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_169198B9_544A_4d67_9273_0F076E0C1306" style="Mode=3;EOID=C3EE8103;SOID=C1D2D067;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=0;SY=-42;EX=-1;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=160:CY=14:OX=88:OY=-28:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=628:-573$;" subject="EAID_1C8C734E_FD33_4153_9939_FA613CEB5D22" style="Mode=3;EOID=D9B3BA27;SOID=C1D2D067;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EX=96;EY=0;SX=0;SY=52;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=69:CY=14:OX=49:OY=-24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1805:-134$;" subject="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF" style="Mode=3;EOID=86800DEB;SOID=E3AA0701;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=0;SY=0;EX=-43;EY=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=68:CY=14:OX=35:OY=27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3EC00346_DC8E_4fd4_8A9A_9A4173CBD283" style="Mode=3;EOID=64B33488;SOID=F434B350;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;EX=-11;EY=0;SX=0;SY=42;$LLB=;LLT=;LMT=;LMB=;LRT=CX=189:CY=14:OX=172:OY=25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=489:-489$;" subject="EAID_28460B26_E1D3_4c16_AB2B_CBE8A5D24AC5" style="Mode=3;EOID=32F822B2;SOID=C1D2D067;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=0;SY=0;EX=28;EY=5;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=66:OY=18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_FD687C05_7D35_48ab_B0AA_8C6787D5DF46" style="Mode=3;EOID=64B33488;SOID=F434B350;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;SX=117;SY=0;EX=0;EY=-14;$LLB=;LLT=;LMT=;LMB=;LRT=CX=132:CY=14:OX=-6:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1826:-768$;" subject="EAID_7DEB98FB_35C4_4015_80BE_9C778A0BA2A5" style="Mode=3;EOID=5B505355;SOID=86800DEB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -48979,7 +51367,7 @@
 					<element geometry="EX=1;EY=3;SX=1;SY=3;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=164:CY=14:OX=-20:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3561E9C9_899A_4ca7_9CF4_9285C5C0CCEC" style="Mode=3;EOID=96B18613;SOID=E3AA0701;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=1031;SCTR.TOP=-205;SCTR.RIGHT=1067;SCTR.BOTTOM=-136;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1032:-205$1067:-205$1067:-136$1032:-136$;" subject="EAID_7EE70932_F57C_4861_BE52_91F3F7270840" style="Mode=3;EOID=E3AA0701;SOID=E3AA0701;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=89;SY=0;EX=0;EY=-33;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=916:-348$;" subject="EAID_B8BA8A30_8A22_4475_A8A7_C0037581B6D3" style="Mode=3;EOID=04F4B7AF;SOID=C1D2D067;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=3;EX=0;EY=69;SX=-9;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=71:CY=14:OX=18:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2032:-448$;" subject="EAID_96BA801A_E8C8_4628_94BC_1C90816E0487" style="Mode=3;EOID=86800DEB;SOID=33DCB1F6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=0;SY=0;EX=0;EY=-1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=100:OY=19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_FC7073E1_3362_472f_B087_27A619B6C819" style="Mode=3;EOID=BFABB571;SOID=ACF66748;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=0;SY=-16;EX=-52;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87:CY=14:OX=60:OY=-44:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=302:-418$;" subject="EAID_4714A192_0DFA_49f4_AB11_165E12CB38A6" style="Mode=3;EOID=64B33488;SOID=32F822B2;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-87;SY=0;EX=0;EY=18;$LLB=;LLT=;LMT=;LMB=;LRT=CX=143:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=267:-384$;" subject="EAID_E076346D_AFB2_421a_BBA1_4FFA393BE7FA" style="Mode=3;EOID=32F822B2;SOID=64B33488;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-83;SY=0;EX=0;EY=-77;$LLB=;LLT=;LMT=;LMB=;LRT=CX=96:CY=14:OX=20:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2110:-594$;" subject="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547" style="Mode=3;EOID=86800DEB;SOID=6C8E8C65;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -48988,16 +51376,16 @@
 					<element geometry="EDGE=4;SX=0;SY=3;EX=124;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=67:OY=-16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=951:-436$;" subject="EAID_ABA2D6DE_6BD5_49b4_9900_A82C2C734195" style="Mode=3;EOID=C1D2D067;SOID=839A14EE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;EX=3;EY=84;SX=3;SY=-20;$LLB=;LLT=;LMT=;LMB=;LRT=CX=71:CY=14:OX=-25:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7B7715A6_6B94_492e_9116_A734400E6358" style="Mode=3;EOID=86800DEB;SOID=839A14EE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=0;SY=-50;EX=0;EY=5;$LLB=;LLT=;LMT=;LMB=;LRT=CX=84:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_EEE75552_13BB_48c2_A5D7_18A876BF10CF" style="Mode=3;EOID=6C8E8C65;SOID=F434B350;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=0;SY=0;EX=0;EY=-1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=100:OY=19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_FC7073E1_3362_472f_B087_27A619B6C819" style="Mode=3;EOID=BFABB571;SOID=ACF66748;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=0;SY=0;EX=-43;EY=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=68:CY=14:OX=35:OY=27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3EC00346_DC8E_4fd4_8A9A_9A4173CBD283" style="Mode=3;EOID=64B33488;SOID=F434B350;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-20;SY=0;EX=0;EY=-47;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=23:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2174:-564$;" subject="EAID_20732599_332F_4f0e_BFE6_593632EDB11F" style="Mode=3;EOID=86800DEB;SOID=ACF66748;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_84F5E9DD_96DE_4ca7_8CA6_9C68826B377B" style="Mode=3;EOID=ACA71A58;SOID=E414460B;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;EX=0;EY=69;SX=-9;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=71:CY=14:OX=18:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2032:-448$;" subject="EAID_96BA801A_E8C8_4628_94BC_1C90816E0487" style="Mode=3;EOID=86800DEB;SOID=33DCB1F6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=0;SY=-2;EX=-120;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=143:CY=14:OX=65:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1589:-723$;" subject="EAID_34156914_725C_4a26_B380_6FDE59360DAF" style="Mode=3;EOID=86800DEB;SOID=4733654A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=0;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=72:OY=23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_5A6933BC_AE5B_4536_B67E_B79F177247C7" style="Mode=3;EOID=C1D2D067;SOID=4733654A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A1817A7D_9F04_479b_8F89_5D58DD92BF3C" style="Mode=3;EOID=D9B3BA27;SOID=4733654A;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=63;SY=-11;EX=65;EY=-11;$LLB=;LLT=;LMT=;LMB=;LRT=CX=118:CY=14:OX=71:OY=26:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_6CDB7A9B_1395_4587_9F41_FE45FA8A0605" style="Mode=3;EOID=86800DEB;SOID=49854831;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=1;SY=-6;EX=98;EY=-12;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_25DE37BE_E478_4159_8F53_7F49CAD18053" style="Mode=3;EOID=F434B350;SOID=49854831;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-19;SY=0;EX=0;EY=5;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1641:-207$;" subject="EAID_2FC633C9_64DB_4b46_9190_197D4A4F4C63" style="Mode=3;EOID=96B18613;SOID=04F4B7AF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_84F5E9DD_96DE_4ca7_8CA6_9C68826B377B" style="Mode=3;EOID=ACA71A58;SOID=E414460B;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=-20;SY=0;EX=0;EY=-47;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=23:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2174:-564$;" subject="EAID_20732599_332F_4f0e_BFE6_593632EDB11F" style="Mode=3;EOID=86800DEB;SOID=ACF66748;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;Path=;" subject="EAID_505234FB_4CE0_475f_A94B_6552B0F5A59A" style=";Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_67528027_031E_41eb_BD84_3064F9C119CE">
@@ -49087,9 +51475,9 @@
 			<diagram xmi:id="EAID_A6162271_FBBA_470d_BA75_B97BDB91DC8E">
 				<model package="EAPK_E1382CA6_03C9_4d3d_8C1D_A9BA47C27626" localID="440" owner="EAPK_E1382CA6_03C9_4d3d_8C1D_A9BA47C27626" tpos="3"/>
 				<properties name="communication means" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-04-11 11:12:53" modified="2024-03-12 12:01:18"/>
+				<project author="andreea" version="1.0" created="2023-04-11 11:12:53" modified="2024-07-16 14:30:17"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=1CDE6B30;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=A80C0389;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
@@ -49105,7 +51493,7 @@
 					<element geometry="Left=821;Top=290;Right=1001;Bottom=360;" subject="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A" seqno="9" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=B7C202D9;"/>
 					<element geometry="SX=4;SY=-3;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=54:OY=-23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_2C904936_FC7D_45f3_AFEF_E5B428B672AA" style="Mode=3;EOID=B7C202D9;SOID=AD5F0CAD;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-6;SY=-38;EX=-6;EY=-38;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_6A50E4FC_E8DA_47c5_AD39_5BA2A66950B9" style="Mode=3;EOID=D331DD1B;SOID=EB9AF0E8;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=32:CY=27:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9F23612C_1865_4c8b_82ED_0BAA7D433501" style="Mode=3;EOID=D331DD1B;SOID=EB9AF0E8;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=56:CY=14:OX=-17:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9F23612C_1865_4c8b_82ED_0BAA7D433501" style="Mode=3;EOID=D331DD1B;SOID=EB9AF0E8;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=313;SCTR.TOP=-342;SCTR.RIGHT=372;SCTR.BOTTOM=-292;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=87:OY=-33:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=349:-342$372:-342$372:-292$313:-292$313:-325$;" subject="EAID_2FF93267_E672_481d_B370_202D9A0110E0" style="Mode=3;EOID=EB9AF0E8;SOID=EB9AF0E8;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-34;SY=0;EX=0;EY=-24;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=95:CY=14:OX=-3:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=188:-601$;" subject="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6" style="Mode=3;EOID=9FBADE63;SOID=EB9AF0E8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=0;EY=13;SX=39;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=261:-564$;" subject="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB" style="Mode=3;EOID=9FBADE63;SOID=EB9AF0E8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -49115,11 +51503,11 @@
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6F3635F3_387D_467a_95E2_ACDA293AE181" style="Mode=3;EOID=9FBADE63;SOID=FB5AC708;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EX=0;EY=-1;SX=10;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=65:CY=14:OX=39:OY=-23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_C6F7D14A_11BF_430e_ABED_4C9AC22FFF2A" style="Mode=3;EOID=9FBADE63;SOID=D331DD1B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=10;SY=0;EX=0;EY=20;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=122:CY=14:OX=14:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1163:-305$;" subject="EAID_5EC16E7A_8AD7_4cd0_B3EE_963EFE7F14CA" style="Mode=3;EOID=B7C202D9;SOID=B8C4294C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EX=0;EY=34;SX=0;SY=34;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=143:CY=14:OX=12:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_46812517_A9DA_432d_A7B8_F5FEC69BBDA5" style="Mode=3;EOID=6E5E4E25;SOID=B8C4294C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=0;EY=34;SX=0;SY=34;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=143:CY=14:OX=12:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_46812517_A9DA_432d_A7B8_F5FEC69BBDA5" style="Mode=3;EOID=6E5E4E25;SOID=B8C4294C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=-4;EX=0;EY=-4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_845CBDEE_711C_45d7_A3E6_EF880E1787DD" style="Mode=3;EOID=B7C202D9;SOID=046BCD20;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=11;SY=0;EX=0;EY=-11;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=74:CY=14:OX=16:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1164:-336$;" subject="EAID_3B1AA9A3_574B_4f10_925C_C2404C3C5805" style="Mode=3;EOID=B7C202D9;SOID=FB5AC708;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_95FB9493_C207_456a_A0EF_B68899832EE8" style="Mode=3;EOID=9FBADE63;SOID=FB5AC708;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=32:CY=27:OX=31:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_A4228FCF_2B3C_44e6_BD17_379180274988" style="Mode=3;EOID=D331DD1B;SOID=6E5E4E25;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=56:CY=14:OX=34:OY=-14:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_A4228FCF_2B3C_44e6_BD17_379180274988" style="Mode=3;EOID=D331DD1B;SOID=6E5E4E25;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_F4E49053_6DAE_4623_8769_61637C57A452">
@@ -49175,19 +51563,19 @@
 			<diagram xmi:id="EAID_CD5F6935_1F48_4857_85C4_ED1E1E281FCE">
 				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" localID="362" owner="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF"/>
 				<properties name="role hierarchy" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-10-31 11:26:58" modified="2024-07-08 17:09:51"/>
+				<project author="lps" version="1.0" created="2022-10-31 11:26:58" modified="2024-07-04 15:58:52"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=791;DocSize.cy=1134;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=91A8E36B;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=B752B6D9;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
 					<element geometry="Left=2251;Top=658;Right=2341;Bottom=689;" subject="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1" seqno="1" style="DUID=F92FADD5;NSL=0;"/>
-					<element geometry="Left=1561;Top=1155;Right=1657;Bottom=1187;" subject="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32" seqno="2" style="DUID=FD677401;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1529;Top=1108;Right=1625;Bottom=1140;" subject="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32" seqno="2" style="DUID=FD677401;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=656;Top=1055;Right=746;Bottom=1090;" subject="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896" seqno="3" style="DUID=B14C540F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1296;Top=801;Right=1386;Bottom=836;" subject="EAID_C52C2B8E_EBBE_4a9a_A48C_B479107AD49E" seqno="4" style="DUID=7CA94379;"/>
 					<element geometry="Left=1048;Top=900;Right=1138;Bottom=939;" subject="EAID_ABEE1795_5EE6_4f51_ACEA_C3F05211F0B3" seqno="5" style="DUID=B108D291;"/>
-					<element geometry="Left=1858;Top=948;Right=1954;Bottom=983;" subject="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51" seqno="6" style="DUID=7B6C46D7;"/>
+					<element geometry="Left=1771;Top=948;Right=1867;Bottom=983;" subject="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51" seqno="6" style="DUID=7B6C46D7;"/>
 					<element geometry="Left=1953;Top=546;Right=2043;Bottom=616;" subject="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5" seqno="7" style="DUID=FA3D02D1;"/>
 					<element geometry="Left=664;Top=565;Right=754;Bottom=635;" subject="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" seqno="8" style="DUID=C821B644;"/>
 					<element geometry="Left=546;Top=1159;Right=662;Bottom=1194;" subject="EAID_FD0308FC_9EDA_4a54_A4B6_FBCE76BF76A2" seqno="9" style="DUID=02E431FF;NSL=0;"/>
@@ -49203,11 +51591,11 @@
 					<element geometry="Left=158;Top=1079;Right=326;Bottom=1114;" subject="EAID_572B82B3_FF4C_43b8_9C2C_09AD5D3F4615" seqno="19" style="DUID=B7A70CFE;NSL=0;"/>
 					<element geometry="Left=346;Top=1170;Right=462;Bottom=1205;" subject="EAID_5696AD02_F9CD_40d0_94EC_172DCDA4EF78" seqno="20" style="DUID=7999185A;NSL=0;"/>
 					<element geometry="Left=1172;Top=902;Right=1296;Bottom=937;" subject="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC" seqno="21" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=E55F47CF;"/>
-					<element geometry="Left=1715;Top=1132;Right=1811;Bottom=1167;" subject="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" seqno="22" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=F6DB5B3D;"/>
+					<element geometry="Left=1645;Top=1088;Right=1741;Bottom=1123;" subject="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" seqno="22" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=F6DB5B3D;"/>
 					<element geometry="Left=769;Top=1013;Right=859;Bottom=1048;" subject="EAID_B4F30642_373D_4195_B1E6_10198F138ED8" seqno="23" style="DUID=A992BCE8;NSL=0;"/>
 					<element geometry="Left=918;Top=744;Right=1008;Bottom=779;" subject="EAID_A312F200_1050_451d_97BB_07EBCE11D45C" seqno="24" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=EC6B1D83;"/>
-					<element geometry="Left=1395;Top=1088;Right=1508;Bottom=1123;" subject="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6" seqno="25" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=B0B214A7;"/>
-					<element geometry="Left=1821;Top=1054;Right=1917;Bottom=1089;" subject="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" seqno="26" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=2A74BD86;"/>
+					<element geometry="Left=1416;Top=1055;Right=1529;Bottom=1090;" subject="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6" seqno="25" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=B0B214A7;"/>
+					<element geometry="Left=1711;Top=1020;Right=1807;Bottom=1055;" subject="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" seqno="26" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=2A74BD86;"/>
 					<element geometry="Left=836;Top=939;Right=949;Bottom=974;" subject="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62" seqno="27" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=C875B1C2;"/>
 					<element geometry="Left=1233;Top=1020;Right=1400;Bottom=1055;" subject="EAID_620C5C3F_3C72_4897_A377_32156A5461E3" seqno="28" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=E5E05513;"/>
 					<element geometry="Left=1689;Top=672;Right=1779;Bottom=707;" subject="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3" seqno="29" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=52086AF8;"/>
@@ -49221,15 +51609,16 @@
 					<element geometry="Left=1486;Top=546;Right=1576;Bottom=616;" subject="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" seqno="37" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=0C97029C;"/>
 					<element geometry="EX=45;EY=-33;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_910BFAB5_C09F_48c2_A281_70A523440BFB" style="Mode=3;EOID=0C97029C;SOID=EB4BB6E9;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_7B93C4E4_6684_4b82_BE6A_D4FA2FE59843" style="Mode=3;EOID=3F40E56D;SOID=B108D291;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=4;EX=-3;EY=-15;SX=-3;SY=-15;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_2BD2D4BE_B733_42b0_B8FD_2F0BC50DFCA9" style="Mode=3;EOID=C821B644;SOID=EC6B1D83;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-5;SY=-2;EX=-5;EY=-2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_0B89904B_56C2_4154_BC18_F6B8F5B8635B" style="Mode=3;EOID=0C97029C;SOID=B0B214A7;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-8;SY=3;EX=18;EY=-17;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A27A53B2_A6D1_4fdd_A43E_D33DC6607852" style="Mode=3;EOID=0C97029C;SOID=2A74BD86;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=0;SY=0;EX=0;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_DE55F8F3_DEA7_4350_A7EC_23ACD7626ADE" style="Mode=3;EOID=C821B644;SOID=C875B1C2;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-38;SY=-1;EX=-1;EY=-9;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BD823F50_7A3D_4832_8C19_876392639DF8" style="Mode=3;EOID=E55F47CF;SOID=E5E05513;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_61636EE3_DE81_4083_BF9B_6F607A63A921" style="Mode=3;EOID=F6DB5B3D;SOID=52086AF8;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="EDGE=1;EX=19;EY=-34;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_199C3BDF_913A_42e4_A409_64CB2CE61248" style="Mode=3;EOID=0C97029C;SOID=F6DB5B3D;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EX=1;EY=-3;EDGE=1;SX=1;SY=-3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_E4D55FF7_2180_4a21_A34C_23F9AB59E814" style="Mode=3;EOID=0C97029C;SOID=52086AF8;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;Path=;" subject="EAID_4347709B_D87B_4476_92B0_4EF65D96A0BA" style=";Hidden=0;"/>
+					<element geometry="SX=7;SY=-17;EX=7;EY=-35;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9506F37E_A7C5_4da0_9F94_6783892A6027" style="Mode=3;EOID=C821B644;SOID=A992BCE8;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=3;SX=20;SY=-12;EX=20;EY=-12;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BBA3014F_919D_4de3_BCF2_6CA4F71150CA" style="Mode=3;EOID=52086AF8;SOID=EB4BB6E9;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="EDGE=1;SX=-1;SY=-17;EX=-6;EY=-29;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F705DF6C_1870_4735_8ACE_0CBB68152882" style="Mode=3;EOID=3F40E56D;SOID=E55F47CF;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;EX=19;EY=-34;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_199C3BDF_913A_42e4_A409_64CB2CE61248" style="Mode=3;EOID=0C97029C;SOID=F6DB5B3D;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;EX=-7;EY=0;SX=-7;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_7B0A44E0_63E1_4c30_AB83_DA8166C24C14" style="Mode=3;EOID=0C97029C;SOID=66283F9C;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=17;SY=6;EX=17;EY=6;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4714A192_0DFA_49f4_AB11_165E12CB38A6" style="Mode=3;EOID=3F40E56D;SOID=7BDDEA03;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=1;SX=1;SY=-8;EX=-4;EY=-3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_657CE8BE_2717_41d1_B80A_3B15D5AAC373" style="Mode=3;EOID=C821B644;SOID=7BDDEA03;Color=-1;LWidth=0;Hidden=0;"/>
@@ -49238,8 +51627,8 @@
 					<element geometry="SX=-26;SY=-9;EX=-26;EY=-9;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_E076346D_AFB2_421a_BBA1_4FFA393BE7FA" style="Mode=3;EOID=7BDDEA03;SOID=3F40E56D;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=4;SX=76;SY=-5;EX=29;EY=-34;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BD5C98D5_43D4_41be_9C21_84470056CF01" style="Mode=3;EOID=C821B644;SOID=3F40E56D;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;EX=-1;EY=-33;SX=-2;SY=30;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4657FAEB_1A34_4ef7_947D_E6C47AAC7527" style="Mode=3;EOID=8B6B6E09;SOID=0C97029C;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EX=1;EY=-3;EDGE=1;SX=1;SY=-3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_E4D55FF7_2180_4a21_A34C_23F9AB59E814" style="Mode=3;EOID=0C97029C;SOID=52086AF8;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-16;SY=16;EX=1;EY=-4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_0F5296C9_3949_4cbc_913E_EAEE25BEEAD8" style="Mode=3;EOID=FA3D02D1;SOID=73826C31;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;Path=;" subject="EAID_9E5B53CF_762F_4436_88E6_F386741960D6" style=";Hidden=0;"/>
+					<element geometry="SX=7;SY=7;EX=7;EY=7;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_800B935D_1C60_427e_9BF3_BDFF0776A54C" style="Mode=3;EOID=C821B644;SOID=E5EA9B40;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_10602E2D_EE49_4483_BF7D_068AAD2C5033" style="Mode=3;EOID=FA3D02D1;SOID=F92FADD5;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-2;SY=-3;EX=37;EY=-34;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_5729A98B_A925_4816_AEF4_9EBDE5851B98" style="Mode=3;EOID=0C97029C;SOID=7B6C46D7;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-8;SY=15;EX=8;EY=-34;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_28774B07_2278_44a1_B47E_F671B4F00F63" style="Mode=3;EOID=0C97029C;SOID=FD677401;Color=-1;LWidth=0;Hidden=0;"/>
@@ -49247,10 +51636,10 @@
 					<element geometry="SX=13;SY=-16;EX=13;EY=-16;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_93385F64_990A_44d0_A266_DDF9F55EABCE" style="Mode=3;EOID=8B6B6E09;SOID=C821B644;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=6;SY=-3;EX=5;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D7F9D64F_889F_4301_9BA8_05D6512C15C2" style="Mode=3;EOID=C821B644;SOID=02E431FF;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6F4BC75A_C847_4873_8D62_CB3A9307E408" style="Mode=3;EOID=C821B644;SOID=9D042683;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=7;SY=-17;EX=7;EY=-35;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9506F37E_A7C5_4da0_9F94_6783892A6027" style="Mode=3;EOID=C821B644;SOID=A992BCE8;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=3;SY=-2;EX=3;EY=-2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_40DE5B33_7251_4616_AC39_5B5D4DC0AF5F" style="Mode=3;EOID=C821B644;SOID=B14C540F;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=16;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_DE32781C_3C61_477f_8C9C_A94EFF7F2822" style="Mode=3;EOID=C821B644;SOID=0D2A89A2;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=4;EX=-3;EY=-15;SX=-3;SY=-15;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_2BD2D4BE_B733_42b0_B8FD_2F0BC50DFCA9" style="Mode=3;EOID=C821B644;SOID=EC6B1D83;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-16;SY=16;EX=1;EY=-4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_0F5296C9_3949_4cbc_913E_EAEE25BEEAD8" style="Mode=3;EOID=FA3D02D1;SOID=73826C31;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A641D156_C668_4cc3_9877_03C8FEE30681" style="Mode=3;EOID=0C97029C;SOID=7CA94379;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=7;SY=7;EX=7;EY=7;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_800B935D_1C60_427e_9BF3_BDFF0776A54C" style="Mode=3;EOID=C821B644;SOID=E5EA9B40;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=57;SY=1;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_CD10FCBC_3AD7_437f_AE64_07B876CC0919" style="Mode=3;EOID=C821B644;SOID=E53F83EE;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_5C021DF8_F1E3_453e_8D40_2B84F1680094" style="Mode=3;EOID=FA3D02D1;SOID=8817DFCA;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-2;SY=-8;EX=-2;EY=-8;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F8672A5A_8E49_4ef5_90A5_98580A4DAB3B" style="Mode=3;EOID=C821B644;SOID=5C0D60DC;Color=-1;LWidth=0;Hidden=0;"/>
@@ -49258,7 +51647,8 @@
 					<element geometry="SX=5;SY=0;EX=5;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_7D4F2A49_092C_4524_8A97_BB99CF182780" style="Mode=3;EOID=C821B644;SOID=507774E7;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=7;SY=-2;EX=7;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_44037F7A_D159_4dd4_8458_E296C8F31B77" style="Mode=3;EOID=C821B644;SOID=B7A70CFE;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=2;SY=-5;EX=0;EY=-5;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B513882A_D5F8_4ebc_8C59_831A976F33D2" style="Mode=3;EOID=C821B644;SOID=7999185A;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=16;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_DE32781C_3C61_477f_8C9C_A94EFF7F2822" style="Mode=3;EOID=C821B644;SOID=0D2A89A2;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-1;SY=-17;EX=-6;EY=-29;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F705DF6C_1870_4735_8ACE_0CBB68152882" style="Mode=3;EOID=3F40E56D;SOID=E55F47CF;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=3;SY=-2;EX=3;EY=-2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_40DE5B33_7251_4616_AC39_5B5D4DC0AF5F" style="Mode=3;EOID=C821B644;SOID=B14C540F;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_6B773B07_0005_44a3_9D34_B2FE839A6B37">
@@ -49324,29 +51714,29 @@
 			<diagram xmi:id="EAID_DC637555_D382_4357_B324_6181AAA46DCE">
 				<model package="EAPK_92A0CFE1_0DAD_4a19_AE6F_360376AC39EC" localID="235" owner="EAPK_92A0CFE1_0DAD_4a19_AE6F_360376AC39EC" tpos="3"/>
 				<properties name="role playing on the seller side" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-01-17 23:06:42" modified="2023-09-11 16:38:01"/>
+				<project author="lps" version="1.0" created="2022-01-17 23:06:42" modified="2024-07-18 16:03:36"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=850;DocSize.cy=1098;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=1;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=CF7FF02B;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=DAAF2144;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
 					<element geometry="Left=426;Top=539;Right=516;Bottom=609;" subject="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF" seqno="1" style="DUID=4064EA1B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=247;Top=539;Right=337;Bottom=609;" subject="EAID_C52C2B8E_EBBE_4a9a_A48C_B479107AD49E" seqno="2" style="DUID=F18F987A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=426;Top=314;Right=516;Bottom=384;" subject="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32" seqno="3" style="DUID=3E9D4CA6;"/>
+					<element geometry="Left=80;Top=314;Right=170;Bottom=384;" subject="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32" seqno="3" style="DUID=3E9D4CA6;"/>
 					<element geometry="Left=939;Top=438;Right=1058;Bottom=473;" subject="EAID_48133D6A_BE44_43c9_A647_04650698EC95" seqno="4" style="DUID=EB114200;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=904;Top=299;Right=1093;Bottom=369;" subject="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" seqno="5" style="DUID=97725150;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=564;Top=131;Right=781;Bottom=216;" subject="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" seqno="6" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=1F7B4494;"/>
+					<element geometry="Left=566;Top=14;Right=783;Bottom=99;" subject="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" seqno="6" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=1F7B4494;"/>
 					<element geometry="Left=578;Top=438;Right=780;Bottom=508;" subject="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C" seqno="7" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=16DFE65E;"/>
 					<element geometry="Left=190;Top=438;Right=280;Bottom=508;" subject="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" seqno="8" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=FFE9E51E;"/>
 					<element geometry="Left=80;Top=438;Right=170;Bottom=508;" subject="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6" seqno="9" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=613578FD;"/>
-					<element geometry="Left=80;Top=314;Right=170;Bottom=384;" subject="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" seqno="10" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=8CB65772;"/>
+					<element geometry="Left=426;Top=314;Right=516;Bottom=384;" subject="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" seqno="10" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=8CB65772;"/>
 					<element geometry="Left=247;Top=314;Right=337;Bottom=384;" subject="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" seqno="11" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=B3CA9ED7;"/>
 					<element geometry="Left=309;Top=438;Right=399;Bottom=508;" subject="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3" seqno="12" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=1545CE73;"/>
 					<element geometry="Left=426;Top=438;Right=516;Bottom=508;" subject="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" seqno="13" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=5D621877;"/>
-					<element geometry="Left=184;Top=134;Right=401;Bottom=212;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" seqno="14" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=A30B8AE0;"/>
+					<element geometry="Left=186;Top=17;Right=403;Bottom=95;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" seqno="14" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=A30B8AE0;"/>
 					<element geometry="Left=553;Top=277;Right=806;Bottom=391;" subject="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" seqno="15" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=5EA4FE4F;"/>
-					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A27A53B2_A6D1_4fdd_A43E_D33DC6607852" style="Mode=3;EOID=B3CA9ED7;SOID=8CB65772;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=28;SY=0;EX=28;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=93:CY=14:OX=63:OY=29:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4347709B_D87B_4476_92B0_4EF65D96A0BA" style="Mode=3;EOID=8CB65772;SOID=5D621877;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=529;SCTR.TOP=-289;SCTR.RIGHT=572;SCTR.BOTTOM=-258;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=47:OY=-32:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=572:-277$572:-258$529:-258$529:-289$553:-289$;" subject="EAID_2FF93267_E672_481d_B370_202D9A0110E0" style="Mode=3;EOID=5EA4FE4F;SOID=5EA4FE4F;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=8;SY=-16;EX=8;EY=6;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=61:CY=14:OX=-4:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6" style="Mode=3;EOID=1F7B4494;SOID=A30B8AE0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_0B89904B_56C2_4154_BC18_F6B8F5B8635B" style="Mode=3;EOID=B3CA9ED7;SOID=613578FD;Color=-1;LWidth=0;Hidden=0;"/>
@@ -49354,9 +51744,11 @@
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_199C3BDF_913A_42e4_A409_64CB2CE61248" style="Mode=3;EOID=B3CA9ED7;SOID=FFE9E51E;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_E4D55FF7_2180_4a21_A34C_23F9AB59E814" style="Mode=3;EOID=B3CA9ED7;SOID=1545CE73;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_61636EE3_DE81_4083_BF9B_6F607A63A921" style="Mode=3;EOID=FFE9E51E;SOID=1545CE73;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EX=-2;EY=-1;EDGE=4;SX=-2;SY=-1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_910BFAB5_C09F_48c2_A281_70A523440BFB" style="Mode=3;EOID=B3CA9ED7;SOID=5D621877;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EX=10;EY=13;EDGE=1;SX=-26;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_19AD8C15_4D9D_48f2_A3E1_A997E86942D2" style="Mode=3;EOID=1F7B4494;SOID=5EA4FE4F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BBA3014F_919D_4de3_BCF2_6CA4F71150CA" style="Mode=3;EOID=1545CE73;SOID=5D621877;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_28774B07_2278_44a1_B47E_F671B4F00F63" style="Mode=3;EOID=B3CA9ED7;SOID=3E9D4CA6;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-29;SY=-5;EX=-29;EY=-5;SCME=0;SCTR=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=113:CY=14:OX=59:OY=13:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9E5B53CF_762F_4436_88E6_F386741960D6" style="Mode=3;EOID=8CB65772;SOID=5D621877;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_28774B07_2278_44a1_B47E_F671B4F00F63" style="Mode=3;EOID=B3CA9ED7;SOID=3E9D4CA6;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A27A53B2_A6D1_4fdd_A43E_D33DC6607852" style="Mode=3;EOID=B3CA9ED7;SOID=8CB65772;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=2;SY=-1;EX=2;EY=-1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A2F10537_FAE7_4ff3_A3EE_819F014FE1AC" style="Mode=3;EOID=5EA4FE4F;SOID=16DFE65E;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=2;SY=-3;EX=2;EY=-3;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=51:CY=14:OX=18:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F3F440DD_AB87_4730_A6DF_915A5FB0B3DB" style="Mode=3;EOID=5EA4FE4F;SOID=97725150;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=8;SY=27;EX=8;EY=27;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=73:CY=14:OX=9:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0AA8BD10_946A_403c_B906_6DB183F74D9F" style="Mode=3;EOID=5EA4FE4F;SOID=97725150;Color=-1;LWidth=0;Hidden=0;"/>
@@ -49364,7 +51756,7 @@
 					<element geometry="SX=-5;SY=0;EX=0;EY=-51;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=993:-385$;" subject="EAID_FBFC1FF3_5808_4318_94FE_368AE6509420" style="Mode=3;EOID=5EA4FE4F;SOID=EB114200;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A641D156_C668_4cc3_9877_03C8FEE30681" style="Mode=3;EOID=B3CA9ED7;SOID=F18F987A;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=86:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B44261EC_B8C1_4e5a_9174_C3DEEEA32848" style="Mode=3;EOID=4064EA1B;SOID=F18F987A;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_910BFAB5_C09F_48c2_A281_70A523440BFB" style="Mode=3;EOID=B3CA9ED7;SOID=5D621877;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BBA3014F_919D_4de3_BCF2_6CA4F71150CA" style="Mode=3;EOID=1545CE73;SOID=5D621877;Color=-1;LWidth=0;Hidden=1;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_13EBFDF0_A7E0_461c_AA5D_CC75FADB4DDB">
@@ -49432,48 +51824,51 @@
 			<diagram xmi:id="EAID_5E50B73B_B272_4c8d_9BDE_F34B9AB58EBE">
 				<model package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" localID="166" owner="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="3"/>
 				<properties name="lot terms hierarchy" type="Logical"/>
-				<project author="andreea" version="1.0" created="2021-12-21 13:26:10" modified="2023-09-11 16:59:14"/>
+				<project author="andreea" version="1.0" created="2021-12-21 13:26:10" modified="2024-07-18 16:21:28"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=BF31189A;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=F7DD4B07;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=841;Top=466;Right=1097;Bottom=551;" subject="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" seqno="1" style="DUID=7A75ACBB;NSL=0;"/>
-					<element geometry="Left=83;Top=500;Right=347;Bottom=570;" subject="EAID_BA1BBA64_88B1_420e_8141_092908A95E2B" seqno="2" style="DUID=AE78CDE3;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=526;Top=152;Right=758;Bottom=289;" subject="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" seqno="3" style="DUID=98E23519;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1026;Top=880;Right=1326;Bottom=965;" subject="EAID_FA070646_D88B_493f_96AB_8417E2069155" seqno="4" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=ACB4D859;"/>
-					<element geometry="Left=1445;Top=314;Right=1600;Bottom=360;" subject="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" seqno="5" style="DUID=83C800BD;NSL=0;"/>
-					<element geometry="Left=709;Top=953;Right=943;Bottom=1025;" subject="EAID_E13C8393_D02E_4800_B8D5_38C02E2C8998" seqno="6" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=41354A09;"/>
-					<element geometry="Left=180;Top=719;Right=333;Bottom=771;" subject="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" seqno="7" style="DUID=D8A45F9D;"/>
-					<element geometry="Left=252;Top=923;Right=475;Bottom=1008;" subject="EAID_82AA47D1_6939_4328_8108_0018817C75BD" seqno="8" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=D631640C;"/>
-					<element geometry="Left=477;Top=825;Right=741;Bottom=923;" subject="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" seqno="9" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=3C051EB0;"/>
-					<element geometry="Left=41;Top=587;Right=302;Bottom=698;" subject="EAID_44E7963D_28F5_4263_835A_24C87816F40C" seqno="10" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=55802885;"/>
-					<element geometry="Left=1419;Top=636;Right=1733;Bottom=841;" subject="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" seqno="11" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=FCD00DBF;"/>
-					<element geometry="Left=41;Top=785;Right=344;Bottom=909;" subject="EAID_3F572668_3AED_4090_BAB3_9047B4874154" seqno="12" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=352FFC33;"/>
-					<element geometry="Left=925;Top=576;Right=1255;Bottom=791;" subject="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" seqno="13" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=2850BF17;"/>
-					<element geometry="Left=1620;Top=496;Right=1935;Bottom=610;" subject="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561" seqno="14" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=7399FEBA;"/>
-					<element geometry="Left=581;Top=322;Right=705;Bottom=377;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="15" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=D966F58E;"/>
-					<element geometry="Left=812;Top=860;Right=921;Bottom=888;" subject="EAID_0C735489_15DC_40a7_A94E_A9202738B188" seqno="16" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=3DAC7AD2;"/>
-					<element geometry="Left=598;Top=437;Right=688;Bottom=489;" subject="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" seqno="17" style="DUID=AFD12329;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="EDGE=2;SX=2;SY=-9;EX=2;EY=-9;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4E161D86_3C31_466f_982A_26607071A85E" style="Mode=3;EOID=AFD12329;SOID=55802885;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="Left=262;Top=315;Right=441;Bottom=385;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="1" style="DUID=41983173;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=841;Top=466;Right=1097;Bottom=551;" subject="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" seqno="2" style="DUID=7A75ACBB;NSL=0;"/>
+					<element geometry="Left=83;Top=500;Right=347;Bottom=570;" subject="EAID_BA1BBA64_88B1_420e_8141_092908A95E2B" seqno="3" style="DUID=AE78CDE3;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=526;Top=152;Right=758;Bottom=289;" subject="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" seqno="4" style="DUID=98E23519;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1026;Top=880;Right=1326;Bottom=965;" subject="EAID_FA070646_D88B_493f_96AB_8417E2069155" seqno="5" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=ACB4D859;"/>
+					<element geometry="Left=1445;Top=314;Right=1600;Bottom=360;" subject="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" seqno="6" style="DUID=83C800BD;NSL=0;"/>
+					<element geometry="Left=709;Top=953;Right=943;Bottom=1025;" subject="EAID_E13C8393_D02E_4800_B8D5_38C02E2C8998" seqno="7" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=41354A09;"/>
+					<element geometry="Left=180;Top=719;Right=333;Bottom=771;" subject="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" seqno="8" style="DUID=D8A45F9D;"/>
+					<element geometry="Left=252;Top=923;Right=475;Bottom=1008;" subject="EAID_82AA47D1_6939_4328_8108_0018817C75BD" seqno="9" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=D631640C;"/>
+					<element geometry="Left=477;Top=825;Right=741;Bottom=923;" subject="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" seqno="10" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=3C051EB0;"/>
+					<element geometry="Left=41;Top=587;Right=302;Bottom=698;" subject="EAID_44E7963D_28F5_4263_835A_24C87816F40C" seqno="11" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=55802885;"/>
+					<element geometry="Left=1419;Top=636;Right=1733;Bottom=841;" subject="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" seqno="12" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=FCD00DBF;"/>
+					<element geometry="Left=41;Top=785;Right=344;Bottom=909;" subject="EAID_3F572668_3AED_4090_BAB3_9047B4874154" seqno="13" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=352FFC33;"/>
+					<element geometry="Left=925;Top=576;Right=1255;Bottom=791;" subject="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" seqno="14" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=2850BF17;"/>
+					<element geometry="Left=1620;Top=496;Right=1935;Bottom=610;" subject="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561" seqno="15" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=7399FEBA;"/>
+					<element geometry="Left=581;Top=322;Right=705;Bottom=377;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="16" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=D966F58E;"/>
+					<element geometry="Left=780;Top=780;Right=889;Bottom=808;" subject="EAID_0C735489_15DC_40a7_A94E_A9202738B188" seqno="17" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=3DAC7AD2;"/>
+					<element geometry="Left=598;Top=437;Right=688;Bottom=489;" subject="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" seqno="18" style="DUID=AFD12329;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A33B86A9_4703_4a67_8335_7F9768E9C57B" style="Mode=3;EOID=AFD12329;SOID=3DAC7AD2;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F593B546_502A_413a_8694_914903478877" style="Mode=3;EOID=7399FEBA;SOID=FCD00DBF;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=1;SX=-26;SY=98;EX=12;EY=-3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D62CD782_93C6_480f_BE3B_872E1A0882C0" style="Mode=3;EOID=83C800BD;SOID=FCD00DBF;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BE41CCFB_8495_440b_ADCE_908A980E0342" style="Mode=3;EOID=98E23519;SOID=D966F58E;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=3;SX=1;SY=-9;EX=1;EY=-7;$LLB=;LLT=;LMT=;LMB=;LRT=CX=132:CY=14:OX=77:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7DEB98FB_35C4_4015_80BE_9C778A0BA2A5" style="Mode=3;EOID=AFD12329;SOID=D966F58E;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=93;SY=3;EX=-19;EY=-25;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_EA8BA09A_3CC1_4c02_A5CD_27AE1D84CDDE" style="Mode=3;EOID=AFD12329;SOID=352FFC33;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=9;SY=-9;EX=9;EY=-9;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_EB5F1306_97D6_4fef_8A8A_E03C23ED1BE1" style="Mode=3;EOID=83C800BD;SOID=ACB4D859;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=4;EX=34;EY=-25;SX=-120;SY=-40;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F9E99464_DED7_437a_98F9_263E29761C37" style="Mode=3;EOID=AFD12329;SOID=ACB4D859;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=28;EX=-5;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=75:OY=-37:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=5:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1517:-192$;" subject="EAID_F1463DF7_672E_4208_A39E_E74480CCE1D0" style="Mode=3;EOID=83C800BD;SOID=98E23519;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8DB5DB8D_4E96_4679_A104_F62859765981" style="Mode=3;EOID=AFD12329;SOID=2850BF17;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_1E3BD6A4_59D5_435a_9472_AFC131D1E7F2" style="Mode=3;EOID=83C800BD;SOID=7399FEBA;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A33B86A9_4703_4a67_8335_7F9768E9C57B" style="Mode=3;EOID=AFD12329;SOID=3DAC7AD2;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;SX=2;SY=-9;EX=2;EY=-9;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4E161D86_3C31_466f_982A_26607071A85E" style="Mode=3;EOID=AFD12329;SOID=55802885;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=3;SY=0;EX=0;EY=15;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=132:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=354:-448$;" subject="EAID_505234FB_4CE0_475f_A94B_6552B0F5A59A" style="Mode=3;EOID=AFD12329;SOID=41983173;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-11;SY=-22;EX=-11;EY=-22;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_85E14E41_3BA7_4783_A633_615CD23835C1" style="Mode=3;EOID=AFD12329;SOID=D631640C;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-7;SY=-2;EX=-7;EY=-2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_2EFFE2EC_6B27_4d48_B910_6C37C39CAAFC" style="Mode=3;EOID=AFD12329;SOID=41354A09;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-5;SY=-9;EX=-5;EY=-9;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D31D53E1_9D45_461d_A55B_588C65D0E49D" style="Mode=3;EOID=AFD12329;SOID=3C051EB0;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_AE27FB70_7F60_4b0a_84EA_F015F6FE1271" style="Mode=3;EOID=AFD12329;SOID=AE78CDE3;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B3295353_448F_433c_921A_A4E96D0B2738" style="Mode=3;EOID=AFD12329;SOID=7A75ACBB;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=14;SY=5;EX=14;EY=5;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_41D43466_5575_4752_B3BF_0CA7ADD341E4" style="Mode=3;EOID=AFD12329;SOID=D8A45F9D;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=4;EX=34;EY=-25;SX=-120;SY=-40;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F9E99464_DED7_437a_98F9_263E29761C37" style="Mode=3;EOID=AFD12329;SOID=ACB4D859;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_1E3BD6A4_59D5_435a_9472_AFC131D1E7F2" style="Mode=3;EOID=83C800BD;SOID=7399FEBA;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_20732599_332F_4f0e_BFE6_593632EDB11F" style="Mode=3;EOID=D966F58E;SOID=41983173;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8DB5DB8D_4E96_4679_A104_F62859765981" style="Mode=3;EOID=AFD12329;SOID=2850BF17;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_E7B9DC27_DFB5_40f5_AFF2_F34912D5FC0D">
@@ -49787,9 +52182,9 @@
 			<diagram xmi:id="EAID_2468B950_9AA0_45fa_9FF2_3F556FA3C967">
 				<model package="EAPK_63D0752E_9535_4d17_A308_BEA4968AC08E" localID="223" owner="EAPK_63D0752E_9535_4d17_A308_BEA4968AC08E"/>
 				<properties name="submission term" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-01-16 15:50:02" modified="2024-03-12 12:10:44"/>
+				<project author="lps" version="1.0" created="2022-01-16 15:50:02" modified="2024-05-02 17:23:22"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=850;DocSize.cy=1098;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=1;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=5023EF60;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=27EC5F9B;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
@@ -49818,14 +52213,14 @@
 					<element geometry="EDGE=2;SX=-154;SY=-70;EX=-28;EY=5;$LLB=;LLT=;LMT=;LMB=;LRT=CX=77:CY=14:OX=0:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_E2C29363_440C_4c85_8C4E_38DED0468EB4" style="Mode=3;EOID=FD8EA106;SOID=BE572B7D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=0;SY=70;EX=7;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=126:CY=14:OX=67:OY=15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=909:-366$;" subject="EAID_C325A5AA_AAE1_4e55_A542_A867A1BED99D" style="Mode=3;EOID=F994F523;SOID=BE572B7D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=3;SY=-38;EX=3;EY=7;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=160:CY=14:OX=-7:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1C8C734E_FD33_4153_9939_FA613CEB5D22" style="Mode=3;EOID=B5FB2BEC;SOID=49CCE5BA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=22;SY=0;EX=0;EY=15;$LLB=;LLT=;LMT=;LMB=;LRT=CX=108:CY=27:OX=19:OY=-12:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=690:-278$;" subject="EAID_9B46D9F5_E71D_40fc_A50D_BE4367D5EE4E" style="Mode=3;EOID=F994F523;SOID=BE572B7D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=28;SY=0;EX=0;EY=20;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=-2:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=696:-273$;" subject="EAID_9B46D9F5_E71D_40fc_A50D_BE4367D5EE4E" style="Mode=3;EOID=F994F523;SOID=BE572B7D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=132:CY=14:OX=21:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7DEB98FB_35C4_4015_80BE_9C778A0BA2A5" style="Mode=3;EOID=FCF56E28;SOID=2925BA43;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=3;EX=0;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=59:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7BC31FFB_F53F_431c_AED5_36E1786ED85F" style="Mode=3;EOID=4A3BCEC1;SOID=BE572B7D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-98;SY=0;EX=0;EY=24;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=64:OY=-15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=30:OY=-21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=551:-603$;" subject="EAID_BC7F270C_1A4E_400c_88ED_7EFEB868C4EC" style="Mode=3;EOID=0B1CB9AC;SOID=BE572B7D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=0;SY=-39;EX=-7;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=143:CY=14:OX=14:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_6D0203DA_A8A3_482a_B747_66A09DEF42FC" style="Mode=3;EOID=517A967B;SOID=BE572B7D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;EX=0;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=121:CY=14:OX=-17:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D07B06AA_2E5B_4fa1_B0EA_CB49790C2AAD" style="Mode=3;EOID=37E20E9B;SOID=BE572B7D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-9;SY=51;EX=-9;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=130:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1EA9C84A_C46F_456b_A355_DA9CD314CBA0" style="Mode=3;EOID=A0B3CC86;SOID=BE572B7D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;EX=0;EY=-16;SX=45;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=110:CY=14:OX=3:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=713:-309$;" subject="EAID_8CA66645_D223_487b_B348_21446E4664A6" style="Mode=3;EOID=F994F523;SOID=BE572B7D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;EX=0;EY=-16;SX=45;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=110:CY=14:OX=-9:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=713:-309$;" subject="EAID_8CA66645_D223_487b_B348_21446E4664A6" style="Mode=3;EOID=F994F523;SOID=BE572B7D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8DB5DB8D_4E96_4679_A104_F62859765981" style="Mode=3;EOID=FCF56E28;SOID=BE572B7D;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=3;EX=0;EY=-3;SX=100;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=172:CY=14:OX=0:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=768:-606$;" subject="EAID_C144677A_178B_495d_A1CC_20D0D20B3AD0" style="Mode=3;EOID=F44478DA;SOID=BE572B7D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
@@ -49957,9 +52352,9 @@
 			<diagram xmi:id="EAID_54EAF048_1D0D_46d6_BEFD_4B2213CD4887">
 				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" localID="245" owner="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" tpos="2"/>
 				<properties name="procurement criterion" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-01-21 10:06:03" modified="2024-03-12 12:19:56"/>
+				<project author="lps" version="1.0" created="2022-01-21 10:06:03" modified="2024-07-23 10:43:12"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=850;DocSize.cy=1098;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=1;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=17F264F2;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=507D04B7;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
@@ -49992,20 +52387,22 @@
 					<element geometry="Left=402;Top=303;Right=492;Bottom=363;" subject="EAID_31165801_5B33_4e47_B39A_04F149020988" seqno="26" style="DUID=49A17B1D;"/>
 					<element geometry="Left=560;Top=294;Right=835;Bottom=371;" subject="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D" seqno="27" style="DUID=766CBAE1;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=354;Top=750;Right=444;Bottom=793;" subject="EAID_21477DFB_067C_4dd2_AF25_AB05D2C71CC1" seqno="28" style="DUID=85F184D3;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1076;Top=480;Right=1247;Bottom=542;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="29" style="DUID=E55DC604;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1076;Top=480;Right=1255;Bottom=555;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="29" style="DUID=E55DC604;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=226;Top=747;Right=314;Bottom=797;" subject="EAID_0E6B28F7_3701_4b88_A833_0CAE48C1A9B8" seqno="30" style="DUID=1D30583F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1159;Top=238;Right=1255;Bottom=303;" subject="EAID_02014F61_A766_467e_BD3D_7F41689C651B" seqno="31" style="DUID=37DADC3C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="EDGE=1;SX=-4;SY=0;EX=0;EY=-13;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=318:-531$;" subject="EAID_E006DB35_535D_4444_B447_89D7A813874C" style="Mode=3;EOID=6337A339;SOID=62D39C5A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;EX=10;EY=-2;SX=-62;SY=-2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B158E1D7_3CC5_4e64_8D25_C40F0E038224" style="Mode=3;EOID=249491C8;SOID=0BCD7C2C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-16;SY=-1;EX=50;EY=-1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=84:OY=15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-2:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3EE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8" style="Mode=3;EOID=0BCD7C2C;SOID=0D0BC566;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=-39;EY=10;SX=-39;SY=10;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6492D4E3_9631_45d4_9596_5EC3247529A2" style="Mode=3;EOID=02845E7C;SOID=9D88C980;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=1;SY=1;EX=3;EY=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_116B9777_31D7_4d5f_8817_DBE9EF9EC21B" style="Mode=3;EOID=9D019E0D;SOID=330BE44D;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=46;SY=0;EX=0;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=998:-644$;" subject="EAID_B61D93A6_A88F_4730_93D5_612F44B8ECE4" style="Mode=3;EOID=249491C8;SOID=A3AD65DA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=0;SY=-13;EX=2;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=127:CY=14:OX=62:OY=-11:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1175:-752$;" subject="EAID_AF66C86B_C371_4afb_8012_8F091434E4D3" style="Mode=3;EOID=A1817E91;SOID=A3AD65DA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=0;SY=10;EX=2;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=127:CY=14:OX=73:OY=13:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1175:-729$;" subject="EAID_A78FA1C1_2940_4ad1_A3A2_FA8F430848B1" style="Mode=3;EOID=0BDE0F7E;SOID=A3AD65DA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=58;SY=0;EX=0;EY=-3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=78:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=762:-411$;" subject="EAID_D65C20FC_D382_4766_9563_4C96020D607C" style="Mode=3;EOID=CE157179;SOID=6337A339;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-66;SY=0;EX=0;EY=-7;$LLB=;LLT=;LMT=;LMB=;LRT=CX=110:CY=14:OX=4:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=631:-431$;" subject="EAID_277C636A_D943_484f_A80D_69ACBFA6147C" style="Mode=3;EOID=99EC8E8D;SOID=6337A339;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=4;SX=-3;SY=26;EX=-3;EY=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=198:CY=14:OX=4:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_849B9DC8_4F7D_4023_8EA7_36C327FE63FE" style="Mode=3;EOID=6A739E33;SOID=6337A339;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-16;SY=-1;EX=50;EY=-1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=84:OY=15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-2:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3EE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8" style="Mode=3;EOID=0BCD7C2C;SOID=0D0BC566;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;EX=10;EY=-2;SX=-62;SY=-2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B158E1D7_3CC5_4e64_8D25_C40F0E038224" style="Mode=3;EOID=249491C8;SOID=0BCD7C2C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-14;SY=2;EX=28;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=126:CY=14:OX=79:OY=-24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_76DEFDDE_AF78_4e23_8B84_0C6E8B387AD5" style="Mode=3;EOID=CC50AC73;SOID=D0D3882A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=26;SY=7;EX=26;EY=7;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_110A81E5_E1CC_45be_BCFD_56F87C51B05A" style="Mode=3;EOID=9C69E79D;SOID=9D88C980;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=1;EX=-4;EY=-38;SX=17;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_ACA750D2_84FF_4e07_B735_322F9131A442" style="Mode=3;EOID=766CBAE1;SOID=6337A339;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-3;SY=-1;EX=-3;EY=-1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=71:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_6AE31D37_FF1B_42a0_838A_8319D03108B2" style="Mode=3;EOID=56B6C2B8;SOID=9D88C980;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=1;SX=-4;SY=0;EX=0;EY=-13;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=318:-531$;" subject="EAID_E006DB35_535D_4444_B447_89D7A813874C" style="Mode=3;EOID=6337A339;SOID=62D39C5A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;SX=-68;SY=0;EX=-19;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=117:CY=14:OX=66:OY=-18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F088C989_3EAB_4eb9_BFCB_B139EAFC4E19" style="Mode=3;EOID=1D30583F;SOID=62D39C5A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;SX=102;SY=0;EX=0;EY=21;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=54:OY=-27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_FBEE0DFA_2173_46d4_8277_F34E55D2B1A0" style="Mode=3;EOID=85F184D3;SOID=62D39C5A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_608CC8C6_3A48_4541_8467_9DDA71E8D534" style="Mode=3;EOID=76D9FB14;SOID=E55DC604;Color=-1;LWidth=0;Hidden=1;"/>
@@ -50013,8 +52410,8 @@
 					<element geometry="EX=26;EY=6;SX=43;SY=-1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=105:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_55771AD3_C775_4324_AEBA_EA277D05F7E8" style="Mode=3;EOID=76D9FB14;SOID=E55DC604;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-26;SY=0;EX=0;EY=5;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=20:OY=-5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_FC7073E1_3362_472f_B087_27A619B6C819" style="Mode=3;EOID=6337A339;SOID=E55DC604;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-1;SY=0;EX=0;EY=-28;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=15:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=951:-546$;" subject="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4" style="Mode=3;EOID=6337A339;SOID=56B6C2B8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;EX=-4;EY=-38;SX=17;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_ACA750D2_84FF_4e07_B735_322F9131A442" style="Mode=3;EOID=766CBAE1;SOID=6337A339;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=39;SY=-2;EX=-12;EY=-2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=51:OY=16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_91E24989_0AB1_44de_AF48_1EE54018D9E5" style="Mode=3;EOID=37DADC3C;SOID=CE157179;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=4;SX=-3;SY=26;EX=-3;EY=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=198:CY=14:OX=4:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_849B9DC8_4F7D_4023_8EA7_36C327FE63FE" style="Mode=3;EOID=6A739E33;SOID=6337A339;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;SCME=1;SCTR=1;SCTR.LEFT=924;SCTR.TOP=-266;SCTR.RIGHT=1026;SCTR.BOTTOM=-187;$LLB=;LLT=;LMT=;LMB=;LRT=CX=114:CY=14:OX=1:OY=5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=924:-235$924:-266$1026:-266$1026:-235$;" subject="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F" style="Mode=2;EOID=02845E7C;SOID=02845E7C;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=758;SCTR.TOP=-632;SCTR.RIGHT=800;SCTR.BOTTOM=-590;$LLB=;LLT=;LMT=;LMB=;LRT=CX=140:CY=14:OX=137:OY=-7:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=776:-632$800:-632$800:-590$758:-590$758:-627$;" subject="EAID_A04862A6_080C_43b0_8DCE_04D577B2D3F0" style="Mode=3;EOID=249491C8;SOID=249491C8;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-26;SY=0;EX=0;EY=4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1386:-587$;" subject="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=56B6C2B8;SOID=9C69E79D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=9;EX=0;EY=4;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1699:-212$1699:-521$;" subject="EAID_7F56C70D_D0B9_4ad4_9CB4_9A6821D5E3E1" style="Mode=3;EOID=76D9FB14;SOID=8D7CBD11;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -50022,34 +52419,35 @@
 					<element geometry="SX=-22;SY=0;EX=-20;EY=-1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=128:CY=14:OX=83:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_A7C105EE_0251_4249_919A_46302D44059E" style="Mode=3;EOID=34BEC823;SOID=8D7CBD11;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=3;SY=3;EX=3;EY=3;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=116:CY=14:OX=23:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=1:OY=6:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_6D204966_4BC2_452d_9B78_BA9B3F1E9FF6" style="Mode=3;EOID=02845E7C;SOID=8D7CBD11;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=1;SY=-1;EX=1;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_2CEA69E5_ADCD_4af6_94C4_FD1CAF5CCC27" style="Mode=3;EOID=4B6CD2C8;SOID=04D2F43F;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EX=-39;EY=10;SX=-39;SY=10;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6492D4E3_9631_45d4_9596_5EC3247529A2" style="Mode=3;EOID=02845E7C;SOID=9D88C980;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=71:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_85CFCF08_3F48_4102_8A68_8655E9F9B47E" style="Mode=3;EOID=5D18EEDB;SOID=CE157179;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-51;SY=0;EX=0;EY=-31;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1124:-231$;" subject="EAID_FAC59FEE_3DE7_4de1_BCBE_35DFB0CE066A" style="Mode=3;EOID=02845E7C;SOID=CE157179;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=0;SY=4;EX=-82;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=78:CY=14:OX=32:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1093:-337$;" subject="EAID_5879D937_81BB_4b88_BC30_54B777A7B4B8" style="Mode=3;EOID=CE157179;SOID=9D88C980;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;SCME=1;SCTR=1;SCTR.LEFT=924;SCTR.TOP=-266;SCTR.RIGHT=1026;SCTR.BOTTOM=-187;$LLB=;LLT=;LMT=;LMB=;LRT=CX=114:CY=14:OX=1:OY=5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=924:-235$924:-266$1026:-266$1026:-235$;" subject="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F" style="Mode=2;EOID=02845E7C;SOID=02845E7C;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=39;SY=-2;EX=-12;EY=-2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=51:OY=16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_91E24989_0AB1_44de_AF48_1EE54018D9E5" style="Mode=3;EOID=37DADC3C;SOID=CE157179;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-4;SY=0;EX=-4;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_03FC1FD2_BDF5_4ae5_8D8D_679E9486EE84" style="Mode=3;EOID=6337A339;SOID=249491C8;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EX=54;EY=0;SX=0;SY=19;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=77:CY=14:OX=44:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1576:-181$;" subject="EAID_4CC3B6CA_493A_4ff6_BB1B_A5C475115AB1" style="Mode=3;EOID=5D18EEDB;SOID=02845E7C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=33;EX=99;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=41:OY=-13:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1621:-167$;" subject="EAID_527F57B4_08F1_4183_A0A9_C1CCAB84A53A" style="Mode=3;EOID=76D9FB14;SOID=02845E7C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-2;SY=1;EX=-2;EY=2;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=39:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D84D8FB5_6889_47af_B88A_A418F4281BF1" style="Mode=3;EOID=49A17B1D;SOID=766CBAE1;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-9;SY=0;EX=0;EY=-7;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=688:-207$;" subject="EAID_C289FCF6_9241_4f06_BF53_F99082792332" style="Mode=3;EOID=02845E7C;SOID=766CBAE1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=20;SY=-2;EX=-67;EY=-10;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=33:OY=-11:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D9C75333_AC70_477b_AA0D_15C3CB11CC0C" style="Mode=3;EOID=76D9FB14;SOID=5D18EEDB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-4;SY=0;EX=0;EY=-27;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=525:-545$;" subject="EAID_E51D25BC_E9FB_423c_BFBF_00E3B99864B4" style="Mode=3;EOID=6337A339;SOID=D0D3882A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-4;SY=0;EX=-4;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_03FC1FD2_BDF5_4ae5_8D8D_679E9486EE84" style="Mode=3;EOID=6337A339;SOID=249491C8;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-51;SY=0;EX=0;EY=-31;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1124:-231$;" subject="EAID_FAC59FEE_3DE7_4de1_BCBE_35DFB0CE066A" style="Mode=3;EOID=02845E7C;SOID=CE157179;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-14;SY=2;EX=28;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=126:CY=14:OX=79:OY=-24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_76DEFDDE_AF78_4e23_8B84_0C6E8B387AD5" style="Mode=3;EOID=CC50AC73;SOID=D0D3882A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-12;SY=-4;EX=-12;EY=-4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=95:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9FA89CC9_D9FD_4f2e_9237_C215D347E620" style="Mode=3;EOID=E55DC604;SOID=9D88C980;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=71:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_85CFCF08_3F48_4102_8A68_8655E9F9B47E" style="Mode=3;EOID=5D18EEDB;SOID=CE157179;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_663B1240_A872_4795_A9D6_7CAF8E182298">
 				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" localID="402" owner="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" tpos="1"/>
 				<properties name="procurement criteria summary" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-01-24 17:17:32" modified="2023-12-12 18:19:31"/>
+				<project author="andreea" version="1.0" created="2023-01-24 17:17:32" modified="2024-05-02 16:45:10"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=248E5F18;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=4E02EC1F;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=167;Top=612;Right=272;Bottom=682;" subject="EAID_38BC5625_EAC0_4eb0_807A_C15FA10B40F7" seqno="1" style="DUID=F8B8810D;"/>
+					<element geometry="Left=167;Top=612;Right=300;Bottom=646;" subject="EAID_38BC5625_EAC0_4eb0_807A_C15FA10B40F7" seqno="1" style="DUID=F8B8810D;"/>
 					<element geometry="Left=1084;Top=597;Right=1228;Bottom=631;" subject="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD" seqno="2" style="DUID=189484D7;"/>
 					<element geometry="Left=370;Top=562;Right=629;Bottom=632;" subject="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89" seqno="3" style="DUID=0FCF8D83;"/>
-					<element geometry="Left=806;Top=926;Right=916;Bottom=996;" subject="EAID_FB996CB7_0FB9_4a30_8AA0_0ABAC3D0F2BD" seqno="4" style="DUID=39A0D894;"/>
+					<element geometry="Left=809;Top=926;Right=919;Bottom=996;" subject="EAID_FB996CB7_0FB9_4a30_8AA0_0ABAC3D0F2BD" seqno="4" style="DUID=39A0D894;"/>
 					<element geometry="Left=656;Top=926;Right=777;Bottom=996;" subject="EAID_E47E88D6_0393_469c_89FB_39DC4844FBCE" seqno="5" style="DUID=99EC57A4;"/>
 					<element geometry="Left=334;Top=926;Right=624;Bottom=996;" subject="EAID_CACB5357_5E4E_455f_8BFF_A7D6264C2555" seqno="6" style="DUID=31881648;"/>
 					<element geometry="Left=1678;Top=741;Right=1768;Bottom=801;" subject="EAID_0E6B28F7_3701_4b88_A833_0CAE48C1A9B8" seqno="7" style="DUID=4429CFC5;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
@@ -50087,7 +52485,7 @@
 					<element geometry="SX=-30;SY=0;EX=0;EY=-4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=131:-483$;" subject="EAID_EE3FD9AF_3712_4b11_9970_82968E7EB99F" style="Mode=3;EOID=DF620384;SOID=AC7D117D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;EX=0;EY=0;SX=-25;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1042:-614$;" subject="EAID_B158E1D7_3CC5_4e64_8D25_C40F0E038224" style="Mode=3;EOID=189484D7;SOID=F51CFB6B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-7;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=709:-597$;" subject="EAID_8D1FC032_83F1_4753_BF39_B673852D3F9A" style="Mode=3;EOID=0FCF8D83;SOID=B7404CE5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=1;SY=0;EX=0;EY=-32;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=220:-511$;" subject="EAID_30D2C78D_A7B9_4e68_B307_2638D65D637C" style="Mode=3;EOID=DF620384;SOID=F8B8810D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-3;SY=0;EX=0;EY=-32;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=230:-511$;" subject="EAID_30D2C78D_A7B9_4e68_B307_2638D65D637C" style="Mode=3;EOID=DF620384;SOID=F8B8810D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=-3:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-3:OY=7:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=C3339DC0;SOID=308C4521;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EX=0;EY=0;EDGE=3;SX=2;SY=-2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=176:CY=14:OX=95:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_DB9BB27E_7F36_41c3_8166_36C3538F2F3A" style="Mode=3;EOID=DF620384;SOID=308C4521;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=78:OY=-28:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4" style="Mode=3;EOID=2C3B86E8;SOID=C3339DC0;Color=-1;LWidth=0;Hidden=0;"/>
@@ -50143,26 +52541,28 @@
 			<diagram xmi:id="EAID_D7F91EFA_588B_4ede_B41F_FFC57647CF02">
 				<model package="EAPK_FE3FEF05_DD69_4fca_A8A4_6F0FCF36A9C1" localID="241" owner="EAPK_FE3FEF05_DD69_4fca_A8A4_6F0FCF36A9C1"/>
 				<properties name="strategic procurement relations" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-01-18 14:07:00" modified="2023-07-13 07:03:27"/>
+				<project author="lps" version="1.0" created="2022-01-18 14:07:00" modified="2024-07-18 16:15:26"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=850;DocSize.cy=1098;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=1;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=6B843AD2;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=45947E90;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=24;Top=264;Right=242;Bottom=334;" subject="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0" seqno="1" style="DUID=AC7E9B01;"/>
-					<element geometry="Left=42;Top=429;Right=132;Bottom=489;" subject="EAID_F565346A_74A1_4bf9_82F9_EE632CBBD88D" seqno="2" style="DUID=0905FDBF;"/>
-					<element geometry="Left=234;Top=429;Right=324;Bottom=489;" subject="EAID_63483BB6_C796_4631_87DA_3F3808C4744F" seqno="3" style="DUID=CA26C73C;"/>
-					<element geometry="Left=520;Top=421;Right=610;Bottom=496;" subject="EAID_B81500F4_C78F_4431_A0DA_EA1E43E5C728" seqno="4" style="DUID=44193417;"/>
-					<element geometry="Left=178;Top=74;Right=410;Bottom=211;" subject="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" seqno="5" style="DUID=9134ADDE;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1005;Top=113;Right=1095;Bottom=173;" subject="EAID_DFCCF9E6_D161_4a4e_8468_6429D56A1496" seqno="6" style="DUID=BB3A8477;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=384;Top=421;Right=474;Bottom=496;" subject="EAID_BF1B4E2A_7D4A_4247_8B45_5AD2427938E3" seqno="7" style="DUID=DE6DEE5D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=850;Top=422;Right=940;Bottom=497;" subject="EAID_53AB9EFA_0DDD_4512_8CA7_9D132E537955" seqno="8" style="DUID=26C908DE;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=675;Top=422;Right=765;Bottom=497;" subject="EAID_6C0716CF_8E33_4ea7_972F_AB425AA26120" seqno="9" style="DUID=99EE96CC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=576;Top=103;Right=864;Bottom=173;" subject="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA" seqno="10" style="DUID=5003271B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=829;Top=264;Right=962;Bottom=334;" subject="EAID_2DF96E3A_E135_465d_908F_EAB3689291DE" seqno="11" style="DUID=166F71BF;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=651;Top=264;Right=789;Bottom=334;" subject="EAID_EC3D2F66_1FC6_4b4c_AAD2_04A3726B2332" seqno="12" style="DUID=EC4A0A07;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=384;Top=264;Right=610;Bottom=334;" subject="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4" seqno="13" style="DUID=7D859619;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=591;Top=93;Right=853;Bottom=163;" subject="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" seqno="1" style="DUID=48DDA79B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=25;Top=379;Right=243;Bottom=449;" subject="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0" seqno="2" style="DUID=AC7E9B01;"/>
+					<element geometry="Left=44;Top=544;Right=134;Bottom=604;" subject="EAID_F565346A_74A1_4bf9_82F9_EE632CBBD88D" seqno="3" style="DUID=0905FDBF;"/>
+					<element geometry="Left=236;Top=544;Right=326;Bottom=604;" subject="EAID_63483BB6_C796_4631_87DA_3F3808C4744F" seqno="4" style="DUID=CA26C73C;"/>
+					<element geometry="Left=522;Top=536;Right=612;Bottom=611;" subject="EAID_B81500F4_C78F_4431_A0DA_EA1E43E5C728" seqno="5" style="DUID=44193417;"/>
+					<element geometry="Left=195;Top=184;Right=427;Bottom=321;" subject="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" seqno="6" style="DUID=9134ADDE;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1007;Top=223;Right=1097;Bottom=283;" subject="EAID_DFCCF9E6_D161_4a4e_8468_6429D56A1496" seqno="7" style="DUID=BB3A8477;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=386;Top=536;Right=476;Bottom=611;" subject="EAID_BF1B4E2A_7D4A_4247_8B45_5AD2427938E3" seqno="8" style="DUID=DE6DEE5D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=852;Top=537;Right=942;Bottom=612;" subject="EAID_53AB9EFA_0DDD_4512_8CA7_9D132E537955" seqno="9" style="DUID=26C908DE;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=677;Top=537;Right=767;Bottom=612;" subject="EAID_6C0716CF_8E33_4ea7_972F_AB425AA26120" seqno="10" style="DUID=99EE96CC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=578;Top=218;Right=866;Bottom=288;" subject="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA" seqno="11" style="DUID=5003271B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=831;Top=379;Right=964;Bottom=449;" subject="EAID_2DF96E3A_E135_465d_908F_EAB3689291DE" seqno="12" style="DUID=166F71BF;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=653;Top=379;Right=791;Bottom=449;" subject="EAID_EC3D2F66_1FC6_4b4c_AAD2_04A3726B2332" seqno="13" style="DUID=EC4A0A07;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=386;Top=379;Right=612;Bottom=449;" subject="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4" seqno="14" style="DUID=7D859619;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=133:CY=14:OX=72:OY=-23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_32F239DB_02BC_456a_934F_BBF695929296" style="Mode=3;EOID=5003271B;SOID=48DDA79B;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=91;SY=12;EX=0;EY=-8;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=137:CY=14:OX=0:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=4:OY=6:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1BB31111_F63D_4464_AA32_D22B32C1DF1F" style="Mode=3;EOID=BB3A8477;SOID=5003271B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_857D08F9_84F2_4d98_8718_882951247DF8" style="Mode=3;EOID=5003271B;SOID=166F71BF;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=98:CY=14:OX=42:OY=-26:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_5C87BC92_AF78_4f16_994C_2F6853BD9DA7" style="Mode=3;EOID=26C908DE;SOID=166F71BF;Color=-1;LWidth=0;Hidden=0;"/>
@@ -50171,9 +52571,9 @@
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C15E132C_206B_4dd4_976E_204541847F5F" style="Mode=3;EOID=5003271B;SOID=7D859619;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=3;SX=-53;SY=-1;EX=-41;EY=-2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=98:CY=14:OX=40:OY=-16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9E45040E_9573_4ec2_971F_0407E27D9413" style="Mode=3;EOID=DE6DEE5D;SOID=7D859619;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=68;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=98:CY=14:OX=52:OY=-16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_6AA28D6E_E3E3_40d8_A409_4F5F708BC856" style="Mode=3;EOID=44193417;SOID=7D859619;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=5;SY=6;EX=5;EY=6;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=134:CY=14:OX=-2:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0BE43E48_CB11_4fae_87F3_C0ACAEAF591C" style="Mode=3;EOID=7D859619;SOID=AC7E9B01;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=5;SY=6;EX=5;EY=6;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=134:CY=14:OX=-2:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0BE43E48_CB11_4fae_87F3_C0ACAEAF591C" style="Mode=3;EOID=7D859619;SOID=AC7E9B01;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-63;SY=0;EX=0;EY=30;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=209:CY=14:OX=92:OY=-33:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_78ABF07D_FFDF_40a2_8CAF_4B1C7067546E" style="Mode=3;EOID=0905FDBF;SOID=AC7E9B01;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=-22;EX=2;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=197:CY=14:OX=107:OY=-53:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=281:-321$;" subject="EAID_8F9F898E_D644_43bd_B368_6604C3E040EC" style="Mode=3;EOID=CA26C73C;SOID=AC7E9B01;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-22;EX=2;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=197:CY=14:OX=107:OY=-53:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=283:-436$;" subject="EAID_8F9F898E_D644_43bd_B368_6604C3E040EC" style="Mode=3;EOID=CA26C73C;SOID=AC7E9B01;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=-10;EX=0;EY=13;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=133:CY=14:OX=-3:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_81D470D5_433B_4242_826E_974C4A3AEF87" style="Mode=3;EOID=5003271B;SOID=9134ADDE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
@@ -50391,20 +52791,20 @@
 			<diagram xmi:id="EAID_BA4823EC_F40E_4a51_9CF7_44FE733FB842">
 				<model package="EAPK_8E7CCB8A_70DE_4968_ADF7_A3665D04BE4C" localID="465" owner="EAPK_8E7CCB8A_70DE_4968_ADF7_A3665D04BE4C" tpos="1"/>
 				<properties name="award decision" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-05-24 14:38:17" modified="2024-03-12 12:21:43"/>
+				<project author="andreea" version="1.0" created="2023-05-24 14:38:17" modified="2024-03-19 16:44:31"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=0258B704;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=F9F70156;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
 					<element geometry="Left=553;Top=227;Right=755;Bottom=351;" subject="EAID_E7437025_771F_4143_BE33_620A29646687" seqno="1" style="DUID=D42AD2D4;"/>
 					<element geometry="Left=484;Top=682;Right=751;Bottom=780;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="2" style="DUID=9C99D9AD;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=136;Top=393;Right=451;Bottom=673;" subject="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" seqno="3" style="DUID=5CE6B36A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=136;Top=397;Right=451;Bottom=677;" subject="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" seqno="3" style="DUID=5CE6B36A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=167;Top=96;Right=386;Bottom=181;" subject="EAID_96B284C4_E759_4bad_9655_04521F703750" seqno="4" style="DUID=599DFC51;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=934;Top=281;Right=1112;Bottom=351;" subject="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B" seqno="5" style="DUID=C9A9B5B0;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=127;Top=218;Right=283;Bottom=258;" subject="EAID_D46376EC_6B98_4926_8627_A594E6819D78" seqno="6" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=893457AA;"/>
-					<element geometry="Left=127;Top=265;Right=283;Bottom=311;" subject="EAID_B63C4BE8_86E2_494f_AB88_882E3568B3F0" seqno="7" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=619149A5;"/>
+					<element geometry="Left=136;Top=218;Right=292;Bottom=258;" subject="EAID_D46376EC_6B98_4926_8627_A594E6819D78" seqno="6" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=893457AA;"/>
+					<element geometry="Left=136;Top=266;Right=292;Bottom=312;" subject="EAID_B63C4BE8_86E2_494f_AB88_882E3568B3F0" seqno="7" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=619149A5;"/>
 					<element geometry="Left=517;Top=102;Right=790;Bottom=177;" subject="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" seqno="8" style="DUID=10CDB39A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=482;Top=397;Right=755;Bottom=459;" subject="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" seqno="9" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=54EF8080;"/>
 					<element geometry="Left=773;Top=397;Right=946;Bottom=443;" subject="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" seqno="10" style="NSL=0;DUID=5DDB9FE8;"/>
@@ -50500,52 +52900,54 @@
 			<diagram xmi:id="EAID_9733D0B6_5004_4cc0_BF32_0BF92C0A41A3">
 				<model package="EAPK_A1BB437B_AD73_4f28_B11F_4B624C467CDA" localID="330" owner="EAPK_A1BB437B_AD73_4f28_B11F_4B624C467CDA" tpos="1"/>
 				<properties name="contextual information hierarchy" type="Logical"/>
-				<project author="andreea" version="1.0" created="2022-04-28 16:11:30" modified="2024-07-09 15:59:12"/>
+				<project author="andreea" version="1.0" created="2022-04-28 16:11:30" modified="2024-07-23 10:45:27"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=1;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=D24A77E5;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=ED52C4D4;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=1239;Top=104;Right=1487;Bottom=174;" subject="EAID_3E3C6304_E823_43a1_8914_2046342E8F96" seqno="1" style="DUID=A6D98C93;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=23;Top=220;Right=243;Bottom=290;" subject="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" seqno="2" style="DUID=6CD0F0F7;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1530;Top=277;Right=1706;Bottom=337;" subject="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" seqno="3" style="DUID=06F8A2B8;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1672;Top=175;Right=1792;Bottom=215;" subject="EAID_E7437025_771F_4143_BE33_620A29646687" seqno="4" style="DUID=6A8D9C24;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=726;Top=431;Right=877;Bottom=463;" subject="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" seqno="5" style="NSL=0;DUID=26245ACA;"/>
-					<element geometry="Left=1779;Top=11;Right=1946;Bottom=55;" subject="EAID_B2165393_B24C_4dd7_A2E2_DE976E538481" seqno="6" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=7B8BB6F1;"/>
-					<element geometry="Left=210;Top=345;Right=525;Bottom=615;" subject="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" seqno="7" style="NSL=0;DUID=CE046FB5;"/>
-					<element geometry="Left=537;Top=345;Right=785;Bottom=404;" subject="EAID_92AE6E92_3A20_4642_A531_93ABFC476500" seqno="8" style="NSL=0;DUID=FE487147;"/>
-					<element geometry="Left=825;Top=11;Right=1001;Bottom=55;" subject="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0" seqno="9" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=B74FB2BB;"/>
-					<element geometry="Left=1954;Top=175;Right=2132;Bottom=245;" subject="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B" seqno="10" style="DUID=46A73781;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=656;Top=157;Right=788;Bottom=212;" subject="EAID_4F81C811_16F5_4332_BAEA_9843D331872F" seqno="11" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=4E69EBD9;"/>
-					<element geometry="Left=270;Top=212;Right=490;Bottom=297;" subject="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E" seqno="12" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=BB5E4268;"/>
-					<element geometry="Left=1741;Top=277;Right=1999;Bottom=337;" subject="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" seqno="13" style="DUID=A79CB4B9;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=942;Top=438;Right=1240;Bottom=484;" subject="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" seqno="14" style="DUID=7553E5B5;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=620;Top=267;Right=824;Bottom=326;" subject="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A" seqno="15" style="NSL=0;DUID=E7EF30DB;"/>
-					<element geometry="Left=222;Top=119;Right=312;Bottom=159;" subject="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897" seqno="16" style="DUID=1A525DBC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=834;Top=369;Right=978;Bottom=415;" subject="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" seqno="17" style="NSL=0;DUID=3DA47E39;"/>
-					<element geometry="Left=1221;Top=204;Right=1504;Bottom=305;" subject="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" seqno="18" style="DUID=8C5A0688;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1185;Top=346;Right=1407;Bottom=416;" subject="EAID_1062E1ED_D094_425e_B51B_9E700090C968" seqno="19" style="DUID=71DE7828;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C3A36A4B_DBA9_4b46_B3E4_2E8899DEDCE9" style="Mode=3;EOID=7B8BB6F1;SOID=6A8D9C24;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="Left=1032;Top=532;Right=1300;Bottom=602;" subject="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7" seqno="1" style="NSL=0;DUID=DFEE4EE6;"/>
+					<element geometry="Left=1404;Top=119;Right=1652;Bottom=189;" subject="EAID_3E3C6304_E823_43a1_8914_2046342E8F96" seqno="2" style="DUID=A6D98C93;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=54;Top=235;Right=274;Bottom=305;" subject="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" seqno="3" style="DUID=6CD0F0F7;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1695;Top=292;Right=1871;Bottom=352;" subject="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" seqno="4" style="DUID=06F8A2B8;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1837;Top=190;Right=1957;Bottom=230;" subject="EAID_E7437025_771F_4143_BE33_620A29646687" seqno="5" style="DUID=6A8D9C24;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=891;Top=446;Right=1042;Bottom=478;" subject="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" seqno="6" style="NSL=0;DUID=26245ACA;"/>
+					<element geometry="Left=1944;Top=26;Right=2111;Bottom=70;" subject="EAID_B2165393_B24C_4dd7_A2E2_DE976E538481" seqno="7" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=7B8BB6F1;"/>
+					<element geometry="Left=375;Top=360;Right=690;Bottom=630;" subject="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" seqno="8" style="NSL=0;DUID=CE046FB5;"/>
+					<element geometry="Left=702;Top=360;Right=950;Bottom=419;" subject="EAID_92AE6E92_3A20_4642_A531_93ABFC476500" seqno="9" style="NSL=0;DUID=FE487147;"/>
+					<element geometry="Left=990;Top=26;Right=1166;Bottom=70;" subject="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0" seqno="10" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=B74FB2BB;"/>
+					<element geometry="Left=2119;Top=190;Right=2297;Bottom=260;" subject="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B" seqno="11" style="DUID=46A73781;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=821;Top=172;Right=953;Bottom=227;" subject="EAID_4F81C811_16F5_4332_BAEA_9843D331872F" seqno="12" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=4E69EBD9;"/>
+					<element geometry="Left=324;Top=219;Right=592;Bottom=320;" subject="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E" seqno="13" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=BB5E4268;"/>
+					<element geometry="Left=1906;Top=292;Right=2164;Bottom=352;" subject="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" seqno="14" style="DUID=A79CB4B9;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1203;Top=457;Right=1501;Bottom=503;" subject="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" seqno="15" style="DUID=7553E5B5;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=785;Top=282;Right=989;Bottom=341;" subject="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A" seqno="16" style="NSL=0;DUID=E7EF30DB;"/>
+					<element geometry="Left=294;Top=133;Right=384;Bottom=173;" subject="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897" seqno="17" style="DUID=1A525DBC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=999;Top=384;Right=1143;Bottom=430;" subject="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" seqno="18" style="NSL=0;DUID=3DA47E39;"/>
+					<element geometry="Left=1386;Top=219;Right=1669;Bottom=320;" subject="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" seqno="19" style="DUID=8C5A0688;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1300;Top=340;Right=1522;Bottom=410;" subject="EAID_1062E1ED_D094_425e_B51B_9E700090C968" seqno="20" style="DUID=71DE7828;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_36C907D3_6701_4489_9BBA_3C0E1D4E25A8" style="Mode=3;EOID=6A8D9C24;SOID=06F8A2B8;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F5BE64C7_3F6B_4881_AB89_9342AF882E95" style="Mode=3;EOID=6A8D9C24;SOID=CE046FB5;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=1;EX=0;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_5ACD6A3D_7AA3_4504_8B13_015B01092BC2" style="Mode=3;EOID=B74FB2BB;SOID=26245ACA;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;EX=9;EY=-17;SX=3;SY=22;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_5C3A7045_BE74_49aa_ADDD_37AEDF27D9E0" style="Mode=3;EOID=B74FB2BB;SOID=3DA47E39;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-76;SY=0;EX=0;EY=-24;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=585:-208$;" subject="EAID_3777662E_A9D8_4d59_AF6E_5DFBB174C5FA" style="Mode=3;EOID=4E69EBD9;SOID=FE487147;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-76;SY=0;EX=0;EY=-24;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=750:-223$;" subject="EAID_3777662E_A9D8_4d59_AF6E_5DFBB174C5FA" style="Mode=3;EOID=4E69EBD9;SOID=FE487147;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_29EB89B4_BF73_4250_B00A_CDF53D99CBCD" style="Mode=3;EOID=E7EF30DB;SOID=FE487147;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D24BB7D7_DC9F_43ad_AB2C_BEEC4E3BED13" style="Mode=3;EOID=1A525DBC;SOID=BB5E4268;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-14;SY=-3;EX=1;EY=-3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_484BA28E_0C28_4b4b_B440_E1E735697188" style="Mode=3;EOID=4E69EBD9;SOID=E7EF30DB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=136;SY=0;EX=0;EY=11;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=503:-173$;" subject="EAID_31D3A42A_B28E_449d_AF5F_9D6CCD87E6A1" style="Mode=3;EOID=4E69EBD9;SOID=CE046FB5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_AF4C01E9_6CF5_410f_83E6_3CAF530D5403" style="Mode=3;EOID=46A73781;SOID=6A8D9C24;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="EDGE=1;EX=53;EY=-21;SX=-105;SY=33;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_450148E7_98E2_4642_9EE2_203242F5A4D8" style="Mode=3;EOID=B74FB2BB;SOID=71DE7828;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_36C907D3_6701_4489_9BBA_3C0E1D4E25A8" style="Mode=3;EOID=6A8D9C24;SOID=06F8A2B8;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F241B2E1_47C3_4512_8EBE_A60BD8ED070A" style="Mode=3;EOID=6A8D9C24;SOID=A79CB4B9;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=105;SY=0;EX=0;EY=10;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=637:-189$;" subject="EAID_31D3A42A_B28E_449d_AF5F_9D6CCD87E6A1" style="Mode=3;EOID=4E69EBD9;SOID=CE046FB5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C3A36A4B_DBA9_4b46_B3E4_2E8899DEDCE9" style="Mode=3;EOID=7B8BB6F1;SOID=6A8D9C24;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;EX=53;EY=-21;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_450148E7_98E2_4642_9EE2_203242F5A4D8" style="Mode=3;EOID=B74FB2BB;SOID=71DE7828;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F08185C3_E8E6_4c0c_A2A4_E3D451902197" style="Mode=3;EOID=1A525DBC;SOID=6CD0F0F7;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_7D7F08FC_F309_4a60_B76D_8B1B3FFE038A" style="Mode=3;EOID=B74FB2BB;SOID=A6D98C93;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=15;SY=2;EX=21;EY=-21;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D144C8C1_24F9_4de5_AD13_CFEBA70F68FD" style="Mode=3;EOID=B74FB2BB;SOID=DFEE4EE6;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-140;SY=-2;EX=67;EY=-21;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_1DAFA4D2_EE54_4246_A132_FC5F510A59ED" style="Mode=3;EOID=B74FB2BB;SOID=8C5A0688;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_356035E1_7546_4bda_9685_286F5A33ED5A" style="Mode=3;EOID=B74FB2BB;SOID=4E69EBD9;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=17;SY=-12;EX=-69;EY=-22;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C1CAAF14_976F_4d28_938A_6ECEC8F64316" style="Mode=3;EOID=B74FB2BB;SOID=1A525DBC;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=14;SY=0;EX=14;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C3A99946_EA61_4bb4_BBB2_994F422EB5DD" style="Mode=3;EOID=7B8BB6F1;SOID=46A73781;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;EX=38;EY=-21;SX=-31;SY=7;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_CAF4D83B_854B_440e_83CF_1BD4AAE5F1B9" style="Mode=3;EOID=B74FB2BB;SOID=7553E5B5;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F241B2E1_47C3_4512_8EBE_A60BD8ED070A" style="Mode=3;EOID=6A8D9C24;SOID=A79CB4B9;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_AF4C01E9_6CF5_410f_83E6_3CAF530D5403" style="Mode=3;EOID=46A73781;SOID=6A8D9C24;Color=-1;LWidth=0;Hidden=1;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_F9A67D0E_2ACB_45b8_833F_A797EB7E372E">
@@ -50626,27 +53028,27 @@
 			<diagram xmi:id="EAID_86147DF4_1EF7_40c5_9C93_8A5889DDC756">
 				<model package="EAPK_E19AEFF3_60AD_4531_8112_3046FA0BBC58" localID="328" owner="EAPK_E19AEFF3_60AD_4531_8112_3046FA0BBC58" tpos="2"/>
 				<properties name="documents relations" type="Logical"/>
-				<project author="andreea" version="1.0" created="2022-04-26 15:13:18" modified="2023-09-01 18:11:16"/>
+				<project author="andreea" version="1.0" created="2022-04-26 15:13:18" modified="2024-07-23 10:46:34"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=1;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=C6696355;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=11BA042D;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
 					<element geometry="Left=91;Top=382;Right=181;Bottom=442;" subject="EAID_C07688A9_AAC8_4f60_A2CC_FA90C006C282" seqno="1" style="DUID=5EF534BF;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1130;Top=373;Right=1245;Bottom=401;" subject="EAID_23E9784F_4AEE_4484_9BAC_28A7FEB05838" seqno="2" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=64010528;"/>
-					<element geometry="Left=1257;Top=330;Right=1473;Bottom=400;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="3" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=624B89A7;"/>
+					<element geometry="Left=1181;Top=291;Right=1397;Bottom=361;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="3" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=624B89A7;"/>
 					<element geometry="Left=902;Top=755;Right=1175;Bottom=817;" subject="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" seqno="4" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=D92E6D3F;"/>
 					<element geometry="Left=1055;Top=651;Right=1258;Bottom=713;" subject="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" seqno="5" style="NSL=0;DUID=E6D49A5D;"/>
 					<element geometry="Left=454;Top=658;Right=673;Bottom=720;" subject="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" seqno="6" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=F696E1E8;"/>
 					<element geometry="Left=635;Top=466;Right=725;Bottom=500;" subject="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF" seqno="7" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=7F2BB6AE;"/>
 					<element geometry="Left=91;Top=492;Right=181;Bottom=606;" subject="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" seqno="8" style="DUID=64F017B9;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=732;Top=31;Right=916;Bottom=101;" subject="EAID_4AE23ED9_1639_41e0_A758_C201E2EDE124" seqno="9" style="DUID=75363133;"/>
+					<element geometry="Left=732;Top=56;Right=916;Bottom=101;" subject="EAID_4AE23ED9_1639_41e0_A758_C201E2EDE124" seqno="9" style="DUID=75363133;"/>
 					<element geometry="Left=642;Top=211;Right=656;Bottom=225;" subject="EAID_6288458C_4439_46bc_A898_C99A5E4A62D6" seqno="10" style=" DUID=194C68AE;"/>
 					<element geometry="Left=447;Top=445;Right=461;Bottom=459;" subject="EAID_AC8CC935_389B_479b_B0EA_B6FB8B5C8EB6" seqno="11" style=" DUID=C644E86F;"/>
 					<element geometry="Left=367;Top=492;Right=612;Bottom=632;" subject="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" seqno="12" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=5CE44B2A;"/>
 					<element geometry="Left=1165;Top=500;Right=1270;Bottom=547;" subject="EAID_F72FB743_EDB9_4511_9787_B6F389BACA6B" seqno="13" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=629DEC99;"/>
-					<element geometry="Left=1257;Top=226;Right=1473;Bottom=312;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="14" style="DUID=295AE3C8;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1194;Top=181;Right=1410;Bottom=267;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="14" style="DUID=295AE3C8;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1188;Top=584;Right=1290;Bottom=631;" subject="EAID_A91B204C_7A0E_4608_A8D0_545E069052CC" seqno="15" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=42B7986B;"/>
 					<element geometry="Left=91;Top=668;Right=181;Bottom=720;" subject="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A" seqno="16" style="DUID=CF3FA725;"/>
 					<element geometry="Left=693;Top=181;Right=955;Bottom=386;" subject="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" seqno="17" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=0202DC86;"/>
@@ -50654,7 +53056,7 @@
 					<element geometry="Left=692;Top=632;Right=956;Bottom=733;" subject="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" seqno="19" style="DUID=A2664700;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=470;Top=258;Right=560;Bottom=346;" subject="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90" seqno="20" style="DUID=36A4FCB3;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=746;Top=499;Right=902;Bottom=546;" subject="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" seqno="21" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=59D172A9;"/>
-					<element geometry="SX=40;SY=7;EX=26;EY=-23;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=105:CY=14:OX=18:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_6A9FC4EC_D843_4ffe_84A8_24E86C3ED8AF" style="Mode=3;EOID=36A4FCB3;SOID=0202DC86;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=4;SCTR.LEFT=649;SCTR.TOP=-243;SCTR.RIGHT=696;SCTR.BOTTOM=-194;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=-1:OY=-27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=693:-194$649:-194$649:-243$693:-243$;" subject="EAID_39F3583F_0D40_4e9f_8018_10297955785C" style="Mode=3;EOID=0202DC86;SOID=0202DC86;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=107;SY=30;EX=-27;EY=-102;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B0961C3B_3C3E_4c2a_A3F4_443665C43EB4" style="Mode=3;EOID=0202DC86;SOID=F696E1E8;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=1147;SCTR.TOP=-668;SCTR.RIGHT=1246;SCTR.BOTTOM=-613;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1246:-651$1246:-613$1147:-613$1147:-651$;" subject="EAID_4C33CDC7_EDE9_461d_85E1_1ABB6B9E21EB" style="Mode=3;EOID=E6D49A5D;SOID=E6D49A5D;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=11;SY=-1;EX=57;EY=-68;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9E4FF80B_FFD0_4320_961A_5B6B18435CAA" style="Mode=3;EOID=0202DC86;SOID=E6D49A5D;Color=-1;LWidth=0;Hidden=0;"/>
@@ -50663,33 +53065,34 @@
 					<element geometry="SX=2;SY=-10;EX=2;EY=-10;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_97C17D51_4DF6_4979_B308_C0F08C743DCF" style="Mode=3;EOID=0202DC86;SOID=624B89A7;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-56;SY=5;EX=130;EY=-48;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8521EFF6_74EA_47a5_BE12_0A7FCD4C34D2" style="Mode=3;EOID=0202DC86;SOID=64010528;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=-39;SY=-1;EX=13;EY=-24;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F547C226_B690_4b64_9C04_7ED2CC31BA99" style="Mode=3;EOID=0202DC86;SOID=629DEC99;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=2;SX=6;SY=19;EX=20;EY=33;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=-24:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3AA2C83C_532C_460c_99CE_63F041A42F06" style="Mode=3;EOID=295AE3C8;SOID=0202DC86;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=2;SX=-1;SY=29;EX=-1;EY=-30;$LLB=;LLT=;LMT=;LMB=;LRT=CX=59:CY=14:OX=-21:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1BEBAC59_19C6_4908_B93C_EED975A6974F" style="Mode=3;EOID=295AE3C8;SOID=0202DC86;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;SX=16;SY=35;EX=30;EY=39;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=-24:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3AA2C83C_532C_460c_99CE_63F041A42F06" style="Mode=3;EOID=295AE3C8;SOID=0202DC86;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;SX=-1;SY=34;EX=-1;EY=-25;$LLB=;LLT=;LMT=;LMB=;LRT=CX=59:CY=14:OX=-21:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1BEBAC59_19C6_4908_B93C_EED975A6974F" style="Mode=3;EOID=295AE3C8;SOID=0202DC86;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=114:CY=14:OX=68:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B1894735_8A0D_4eae_BCF0_75001B7FF4D0" style="Mode=3;EOID=75363133;SOID=0202DC86;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=707;SCTR.TOP=-191;SCTR.RIGHT=760;SCTR.BOTTOM=-147;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=54:OY=-37:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=760:-181$760:-147$707:-147$707:-181$;" subject="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9" style="Mode=3;EOID=0202DC86;SOID=0202DC86;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=6;SY=-10;EX=6;EY=-10;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_43A3B220_8C42_4627_B845_A73F67127C06" style="Mode=3;EOID=0202DC86;SOID=7F2BB6AE;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=17;EX=0;EY=16;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=114:CY=14:OX=16:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_AF2EA1D0_30FA_474c_BA0E_2B284F62AB15" style="Mode=3;EOID=36A4FCB3;SOID=0202DC86;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=40;SY=7;EX=26;EY=-23;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=105:CY=14:OX=18:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_6A9FC4EC_D843_4ffe_84A8_24E86C3ED8AF" style="Mode=3;EOID=36A4FCB3;SOID=0202DC86;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=25;SY=34;EX=-28;EY=4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A6577BAD_B1CB_4608_94A0_32241C0F50CE" style="Mode=3;EOID=0202DC86;SOID=5CE44B2A;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=4;SCTR.LEFT=649;SCTR.TOP=-243;SCTR.RIGHT=696;SCTR.BOTTOM=-194;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=-1:OY=-27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=693:-194$649:-194$649:-243$693:-243$;" subject="EAID_39F3583F_0D40_4e9f_8018_10297955785C" style="Mode=3;EOID=0202DC86;SOID=0202DC86;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;SCME=1;SCTR=1;EDGE=1;SCTR.LEFT=901;SCTR.TOP=-310;SCTR.RIGHT=946;SCTR.BOTTOM=-151;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=109:OY=-28:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=946:-181$946:-151$901:-151$901:-181$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=0202DC86;SOID=0202DC86;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=-22;SY=-7;EX=-22;EY=-7;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_7CBD3DD0_176F_4d6c_8821_DE0368FF9C47" style="Mode=3;EOID=0202DC86;SOID=42B7986B;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-33;SY=22;EX=130;EY=-66;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_DCD1791D_6597_41ef_AB35_766470760473" style="Mode=3;EOID=0202DC86;SOID=571B4B3F;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=219:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_08E68AE5_54CB_40f5_8E56_373B9F10194E" style="Mode=3;EOID=36A4FCB3;SOID=571B4B3F;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=1;EX=-7;EY=-41;SX=-6;SY=15;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_29996CD1_F979_44e0_95A0_E058E0BD5450" style="Mode=3;EOID=0202DC86;SOID=59D172A9;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-7;SY=1;EX=-7;EY=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=149:CY=14:OX=80:OY=24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3A1B9223_B1D3_4ffe_B219_FFD9D57F9B43" style="Mode=3;EOID=59D172A9;SOID=A2664700;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=7;SY=0;EX=0;EY=-7;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=461:-225$;" subject="EAID_72F9467C_3D0D_4b12_8FA6_A01D070F8819" style="Mode=3;EOID=194C68AE;SOID=C644E86F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=0;SY=0;EX=0;EY=0;SCTR=1;SCME=1;SCTR.LEFT=422;SCTR.TOP=-493;SCTR.RIGHT=486;SCTR.BOTTOM=-452;$LLB=;LLT=;LMT=;LMB=;LRT=CX=100:CY=14:OX=94:OY=-33:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=486:-492$486:-452$422:-452$422:-492$;" subject="EAID_7EE70932_F57C_4861_BE52_91F3F7270840" style="Mode=3;EOID=5CE44B2A;SOID=5CE44B2A;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=0;SY=0;EX=0;EY=0;SCTR=1;SCME=1;SCTR.LEFT=422;SCTR.TOP=-493;SCTR.RIGHT=486;SCTR.BOTTOM=-452;$LLB=;LLT=;LMT=;LMB=;LRT=CX=100:CY=14:OX=95:OY=-13:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=486:-492$486:-452$422:-452$422:-492$;" subject="EAID_7EE70932_F57C_4861_BE52_91F3F7270840" style="Mode=3;EOID=5CE44B2A;SOID=5CE44B2A;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=22;SY=44;EX=10;EY=26;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=164:CY=14:OX=17:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3561E9C9_899A_4ca7_9CF4_9285C5C0CCEC" style="Mode=3;EOID=64F017B9;SOID=5CE44B2A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-88;SY=0;EX=0;EY=8;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=401:-404$;" subject="EAID_6AA5ADDC_B303_41f6_A0B5_482CD2D1D30D" style="Mode=3;EOID=5EF534BF;SOID=5CE44B2A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=12;SY=-17;EX=1;EY=-21;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=112:CY=14:OX=18:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3BC5D7DE_3CD8_46c6_9B27_A7A4C7B70604" style="Mode=3;EOID=64F017B9;SOID=5CE44B2A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;SX=-91;SY=0;EX=0;EY=-3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=7:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=398:-697$;" subject="EAID_F337974A_F4B7_4be6_BD98_F885B35FD24B" style="Mode=3;EOID=CF3FA725;SOID=5CE44B2A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=707;SCTR.TOP=-191;SCTR.RIGHT=760;SCTR.BOTTOM=-147;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=54:OY=-37:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=760:-181$760:-147$707:-147$707:-181$;" subject="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9" style="Mode=3;EOID=0202DC86;SOID=0202DC86;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=17;EX=0;EY=16;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=114:CY=14:OX=16:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_AF2EA1D0_30FA_474c_BA0E_2B284F62AB15" style="Mode=3;EOID=36A4FCB3;SOID=0202DC86;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_E7ED5A9A_0713_4b4f_9DED_4C911545B779">
 				<model package="EAPK_94194397_D26C_4972_AE3E_34F5B925DA64" localID="314" owner="EAPK_94194397_D26C_4972_AE3E_34F5B925DA64"/>
 				<properties name="contract" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-03-29 15:17:34" modified="2023-07-14 18:06:14"/>
+				<project author="lps" version="1.0" created="2022-03-29 15:17:34" modified="2024-03-19 17:05:29"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=850;DocSize.cy=1098;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=1;HideParents=1;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=68B8FED4;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=59BA5C46;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
@@ -50700,7 +53103,7 @@
 					<element geometry="Left=512;Top=875;Right=602;Bottom=945;" subject="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07" seqno="4" style="DUID=5BE91FA0;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=786;Top=180;Right=929;Bottom=221;" subject="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" seqno="5" style="DUID=B7FA69D7;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=276;Top=880;Right=366;Bottom=940;" subject="EAID_E55F2451_5826_4907_B311_4F37313BAEF6" seqno="6" style="DUID=EFF0C88E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=643;Top=303;Right=827;Bottom=443;" subject="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" seqno="7" style="DUID=D3ACDF45;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=643;Top=303;Right=838;Bottom=443;" subject="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" seqno="7" style="DUID=D3ACDF45;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=576;Top=776;Right=666;Bottom=806;" subject="EAID_3B0D0A49_89AC_495b_B909_CD8CC73898DE" seqno="8" style="DUID=BDD54B7B;"/>
 					<element geometry="Left=152;Top=576;Right=318;Bottom=622;" subject="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C" seqno="9" style="DUID=2E521AF9;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=152;Top=482;Right=318;Bottom=524;" subject="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" seqno="10" style="DUID=D2536334;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
@@ -50708,19 +53111,19 @@
 					<element geometry="Left=152;Top=283;Right=380;Bottom=367;" subject="EAID_96B284C4_E759_4bad_9655_04521F703750" seqno="12" style="DUID=63059561;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=786;Top=462;Right=1010;Bottom=524;" subject="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" seqno="13" style="DUID=21670A9E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=448;Top=457;Right=667;Bottom=547;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="14" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=497441B1;"/>
-					<element geometry="Left=337;Top=622;Right=469;Bottom=658;" subject="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029" seqno="15" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=77B55004;"/>
+					<element geometry="Left=337;Top=639;Right=469;Bottom=675;" subject="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029" seqno="15" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=77B55004;"/>
 					<element geometry="Left=188;Top=387;Right=284;Bottom=434;" subject="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" seqno="16" style="DUID=1CF633C4;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=762;Top=742;Right=1035;Bottom=840;" subject="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" seqno="17" style="DUID=6DBAC0EB;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=392;Top=98;Right=690;Bottom=168;" subject="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" seqno="18" style="DUID=C46157D2;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=797;Top=584;Right=998;Bottom=639;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="19" style="DUID=4B1D4827;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=299;Top=788;Right=431;Bottom=824;" subject="EAID_20289A3C_51F0_43b4_8663_0B6367844B1B" seqno="20" style="DUID=0BD843BD;"/>
-					<element geometry="Left=238;Top=712;Right=469;Bottom=761;" subject="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8" seqno="21" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=5EAB8366;"/>
+					<element geometry="Left=238;Top=727;Right=469;Bottom=757;" subject="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8" seqno="21" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=5EAB8366;"/>
 					<element geometry="SX=4;SY=29;EX=4;EY=29;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=-16:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3AA2C83C_532C_460c_99CE_63F041A42F06" style="Mode=3;EOID=F00561AA;SOID=D3ACDF45;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=129:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_95D11AFD_5F07_4159_ABF2_BA01D9E3FEE4" style="Mode=3;EOID=EFF0C88E;SOID=5BE91FA0;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=70:CY=14:OX=57:OY=-18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_DDBC2835_CD1A_40df_9C2D_9222DAB14E19" style="Mode=3;EOID=5BE91FA0;SOID=497441B1;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=38;EX=4;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=101:CY=14:OX=128:OY=10:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=240:-464$;" subject="EAID_75F02E69_A9AF_47c5_B217_F52FFB1CAD53" style="Mode=3;EOID=1CF633C4;SOID=497441B1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-31;SY=0;EX=0;EY=-9;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=70:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=526:-220$;" subject="EAID_5514DE2C_F8BB_4c6f_9356_F67CF0DAA096" style="Mode=3;EOID=DC7FF254;SOID=497441B1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=812;SCTR.TOP=-322;SCTR.RIGHT=848;SCTR.BOTTOM=-284;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=93:OY=-22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=827:-322$848:-322$848:-284$812:-284$812:-303$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=D3ACDF45;SOID=D3ACDF45;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=812;SCTR.TOP=-322;SCTR.RIGHT=848;SCTR.BOTTOM=-284;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=93:OY=-22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=838:-322$848:-322$848:-284$812:-284$812:-303$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=D3ACDF45;SOID=D3ACDF45;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=618;SCTR.TOP=-325;SCTR.RIGHT=655;SCTR.BOTTOM=-287;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=38:OY=-36:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=655:-303$655:-287$618:-287$618:-325$643:-325$;" subject="EAID_39F3583F_0D40_4e9f_8018_10297955785C" style="Mode=3;EOID=D3ACDF45;SOID=D3ACDF45;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=3;SX=97;SY=0;EX=0;EY=-9;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=-4:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=654:-620$;" subject="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7" style="Mode=3;EOID=4B1D4827;SOID=497441B1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=6;SY=-14;EX=6;EY=-14;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=59:CY=14:OX=-23:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1BEBAC59_19C6_4908_B93C_EED975A6974F" style="Mode=3;EOID=F00561AA;SOID=D3ACDF45;Color=-1;LWidth=0;Hidden=0;"/>
@@ -50732,7 +53135,7 @@
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=105:CY=14:OX=70:OY=12:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3C2D8165_83BF_498f_B03B_E256F94C76B5" style="Mode=3;EOID=1317EE23;SOID=DC7FF254;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=110:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_74371426_1670_46df_8526_5A4910F24815" style="Mode=3;EOID=EFF0C88E;SOID=5BE91FA0;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=701;SCTR.TOP=-304;SCTR.RIGHT=750;SCTR.BOTTOM=-277;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=78:OY=-31:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=750:-303$750:-277$701:-277$701:-303$;" subject="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9" style="Mode=3;EOID=D3ACDF45;SOID=D3ACDF45;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=6;SY=-2;EX=-72;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_AAE5061F_F0FE_4ca1_8447_5E708FAB9D5A" style="Mode=3;EOID=497441B1;SOID=77B55004;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-10;SY=0;EX=0;EY=-33;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=393:-535$;" subject="EAID_AAE5061F_F0FE_4ca1_8447_5E708FAB9D5A" style="Mode=3;EOID=497441B1;SOID=77B55004;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=146:CY=14:OX=-1:OY=-16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_57BA1AAE_EBFD_419c_8F21_8256FE25DBAC" style="Mode=3;EOID=6DBAC0EB;SOID=BDD54B7B;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EX=0;EY=-2;SX=0;SY=17;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=118:CY=14:OX=13:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1037:-116$1037:-613$;" subject="EAID_6CDB7A9B_1395_4587_9F41_FE45FA8A0605" style="Mode=3;EOID=4B1D4827;SOID=C46157D2;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;EX=18;EY=-1;SX=12;SY=-4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=45:OY=-22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_25DE37BE_E478_4159_8F53_7F49CAD18053" style="Mode=3;EOID=497441B1;SOID=C46157D2;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -50740,15 +53143,15 @@
 					<element geometry="EDGE=3;SX=0;SY=0;EX=0;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=96:CY=14:OX=46:OY=-21:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547" style="Mode=3;EOID=4B1D4827;SOID=21670A9E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=3;SY=0;EX=0;EY=-33;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=901:-406$;" subject="EAID_B0961C3B_3C3E_4c2a_A3F4_443665C43EB4" style="Mode=3;EOID=D3ACDF45;SOID=21670A9E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=112:CY=14:OX=0:OY=25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=6:OY=-27:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_C741BADB_0CAC_40d5_A730_696A39D2224E" style="Mode=3;EOID=D2536334;SOID=497441B1;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=2;SX=0;SY=5;EX=-67;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=490:-731$;" subject="EAID_3675E499_10A4_457e_9458_83E0C40CEC9A" style="Mode=3;EOID=497441B1;SOID=5EAB8366;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;SX=0;SY=-2;EX=-67;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=490:-744$;" subject="EAID_3675E499_10A4_457e_9458_83E0C40CEC9A" style="Mode=3;EOID=497441B1;SOID=5EAB8366;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-17;SY=-4;EX=47;EY=-4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_7F8C9069_9D3F_4494_8C14_7C6DA83E8A46" style="Mode=3;EOID=497441B1;SOID=BDD54B7B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=-11;EX=-100;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=146:CY=14:OX=65:OY=-15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=798:-651$;" subject="EAID_A96B5FDE_85B9_4435_B7E7_D176E6996280" style="Mode=3;EOID=6DBAC0EB;SOID=77B55004;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-3;EX=-102;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=146:CY=14:OX=65:OY=-15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=796:-660$;" subject="EAID_A96B5FDE_85B9_4435_B7E7_D176E6996280" style="Mode=3;EOID=6DBAC0EB;SOID=77B55004;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=59;SY=0;EX=0;EY=-17;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=616:-390$;" subject="EAID_97C17D51_4DF6_4979_B308_C0F08C743DCF" style="Mode=3;EOID=D3ACDF45;SOID=497441B1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-55;SY=0;EX=0;EY=12;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=18:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=502:-313$;" subject="EAID_FD687C05_7D35_48ab_B0AA_8C6787D5DF46" style="Mode=3;EOID=63059561;SOID=497441B1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=29;SY=0;EX=0;EY=-3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=153:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=586:-203$;" subject="EAID_39B9AB7E_2B60_4f59_8AE5_E5806C9B2562" style="Mode=3;EOID=B7FA69D7;SOID=497441B1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-70;SY=0;EX=0;EY=-25;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=68:CY=14:OX=19:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=487:-350$;" subject="EAID_3EC00346_DC8E_4fd4_8A9A_9A4173CBD283" style="Mode=3;EOID=63059561;SOID=497441B1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-101;SY=0;EX=0;EY=3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=86:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=456:-407$;" subject="EAID_EC8CA809_26BC_46b1_A885_D5B3B1D5960A" style="Mode=3;EOID=1CF633C4;SOID=497441B1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=16;SY=13;EX=-34;EY=-12;$LLB=;LLT=;LMT=;LMB=;LRT=CX=96:CY=14:OX=62:OY=23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-41:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D68065CA_2D18_479d_95EB_23D106ED6921" style="Mode=3;EOID=77B55004;SOID=5EAB8366;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=34;SY=13;EX=-16;EY=-12;$LLB=;LLT=;LMT=;LMB=;LRT=CX=96:CY=14:OX=52:OY=15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-41:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D68065CA_2D18_479d_95EB_23D106ED6921" style="Mode=3;EOID=77B55004;SOID=5EAB8366;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_E8D8E631_9B19_4a2a_9B19_8A269D46151F">
@@ -50885,32 +53288,34 @@
 			<diagram xmi:id="EAID_B0C416E7_3825_4a43_99E0_659306E74E22">
 				<model package="EAPK_715C5E37_AD21_40eb_91D0_A082D4C6829E" localID="123" owner="EAPK_715C5E37_AD21_40eb_91D0_A082D4C6829E"/>
 				<properties name="empirical types" type="Logical"/>
-				<project author="estaromi" version="1.0" created="2020-01-13 19:02:53" modified="2023-12-12 14:56:01"/>
+				<project author="estaromi" version="1.0" created="2020-01-13 19:02:53" modified="2024-03-19 17:35:12"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=791;DocSize.cy=1134;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=FA3C04AB;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=1CB52816;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=0;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=1128;Top=157;Right=1218;Bottom=202;" subject="EAID_F8F2DEF8_6045_44d5_93B9_E57CE8023BE9" seqno="1" style="DUID=4B191B47;"/>
-					<element geometry="Left=818;Top=357;Right=908;Bottom=417;" subject="EAID_5A01D361_6509_447f_B318_F20F23FBF81F" seqno="2" style="DUID=3542A92E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1252;Top=353;Right=1382;Bottom=423;" subject="EAID_7D0E71D7_D624_4144_8134_2500CE9AB392" seqno="3" style="DUID=DFC42F6D;"/>
-					<element geometry="Left=959;Top=353;Right=1125;Bottom=423;" subject="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C" seqno="4" style="DUID=37BA303E;"/>
-					<element geometry="Left=990;Top=468;Right=1094;Bottom=520;" subject="EAID_EDCD6F3A_F86A_46ca_ACD1_13C3E1A4B7F9" seqno="5" style="DUID=2EFD3FA1;NSL=0;"/>
-					<element geometry="Left=775;Top=210;Right=951;Bottom=295;" subject="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" seqno="6" style="DUID=3ACD9664;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1090;Top=250;Right=1256;Bottom=309;" subject="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" seqno="7" style="DUID=463708F5;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=223;Top=210;Right=490;Bottom=308;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="8" style="DUID=4A249F57;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=304;Top=106;Right=408;Bottom=158;" subject="EAID_FBD046CD_CD18_4d96_99E0_63CAC8A5D594" seqno="9" style="DUID=70F17149;"/>
-					<element geometry="Left=223;Top=373;Right=428;Bottom=445;" subject="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" seqno="10" style="DUID=72E84BF6;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=517;Top=210;Right=733;Bottom=308;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="11" style="DUID=DE479C27;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=533;Top=383;Right=637;Bottom=435;" subject="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3" seqno="12" style="DUID=A526FAA8;"/>
+					<element geometry="Left=1360;Top=271;Right=1502;Bottom=337;" subject="EAID_AFD1E4C5_9D57_4c0a_B916_E199FA70A0DC" seqno="1" style="DUID=6602E750;"/>
+					<element geometry="Left=1128;Top=157;Right=1218;Bottom=202;" subject="EAID_F8F2DEF8_6045_44d5_93B9_E57CE8023BE9" seqno="2" style="DUID=4B191B47;"/>
+					<element geometry="Left=818;Top=357;Right=908;Bottom=417;" subject="EAID_5A01D361_6509_447f_B318_F20F23FBF81F" seqno="3" style="DUID=3542A92E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1230;Top=353;Right=1360;Bottom=402;" subject="EAID_7D0E71D7_D624_4144_8134_2500CE9AB392" seqno="4" style="DUID=DFC42F6D;"/>
+					<element geometry="Left=959;Top=353;Right=1125;Bottom=402;" subject="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C" seqno="5" style="DUID=37BA303E;"/>
+					<element geometry="Left=990;Top=445;Right=1094;Bottom=497;" subject="EAID_EDCD6F3A_F86A_46ca_ACD1_13C3E1A4B7F9" seqno="6" style="DUID=2EFD3FA1;NSL=0;"/>
+					<element geometry="Left=775;Top=210;Right=951;Bottom=295;" subject="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" seqno="7" style="DUID=3ACD9664;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1090;Top=250;Right=1256;Bottom=309;" subject="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" seqno="8" style="DUID=463708F5;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=223;Top=210;Right=490;Bottom=308;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="9" style="DUID=4A249F57;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=304;Top=106;Right=408;Bottom=158;" subject="EAID_FBD046CD_CD18_4d96_99E0_63CAC8A5D594" seqno="10" style="DUID=70F17149;"/>
+					<element geometry="Left=223;Top=373;Right=428;Bottom=445;" subject="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" seqno="11" style="DUID=72E84BF6;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=517;Top=210;Right=733;Bottom=308;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="12" style="DUID=DE479C27;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=533;Top=383;Right=637;Bottom=435;" subject="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3" seqno="13" style="DUID=A526FAA8;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=51:OY=-16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_007A256B_E0B5_4a62_B8D7_2BC14F331BE5" style="Mode=3;EOID=3542A92E;SOID=3ACD9664;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9501DE7B_F539_4409_8D54_7B950268D75C" style="Mode=3;EOID=4B191B47;SOID=463708F5;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=74:CY=14:OX=-3:OY=-5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=-3:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_30CBA4D5_2CA0_4043_A8BC_8FBCF102380D" style="Mode=3;EOID=A526FAA8;SOID=72E84BF6;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=73:CY=14:OX=43:OY=20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_E9E2A1B8_A705_4847_8FE6_3B40BD241A4B" style="Mode=3;EOID=70F17149;SOID=4A249F57;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F8285143_A232_43ae_AFC8_89D40A9529FD" style="Mode=3;EOID=463708F5;SOID=DFC42F6D;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-6;SY=0;EX=-6;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F8285143_A232_43ae_AFC8_89D40A9529FD" style="Mode=3;EOID=463708F5;SOID=DFC42F6D;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_FE0B0FB5_E0B6_41e2_AA82_ECF06C845021" style="Mode=3;EOID=463708F5;SOID=37BA303E;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=62:CY=14:OX=36:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_90566F74_64BC_49c8_8076_1ECB982268EE" style="Mode=3;EOID=2EFD3FA1;SOID=37BA303E;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_5259FE9C_CECB_4b18_A4A4_D1B45AFE4BED" style="Mode=3;EOID=DFC42F6D;SOID=6602E750;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_BF8A1F85_C659_4436_8487_5E44862C2DC7">
diff --git a/implementation/eSubmission/model2owl-config/config-parameters.xsl b/implementation/eSubmission/model2owl-config/config-parameters.xsl
index cbc21270..9677902c 100644
--- a/implementation/eSubmission/model2owl-config/config-parameters.xsl
+++ b/implementation/eSubmission/model2owl-config/config-parameters.xsl
@@ -122,11 +122,11 @@
     <!--    owl:incompatibleWith -->
     <xsl:variable name="incompatibleWith" select="'3.1.0'"/>
     <!--    owl:versionInfo -->
-    <xsl:variable name="versionInfo" select="'4.1.0'"/>
+    <xsl:variable name="versionInfo" select="'4.2.0'"/>
     <!--    bibo:status-->
     <xsl:variable name="ontologyStatus" select="'Semantic Specification Release'"/>
     <!--    owl:priorVersion -->
-    <xsl:variable name="priorVersion" select="'4.0.2'"/>
+    <xsl:variable name="priorVersion" select="'4.1.0'"/>
     <!--    vann:preferredNamespaceUri -->
     <xsl:variable name="preferredNamespaceUri" select="'http://data.europa.eu/a4g/ontology#'"/>
     <!--    vann:preferredNamespacePrefix -->
diff --git a/implementation/eSubmission/model2owl-config/namespaces.xml b/implementation/eSubmission/model2owl-config/namespaces.xml
index 78137353..81d534ca 100644
--- a/implementation/eSubmission/model2owl-config/namespaces.xml
+++ b/implementation/eSubmission/model2owl-config/namespaces.xml
@@ -21,6 +21,7 @@
     <prefix name="epo-ful" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-acc" value="http://data.europa.eu/a4g/ontology#" importURI="http://data.europa.eu/a4g/ontology#acc"/>
     <prefix name="epo-sub" value="http://data.europa.eu/a4g/ontology#"/>
+    <prefix name="epo-inv" value="http://data.europa.eu/a4g/ontology#"/>
 
     <prefix name="nuts" value="http://data.europa.eu/nuts/"/>
     <prefix name="espd" value="https://github.com/ESPD/ESPD-EDM/"/>
diff --git a/implementation/eSubmission/xmi_conceptual_model/eSubmission.xml b/implementation/eSubmission/xmi_conceptual_model/eSubmission.xml
index 07b90cf1..0e2834ad 100644
--- a/implementation/eSubmission/xmi_conceptual_model/eSubmission.xml
+++ b/implementation/eSubmission/xmi_conceptual_model/eSubmission.xml
@@ -4,13 +4,8 @@
 	<uml:Model xmi:type="uml:Model" name="EA_Model">
 		<packagedElement xmi:type="uml:Package" xmi:id="EAPK_53638E82_0EE0_4a4c_9560_38B724971FE9" name="Submission">
 			<packagedElement xmi:type="uml:Package" xmi:id="EAPK_5E7328A3_FB85_43c1_8DA5_AE7A684AE578" name="submission">
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA" name="diagrams">
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_70B4792E_F818_45db_80A4_32F092496FEF" name="ProxyConnector"/>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C" name="ProxyConnector">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_84F5E9DD_96DE_4ca7_8CA6_9C68826B377B" general="EAID_70B4792E_F818_45db_80A4_32F092496FEF"/>
-					</packagedElement>
-				</packagedElement>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_CA4C7382_A4D6_43c0_AA23_08C9E52AAA0D" name="classes">
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" name="diagrams"/>
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_BF99515E_23A1_4c32_ACF2_57A2EF805C41" name="classes">
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B" name="cccev:SupportedValue">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_690D9B32_F64D_4dd8_96E2_F3E43B834759" name="cccev:value">
 							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000001_F64D_4dd8_96E2_F3E43B834759" value="0"/>
@@ -81,10 +76,15 @@
 							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000014__AB2B_4b7d_BCCF_3E7847170DBD" value="*"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_C7D18971_E3AA_4bc3_B35F_CBFE4CDAAA84" general="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273" name="epo-sub:refersToOtherESPDResponse" association="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273">
+							<type xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000015__AFA9_4565_A69F_C36E3ABE8273" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000016__AFA9_4565_A69F_C36E3ABE8273" value="*"/>
+						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F" name="epo-sub:providesInformationOn" association="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F">
 							<type xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000015__41B4_4817_850D_83D60BFADA1F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000016__41B4_4817_850D_83D60BFADA1F" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000017__41B4_4817_850D_83D60BFADA1F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000018__41B4_4817_850D_83D60BFADA1F" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
@@ -101,6 +101,13 @@
 							<type xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273">
+						<memberEnd xmi:idref="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273"/>
+						<memberEnd xmi:idref="EAID_src159B9F_AFA9_4565_A69F_C36E3ABE8273"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src159B9F_AFA9_4565_A69F_C36E3ABE8273" association="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273">
+							<type xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370"/>
+						</ownedEnd>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F">
 						<memberEnd xmi:idref="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F"/>
 						<memberEnd xmi:idref="EAID_srcFF2FFB_41B4_4817_850D_83D60BFADA1F"/>
@@ -118,19 +125,19 @@
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D" name="epo-sub:LegalRepresentative">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE95E36_FC35_4adf_B5AC_F916221BB38E" name="epo-sub:hasPowerOfAttorney" association="EAID_15E95E36_FC35_4adf_B5AC_F916221BB38E">
 							<type xmi:idref="EAID_DE869DED_87AA_46a5_963D_EAEBF2AA6803"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000017__FC35_4adf_B5AC_F916221BB38E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000018__FC35_4adf_B5AC_F916221BB38E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000019__FC35_4adf_B5AC_F916221BB38E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000020__FC35_4adf_B5AC_F916221BB38E" value="1"/>
 						</ownedAttribute>
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_1982F8A2_ECBE_47d6_9A92_7176519FD4A5" general="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst75FD52_1FE1_445c_9B8B_96AA208D3134" name="epo:actsOnBehalfOf" association="EAID_7775FD52_1FE1_445c_9B8B_96AA208D3134">
 							<type xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000019__1FE1_445c_9B8B_96AA208D3134" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000020__1FE1_445c_9B8B_96AA208D3134" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000021__1FE1_445c_9B8B_96AA208D3134" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000022__1FE1_445c_9B8B_96AA208D3134" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstAE0856_7B74_434f_BCD2_491FA097E6DE" name="epo-sub:hasMandate" association="EAID_C9AE0856_7B74_434f_BCD2_491FA097E6DE">
 							<type xmi:idref="EAID_95FD9F3B_1F77_4e3c_A91D_72310583752E"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000021__7B74_434f_BCD2_491FA097E6DE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000022__7B74_434f_BCD2_491FA097E6DE" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000023__7B74_434f_BCD2_491FA097E6DE" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000024__7B74_434f_BCD2_491FA097E6DE" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_15E95E36_FC35_4adf_B5AC_F916221BB38E">
@@ -159,29 +166,29 @@
 					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" name="epo-sub:NationalPreQualificationData">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_9C54C14F_AC2C_4e59_BBC8_FFB638255E64" name="epo-sub:providesOrganisationCompletedTaskDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000023_AC2C_4e59_BBC8_FFB638255E64" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000024_AC2C_4e59_BBC8_FFB638255E64" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000025_AC2C_4e59_BBC8_FFB638255E64" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000026_AC2C_4e59_BBC8_FFB638255E64" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstCC2B92_731F_4428_B333_8582A36D1244" name="epo-sub:providesOrganisationPreQualificationListingIdentifier" association="EAID_23CC2B92_731F_4428_B333_8582A36D1244">
 							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000025__731F_4428_B333_8582A36D1244" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000026__731F_4428_B333_8582A36D1244" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000027__731F_4428_B333_8582A36D1244" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000028__731F_4428_B333_8582A36D1244" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstC6E00F_DAEB_4e79_8340_AC2FC83206DA" name="epo-sub:providesOrganisationEmployeeQuantity" association="EAID_87C6E00F_DAEB_4e79_8340_AC2FC83206DA">
 							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000027__DAEB_4e79_8340_AC2FC83206DA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000028__DAEB_4e79_8340_AC2FC83206DA" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000029__DAEB_4e79_8340_AC2FC83206DA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000030__DAEB_4e79_8340_AC2FC83206DA" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF032E2_6893_45df_95FE_A08E92EA8618" name="epo-sub:providesOrganisationFinancialCapability" association="EAID_9BF032E2_6893_45df_95FE_A08E92EA8618">
 							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000029__6893_45df_95FE_A08E92EA8618" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000030__6893_45df_95FE_A08E92EA8618" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000031__6893_45df_95FE_A08E92EA8618" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000032__6893_45df_95FE_A08E92EA8618" value="1"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstD90197_EC7F_4a01_8047_2DAC846D9C03" name="epo-sub:concernsOrganisation" association="EAID_B6D90197_EC7F_4a01_8047_2DAC846D9C03">
 							<type xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000031__EC7F_4a01_8047_2DAC846D9C03" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000032__EC7F_4a01_8047_2DAC846D9C03" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000033__EC7F_4a01_8047_2DAC846D9C03" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000034__EC7F_4a01_8047_2DAC846D9C03" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_23CC2B92_731F_4428_B333_8582A36D1244">
@@ -218,23 +225,23 @@
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" name="epo-sub:Response">
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE371EF_8DF9_4747_B49E_48C56317F5F9" name="cccev:supportsValue" association="EAID_3EE371EF_8DF9_4747_B49E_48C56317F5F9">
 							<type xmi:idref="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000033__8DF9_4747_B49E_48C56317F5F9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000034__8DF9_4747_B49E_48C56317F5F9" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000035__8DF9_4747_B49E_48C56317F5F9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000036__8DF9_4747_B49E_48C56317F5F9" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst15AB6B_F88D_4b3e_857E_2AD843DEF3DE" name="epo-sub:answersQuestion" association="EAID_5715AB6B_F88D_4b3e_857E_2AD843DEF3DE">
 							<type xmi:idref="EAID_30DD6891_71FE_4f87_832B_477790550BBC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000035__F88D_4b3e_857E_2AD843DEF3DE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000036__F88D_4b3e_857E_2AD843DEF3DE" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000037__F88D_4b3e_857E_2AD843DEF3DE" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000038__F88D_4b3e_857E_2AD843DEF3DE" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstB47F0D_8871_4230_A6F8_522396CE72CF" name="epo-sub:isReinforcedBy" association="EAID_93B47F0D_8871_4230_A6F8_522396CE72CF">
 							<type xmi:idref="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000037__8871_4230_A6F8_522396CE72CF" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000038__8871_4230_A6F8_522396CE72CF" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000039__8871_4230_A6F8_522396CE72CF" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000040__8871_4230_A6F8_522396CE72CF" value="*"/>
 						</ownedAttribute>
 						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstFBB3C3_8542_4cd9_8B7E_A25D4A6C9048" name="epo-sub:refersToApplicablePeriod" association="EAID_B2FBB3C3_8542_4cd9_8B7E_A25D4A6C9048">
 							<type xmi:idref="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000039__8542_4cd9_8B7E_A25D4A6C9048" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000040__8542_4cd9_8B7E_A25D4A6C9048" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000041__8542_4cd9_8B7E_A25D4A6C9048" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000042__8542_4cd9_8B7E_A25D4A6C9048" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_49631FAC_5F3D_4939_83C6_69057788A49B" supplier="EAID_B7F675EC_18B3_49b1_AAF4_E0FAB88D85EE" client="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC"/>
@@ -271,7 +278,7 @@
 				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_1664A675_DB09_4b0b_9372_D91610518291" name="xsd:integer"/>
 			</packagedElement>
 		</packagedElement>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_EECFED90_0561_419e_ACA0_11A555E18F49" isFrame="false" modelElement="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_EECFED90_0561_419e_ACA0_11A555E18F49" isFrame="false" modelElement="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_BE9C_C9CD1456AEBB" modelElement="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_BE9C_C9CD1456AEBB" text="epo-acc:ESPDRequest"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_BE9C_C9CD1456AEBB" x="384" y="540" width="124" height="70"/>
@@ -356,7 +363,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_BF42_2A6E50CAF4E6" modelElement="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_BF42_2A6E50CAF4E6" text="epo:LotGroup"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_BF42_2A6E50CAF4E6" x="688" y="812" width="171" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_BF42_2A6E50CAF4E6" x="688" y="812" width="179" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_B4E1_7B69BF54F2E9" modelElement="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_B4E1_7B69BF54F2E9" text="epo-sub:NationalPreQualificationData"/>
@@ -376,18 +383,28 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EECFED90_0561_419e_A56C_6D68CD1BEAF3" modelElement="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0561_419e_A56C_6D68CD1BEAF3" text="epo:ProcurementDocument"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_A56C_6D68CD1BEAF3" x="154" y="492" width="156" height="42"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0561_419e_A56C_6D68CD1BEAF3" x="157" y="540" width="148" height="71"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_95FE_A08E92EA8618" source="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_9BF032E2_6893_45df_95FE_A08E92EA8618">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_95FE_A08E92EA8618" text="+epo-sub:providesOrganisationFinancialCapability" modelElement="EAID_dstF032E2_6893_45df_95FE_A08E92EA8618">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_95FE_A08E92EA8618" x="1816" y="698" width="160" height="27"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_B333_8582A36D1244" source="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_23CC2B92_731F_4428_B333_8582A36D1244">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_B333_8582A36D1244" text="+epo-sub:providesOrganisationPreQualificationListingIdentifier" modelElement="EAID_dstCC2B92_731F_4428_B333_8582A36D1244">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_B333_8582A36D1244" x="1534" y="719" width="210" height="27"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_95FE_A08E92EA8618" text="0..1" modelElement="EAID_dstF032E2_6893_45df_95FE_A08E92EA8618">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_95FE_A08E92EA8618" x="1963" y="738" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_B333_8582A36D1244" text="0..*" modelElement="EAID_dstCC2B92_731F_4428_B333_8582A36D1244">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_B333_8582A36D1244" x="1709" y="743" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_95FE_A08E92EA8618" x="1808" y="679"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_95FE_A08E92EA8618" x="1808" y="733"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_95FE_A08E92EA8618" x="1982" y="733"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_B333_8582A36D1244" x="1701" y="679"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_B333_8582A36D1244" x="1701" y="761"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_B087_27A619B6C819" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_FC7073E1_3362_472f_B087_27A619B6C819">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_B087_27A619B6C819" text="+epo:specifiesProcurementCriterion" modelElement="EAID_dst7073E1_3362_472f_B087_27A619B6C819">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_B087_27A619B6C819" x="365" y="798" width="142" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_B087_27A619B6C819" text="0..*" modelElement="EAID_dst7073E1_3362_472f_B087_27A619B6C819">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_B087_27A619B6C819" x="462" y="769" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_B087_27A619B6C819" x="688" y="844"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_B087_27A619B6C819" x="450" y="844"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_B087_27A619B6C819" x="450" y="764"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_AB11_165E12CB38A6" source="EAID_49EC0F16_408C_4b28_B611_0048946DC070" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_4714A192_0DFA_49f4_AB11_165E12CB38A6">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_AB11_165E12CB38A6" text="+epo:actsOnBehalfOf" modelElement="EAID_dst14A192_0DFA_49f4_AB11_165E12CB38A6">
@@ -418,6 +435,21 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_9C21_84470056CF01" x="1298" y="442"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_9C21_84470056CF01" x="1359" y="442"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_A69F_C36E3ABE8273" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" modelElement="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_A69F_C36E3ABE8273" text="+epo-sub:refersToOtherESPDResponse 0..*" modelElement="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_A69F_C36E3ABE8273" x="504" y="311" width="158" height="27"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_A69F_C36E3ABE8273" text="0..*" modelElement="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_A69F_C36E3ABE8273" x="507" y="335" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_A69F_C36E3ABE8273" x="508" y="352"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_A69F_C36E3ABE8273" x="508" y="352"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_A69F_C36E3ABE8273" x="542" y="352"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_0561_419e_A69F_C36E3ABE8273" x="542" y="308"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_0561_419e_A69F_C36E3ABE8273" x="499" y="308"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_0561_419e_A69F_C36E3ABE8273" x="499" y="340"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_0561_419e_A69F_C36E3ABE8273" x="499" y="340"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_A0FF_14B7A0FB6A6B" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" modelElement="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_A0FF_14B7A0FB6A6B" text="+epo-sub:relatesToESPDRequest" modelElement="EAID_dstBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_A0FF_14B7A0FB6A6B" x="383" y="502" width="131" height="14"/>
@@ -446,29 +478,25 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_BB86_A2E25524B058" x="1654" y="503"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_BB86_A2E25524B058" x="1654" y="450"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_B906_6DB183F74D9F" source="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_0AA8BD10_946A_403c_B906_6DB183F74D9F">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_B906_6DB183F74D9F" text="+epo:hasMember" modelElement="EAID_dstA8BD10_946A_403c_B906_6DB183F74D9F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_B906_6DB183F74D9F" x="1750" y="471" width="73" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_AB2B_CBE8A5D24AC5" source="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" target="EAID_49EC0F16_408C_4b28_B611_0048946DC070" modelElement="EAID_28460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_AB2B_CBE8A5D24AC5" text="+epo:isExecutedByProcurementServiceProvider" modelElement="EAID_dst460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_AB2B_CBE8A5D24AC5" x="920" y="557" width="189" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_B906_6DB183F74D9F" text="1..*" modelElement="EAID_dstA8BD10_946A_403c_B906_6DB183F74D9F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_B906_6DB183F74D9F" x="1787" y="455" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_AB2B_CBE8A5D24AC5" text="0..1" modelElement="EAID_dst460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_AB2B_CBE8A5D24AC5" x="1090" y="585" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_B906_6DB183F74D9F" x="1775" y="503"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_B906_6DB183F74D9F" x="1775" y="450"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_95A0_E058E0BD5450" source="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_29996CD1_F979_44e0_95A0_E058E0BD5450">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_95A0_E058E0BD5450" x="231" y="492"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_95A0_E058E0BD5450" x="231" y="456"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_AB2B_CBE8A5D24AC5" x="913" y="575"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_AB2B_CBE8A5D24AC5" x="1111" y="575"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_B333_8582A36D1244" source="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_23CC2B92_731F_4428_B333_8582A36D1244">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_B333_8582A36D1244" text="+epo-sub:providesOrganisationPreQualificationListingIdentifier" modelElement="EAID_dstCC2B92_731F_4428_B333_8582A36D1244">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_B333_8582A36D1244" x="1534" y="719" width="210" height="27"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_A6DF_915A5FB0B3DB" source="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_F3F440DD_AB87_4730_A6DF_915A5FB0B3DB">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_A6DF_915A5FB0B3DB" text="+epo:leadBy" modelElement="EAID_dstF440DD_AB87_4730_A6DF_915A5FB0B3DB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_A6DF_915A5FB0B3DB" x="1682" y="477" width="51" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_B333_8582A36D1244" text="0..*" modelElement="EAID_dstCC2B92_731F_4428_B333_8582A36D1244">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_B333_8582A36D1244" x="1709" y="743" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_A6DF_915A5FB0B3DB" text="0..1" modelElement="EAID_dstF440DD_AB87_4730_A6DF_915A5FB0B3DB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_A6DF_915A5FB0B3DB" x="1715" y="455" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_B333_8582A36D1244" x="1701" y="679"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_B333_8582A36D1244" x="1701" y="761"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_A6DF_915A5FB0B3DB" x="1703" y="503"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_A6DF_915A5FB0B3DB" x="1703" y="450"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_AA17_2A8EC003CCFE" source="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_D01E7677_5AC2_42b1_AA17_2A8EC003CCFE">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_AA17_2A8EC003CCFE" text="+epo:isResponsibilityOfBuyer" modelElement="EAID_dst1E7677_5AC2_42b1_AA17_2A8EC003CCFE">
@@ -481,6 +509,17 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_AA17_2A8EC003CCFE" x="913" y="485"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_AA17_2A8EC003CCFE" x="1079" y="485"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_95FE_A08E92EA8618" source="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_9BF032E2_6893_45df_95FE_A08E92EA8618">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_95FE_A08E92EA8618" text="+epo-sub:providesOrganisationFinancialCapability" modelElement="EAID_dstF032E2_6893_45df_95FE_A08E92EA8618">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_95FE_A08E92EA8618" x="1816" y="698" width="160" height="27"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_95FE_A08E92EA8618" text="0..1" modelElement="EAID_dstF032E2_6893_45df_95FE_A08E92EA8618">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_95FE_A08E92EA8618" x="1963" y="738" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_95FE_A08E92EA8618" x="1808" y="679"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_95FE_A08E92EA8618" x="1808" y="733"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_95FE_A08E92EA8618" x="1982" y="733"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_8340_AC2FC83206DA" source="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_87C6E00F_DAEB_4e79_8340_AC2FC83206DA">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_8340_AC2FC83206DA" text="+epo-sub:providesOrganisationEmployeeQuantity" modelElement="EAID_dstC6E00F_DAEB_4e79_8340_AC2FC83206DA">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_8340_AC2FC83206DA" x="1878" y="615" width="161" height="27"/>
@@ -503,8 +542,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_A6A4_14096262384A" source="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" target="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" modelElement="EAID_4E94CD77_EB61_4a9e_A6A4_14096262384A">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_A6A4_14096262384A" x="384" y="575"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_A6A4_14096262384A" x="234" y="575"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_A6A4_14096262384A" x="234" y="534"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_A6A4_14096262384A" x="305" y="575"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_96C4_9709B72BA620" source="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" target="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" modelElement="EAID_E69DD4EA_847D_4a36_96C4_9709B72BA620">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_96C4_9709B72BA620" text="+epo:concernsProcedure" modelElement="EAID_dst9DD4EA_847D_4a36_96C4_9709B72BA620">
@@ -528,49 +566,45 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_BFE6_593632EDB11F" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_20732599_332F_4f0e_BFE6_593632EDB11F">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_BFE6_593632EDB11F" text="+epo:setsGroupingContextForLot" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_BFE6_593632EDB11F" x="719" y="786" width="131" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_BFE6_593632EDB11F" x="720" y="786" width="131" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_BFE6_593632EDB11F" text="1..*" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_BFE6_593632EDB11F" x="785" y="769" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_BFE6_593632EDB11F" x="786" y="769" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_BFE6_593632EDB11F" x="773" y="812"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_BFE6_593632EDB11F" x="773" y="764"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_BFE6_593632EDB11F" x="775" y="812"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_BFE6_593632EDB11F" x="774" y="764"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_B087_27A619B6C819" source="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_FC7073E1_3362_472f_B087_27A619B6C819">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_B087_27A619B6C819" text="+epo:specifiesProcurementCriterion" modelElement="EAID_dst7073E1_3362_472f_B087_27A619B6C819">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_B087_27A619B6C819" x="365" y="798" width="142" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_B906_6DB183F74D9F" source="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_0AA8BD10_946A_403c_B906_6DB183F74D9F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_B906_6DB183F74D9F" text="+epo:hasMember" modelElement="EAID_dstA8BD10_946A_403c_B906_6DB183F74D9F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_B906_6DB183F74D9F" x="1750" y="471" width="73" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_B087_27A619B6C819" text="0..*" modelElement="EAID_dst7073E1_3362_472f_B087_27A619B6C819">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_B087_27A619B6C819" x="462" y="769" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_B906_6DB183F74D9F" text="1..*" modelElement="EAID_dstA8BD10_946A_403c_B906_6DB183F74D9F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_B906_6DB183F74D9F" x="1787" y="455" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_B087_27A619B6C819" x="688" y="844"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_B087_27A619B6C819" x="450" y="844"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_B087_27A619B6C819" x="450" y="764"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_B906_6DB183F74D9F" x="1775" y="503"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_B906_6DB183F74D9F" x="1775" y="450"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_A6DF_915A5FB0B3DB" source="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_F3F440DD_AB87_4730_A6DF_915A5FB0B3DB">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_A6DF_915A5FB0B3DB" text="+epo:leadBy" modelElement="EAID_dstF440DD_AB87_4730_A6DF_915A5FB0B3DB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_A6DF_915A5FB0B3DB" x="1682" y="477" width="51" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_AE66_986280A7B2F6" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_AE66_986280A7B2F6" text="+epo:hasLegalIdentifier" modelElement="EAID_dst57F338_A3A5_457d_AE66_986280A7B2F6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_AE66_986280A7B2F6" x="1502" y="771" width="95" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_A6DF_915A5FB0B3DB" text="0..1" modelElement="EAID_dstF440DD_AB87_4730_A6DF_915A5FB0B3DB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_A6DF_915A5FB0B3DB" x="1715" y="455" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_AE66_986280A7B2F6" text="0..*" modelElement="EAID_dst57F338_A3A5_457d_AE66_986280A7B2F6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_AE66_986280A7B2F6" x="1580" y="794" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_A6DF_915A5FB0B3DB" x="1703" y="503"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_A6DF_915A5FB0B3DB" x="1703" y="450"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_AE66_986280A7B2F6" x="1576" y="417"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_AE66_986280A7B2F6" x="1497" y="417"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_AE66_986280A7B2F6" x="1497" y="789"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_0561_419e_AE66_986280A7B2F6" x="1599" y="789"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_B370_202D9A0110E0" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_2FF93267_E672_481d_B370_202D9A0110E0">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_B370_202D9A0110E0" text="+org:subOrganizationOf 0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_B370_202D9A0110E0" x="1808" y="298" width="115" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_A7F5_548146C45BC4" source="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_A7F5_548146C45BC4" text="+epo:specifiesProcurementCriterion" modelElement="EAID_dst1AA305_6E1E_4123_A7F5_548146C45BC4">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_A7F5_548146C45BC4" x="565" y="713" width="142" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_B370_202D9A0110E0" text="0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_B370_202D9A0110E0" x="1831" y="331" width="100" height="10"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_A7F5_548146C45BC4" text="0..*" modelElement="EAID_dst1AA305_6E1E_4123_A7F5_548146C45BC4">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_A7F5_548146C45BC4" x="565" y="736" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_B370_202D9A0110E0" x="1829" y="347"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_B370_202D9A0110E0" x="1829" y="347"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_B370_202D9A0110E0" x="1872" y="347"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_0561_419e_B370_202D9A0110E0" x="1872" y="316"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_0561_419e_B370_202D9A0110E0" x="1823" y="316"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_0561_419e_B370_202D9A0110E0" x="1823" y="336"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_0561_419e_B370_202D9A0110E0" x="1823" y="336"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_A7F5_548146C45BC4" x="724" y="731"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_A7F5_548146C45BC4" x="562" y="731"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_B8FF_34E21440DAD9" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_B8FF_34E21440DAD9" text="+epo:refersToPrevious 0..*" modelElement="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9">
@@ -613,18 +647,6 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_B227_85988E5F2016" x="1980" y="470"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_B227_85988E5F2016" x="1980" y="508"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_ABED_4C9AC22FFF2A" source="EAID_29678A10_6473_461a_BE84_76269B5BBD68" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_C6F7D14A_11BF_430e_ABED_4C9AC22FFF2A">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_ABED_4C9AC22FFF2A" text="+locn:addressID" modelElement="EAID_dstF7D14A_11BF_430e_ABED_4C9AC22FFF2A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_ABED_4C9AC22FFF2A" x="1809" y="802" width="65" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_ABED_4C9AC22FFF2A" text="0..1" modelElement="EAID_dstF7D14A_11BF_430e_ABED_4C9AC22FFF2A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_ABED_4C9AC22FFF2A" x="1809" y="825" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_ABED_4C9AC22FFF2A" x="2134" y="460"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_ABED_4C9AC22FFF2A" x="2253" y="460"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_ABED_4C9AC22FFF2A" x="2253" y="820"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_0561_419e_ABED_4C9AC22FFF2A" x="1806" y="820"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_878A_8035A42A43F9" source="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_9B2D6DCC_5092_48cf_878A_8035A42A43F9">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_878A_8035A42A43F9" text="+epo:involvesBuyer" modelElement="EAID_dst2D6DCC_5092_48cf_878A_8035A42A43F9">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_878A_8035A42A43F9" x="997" y="401" width="80" height="14"/>
@@ -636,27 +658,36 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_878A_8035A42A43F9" x="804" y="419"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_878A_8035A42A43F9" x="1079" y="419"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_AE66_986280A7B2F6" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_AE66_986280A7B2F6" text="+epo:hasLegalIdentifier" modelElement="EAID_dst57F338_A3A5_457d_AE66_986280A7B2F6">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_AE66_986280A7B2F6" x="1502" y="771" width="95" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_8164_044CE03A05CB" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_8164_044CE03A05CB" text="+epo:hasTaxIdentifier" modelElement="EAID_dstABB55C_F52F_4373_8164_044CE03A05CB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_8164_044CE03A05CB" x="1509" y="815" width="88" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_AE66_986280A7B2F6" text="0..*" modelElement="EAID_dst57F338_A3A5_457d_AE66_986280A7B2F6">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_AE66_986280A7B2F6" x="1580" y="794" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_8164_044CE03A05CB" text="0..*" modelElement="EAID_dstABB55C_F52F_4373_8164_044CE03A05CB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_8164_044CE03A05CB" x="1580" y="838" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_AE66_986280A7B2F6" x="1576" y="417"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_AE66_986280A7B2F6" x="1497" y="417"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_AE66_986280A7B2F6" x="1497" y="789"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_0561_419e_AE66_986280A7B2F6" x="1599" y="789"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_8164_044CE03A05CB" x="1576" y="396"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_8164_044CE03A05CB" x="1479" y="396"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_8164_044CE03A05CB" x="1479" y="833"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_0561_419e_8164_044CE03A05CB" x="1599" y="833"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_AB2B_CBE8A5D24AC5" source="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" target="EAID_49EC0F16_408C_4b28_B611_0048946DC070" modelElement="EAID_28460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_AB2B_CBE8A5D24AC5" text="+epo:isExecutedByProcurementServiceProvider" modelElement="EAID_dst460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_AB2B_CBE8A5D24AC5" x="920" y="557" width="189" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_95A0_E058E0BD5450" source="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_29996CD1_F979_44e0_95A0_E058E0BD5450">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_95A0_E058E0BD5450" x="231" y="540"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_95A0_E058E0BD5450" x="231" y="456"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_B370_202D9A0110E0" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_2FF93267_E672_481d_B370_202D9A0110E0">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_B370_202D9A0110E0" text="+org:subOrganizationOf 0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_B370_202D9A0110E0" x="1808" y="298" width="115" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_AB2B_CBE8A5D24AC5" text="0..1" modelElement="EAID_dst460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_AB2B_CBE8A5D24AC5" x="1090" y="585" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_B370_202D9A0110E0" text="0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_B370_202D9A0110E0" x="1831" y="331" width="100" height="10"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_AB2B_CBE8A5D24AC5" x="913" y="575"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_AB2B_CBE8A5D24AC5" x="1111" y="575"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_B370_202D9A0110E0" x="1829" y="347"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_B370_202D9A0110E0" x="1829" y="347"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_B370_202D9A0110E0" x="1872" y="347"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_0561_419e_B370_202D9A0110E0" x="1872" y="316"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_0561_419e_B370_202D9A0110E0" x="1823" y="316"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_0561_419e_B370_202D9A0110E0" x="1823" y="336"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_0561_419e_B370_202D9A0110E0" x="1823" y="336"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_82ED_0BAA7D433501" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_29678A10_6473_461a_BE84_76269B5BBD68" modelElement="EAID_9F23612C_1865_4c8b_82ED_0BAA7D433501">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_82ED_0BAA7D433501" text="+locn:address" modelElement="EAID_dst23612C_1865_4c8b_82ED_0BAA7D433501">
@@ -727,30 +758,20 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_9195_C96F98BD3349" x="773" y="631"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_9195_C96F98BD3349" x="773" y="694"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_A7F5_548146C45BC4" source="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_A7F5_548146C45BC4" text="+epo:specifiesProcurementCriterion" modelElement="EAID_dst1AA305_6E1E_4123_A7F5_548146C45BC4">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_A7F5_548146C45BC4" x="565" y="713" width="142" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_A7F5_548146C45BC4" text="0..*" modelElement="EAID_dst1AA305_6E1E_4123_A7F5_548146C45BC4">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_A7F5_548146C45BC4" x="565" y="736" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_A7F5_548146C45BC4" x="724" y="731"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_A7F5_548146C45BC4" x="562" y="731"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_8164_044CE03A05CB" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_8164_044CE03A05CB" text="+epo:hasTaxIdentifier" modelElement="EAID_dstABB55C_F52F_4373_8164_044CE03A05CB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_8164_044CE03A05CB" x="1509" y="815" width="88" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EECFED90_0561_419e_ABED_4C9AC22FFF2A" source="EAID_29678A10_6473_461a_BE84_76269B5BBD68" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_C6F7D14A_11BF_430e_ABED_4C9AC22FFF2A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0561_419e_ABED_4C9AC22FFF2A" text="+locn:addressID" modelElement="EAID_dstF7D14A_11BF_430e_ABED_4C9AC22FFF2A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0561_419e_ABED_4C9AC22FFF2A" x="1809" y="802" width="65" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_8164_044CE03A05CB" text="0..*" modelElement="EAID_dstABB55C_F52F_4373_8164_044CE03A05CB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_8164_044CE03A05CB" x="1580" y="838" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0561_419e_ABED_4C9AC22FFF2A" text="0..1" modelElement="EAID_dstF7D14A_11BF_430e_ABED_4C9AC22FFF2A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0561_419e_ABED_4C9AC22FFF2A" x="1809" y="825" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_8164_044CE03A05CB" x="1576" y="396"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_8164_044CE03A05CB" x="1479" y="396"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_8164_044CE03A05CB" x="1479" y="833"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_0561_419e_8164_044CE03A05CB" x="1599" y="833"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0561_419e_ABED_4C9AC22FFF2A" x="2134" y="460"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0561_419e_ABED_4C9AC22FFF2A" x="2253" y="460"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0561_419e_ABED_4C9AC22FFF2A" x="2253" y="820"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_0561_419e_ABED_4C9AC22FFF2A" x="1806" y="820"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_D71DB35F_3004_48e5_8866_708D88C3BB20" isFrame="false" modelElement="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_D71DB35F_3004_48e5_8866_708D88C3BB20" isFrame="false" modelElement="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D71DB35F_3004_48e5_8C41_DD186A53D6A9" modelElement="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3004_48e5_8C41_DD186A53D6A9" text="cccev:Evidence"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3004_48e5_8C41_DD186A53D6A9" x="890" y="545" width="171" height="72"/>
@@ -816,15 +837,16 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_3004_48e5_95E8_EBFA7B9EEE7D" text="cccev:Criterion"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3004_48e5_95E8_EBFA7B9EEE7D" x="838" y="160" width="275" height="70"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_B341_A616866CD789" source="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" target="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B" modelElement="EAID_CE6EADDE_0D7D_40a5_B341_A616866CD789">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_B341_A616866CD789" text="+cccev:supportsValue" modelElement="EAID_dst6EADDE_0D7D_40a5_B341_A616866CD789">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_B341_A616866CD789" x="927" y="686" width="88" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_8C22_10175EEF3A31" source="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B" target="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" modelElement="EAID_CFC6423E_1A9A_47fb_8C22_10175EEF3A31">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_8C22_10175EEF3A31" text="+cccev:providesValueFor" modelElement="EAID_dstC6423E_1A9A_47fb_8C22_10175EEF3A31">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_8C22_10175EEF3A31" x="1219" y="643" width="101" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_B341_A616866CD789" text="0..*" modelElement="EAID_dst6EADDE_0D7D_40a5_B341_A616866CD789">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_B341_A616866CD789" x="983" y="711" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_8C22_10175EEF3A31" text="0..*" modelElement="EAID_dstC6423E_1A9A_47fb_8C22_10175EEF3A31">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_8C22_10175EEF3A31" x="1286" y="621" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_B341_A616866CD789" x="975" y="617"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_B341_A616866CD789" x="975" y="729"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_8C22_10175EEF3A31" x="1055" y="748"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_8C22_10175EEF3A31" x="1274" y="748"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_8C22_10175EEF3A31" x="1274" y="616"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_9E28_8D741E0840F3" source="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" target="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" modelElement="EAID_18CF5F1B_45DD_4b29_9E28_8D741E0840F3">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_9E28_8D741E0840F3" text="+epo:specifiesProcurementCriterion" modelElement="EAID_dstCF5F1B_45DD_4b29_9E28_8D741E0840F3">
@@ -910,6 +932,11 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_829F_004DFE769A97" x="858" y="553"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_829F_004DFE769A97" x="858" y="496"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_919A_46302D44059E" source="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" target="EAID_B7F675EC_18B3_49b1_AAF4_E0FAB88D85EE" modelElement="EAID_A7C105EE_0251_4249_919A_46302D44059E">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_919A_46302D44059E" x="906" y="617"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_919A_46302D44059E" x="906" y="667"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_919A_46302D44059E" x="823" y="667"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_B370_202D9A0110E0" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_2FF93267_E672_481d_B370_202D9A0110E0">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_B370_202D9A0110E0" text="+org:subOrganizationOf 0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_B370_202D9A0110E0" x="565" y="650" width="115" height="14"/>
@@ -925,6 +952,70 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_3004_48e5_B370_202D9A0110E0" x="556" y="670"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_3004_48e5_B370_202D9A0110E0" x="556" y="670"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_9596_5EC3247529A2" source="EAID_30DD6891_71FE_4f87_832B_477790550BBC" target="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" modelElement="EAID_6492D4E3_9631_45d4_9596_5EC3247529A2">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_9596_5EC3247529A2" x="760" y="317"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_9596_5EC3247529A2" x="890" y="317"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_BCCF_3E7847170DBD" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" modelElement="EAID_ACF95470_AB2B_4b7d_BCCF_3E7847170DBD">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_BCCF_3E7847170DBD" text="+epo-sub:specifiesResponse" modelElement="EAID_dstF95470_AB2B_4b7d_BCCF_3E7847170DBD">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_BCCF_3E7847170DBD" x="528" y="563" width="113" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_BCCF_3E7847170DBD" text="1..*" modelElement="EAID_dstF95470_AB2B_4b7d_BCCF_3E7847170DBD">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_BCCF_3E7847170DBD" x="624" y="586" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_BCCF_3E7847170DBD" x="525" y="581"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_BCCF_3E7847170DBD" x="643" y="581"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_A69F_C36E3ABE8273" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" modelElement="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_A69F_C36E3ABE8273" text="+epo-sub:refersToOtherESPDResponse 0..*" modelElement="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_A69F_C36E3ABE8273" x="302" y="523" width="158" height="27"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_A69F_C36E3ABE8273" text="0..*" modelElement="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_A69F_C36E3ABE8273" x="406" y="563" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_A69F_C36E3ABE8273" x="427" y="546"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_A69F_C36E3ABE8273" x="427" y="546"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_A69F_C36E3ABE8273" x="427" y="511"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_3004_48e5_A69F_C36E3ABE8273" x="377" y="511"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_3004_48e5_A69F_C36E3ABE8273" x="377" y="558"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_3004_48e5_A69F_C36E3ABE8273" x="409" y="558"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_3004_48e5_A69F_C36E3ABE8273" x="409" y="558"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_A0FF_14B7A0FB6A6B" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" modelElement="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_A0FF_14B7A0FB6A6B" text="+epo-sub:relatesToESPDRequest" modelElement="EAID_dstBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_A0FF_14B7A0FB6A6B" x="398" y="483" width="131" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_A0FF_14B7A0FB6A6B" text="1" modelElement="EAID_dstBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_A0FF_14B7A0FB6A6B" x="479" y="467" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_A0FF_14B7A0FB6A6B" x="467" y="546"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_A0FF_14B7A0FB6A6B" x="467" y="462"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_850D_83D60BFADA1F" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_850D_83D60BFADA1F" text="+epo-sub:providesInformationOn" modelElement="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_850D_83D60BFADA1F" x="409" y="629" width="134" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_850D_83D60BFADA1F" text="0..*" modelElement="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_850D_83D60BFADA1F" x="478" y="652" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_850D_83D60BFADA1F" x="470" y="616"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_850D_83D60BFADA1F" x="470" y="670"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_BFBB_56453EA7473F" source="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" target="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" modelElement="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_BFBB_56453EA7473F" text="+cccev:hasRequirement 0..*" modelElement="EAID_dst59B897_AEE0_4ae9_BFBB_56453EA7473F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_BFBB_56453EA7473F" x="794" y="357" width="114" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_BFBB_56453EA7473F" text="0..*" modelElement="EAID_dst59B897_AEE0_4ae9_BFBB_56453EA7473F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_BFBB_56453EA7473F" x="927" y="357" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_BFBB_56453EA7473F" x="890" y="339"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_BFBB_56453EA7473F" x="890" y="339"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_BFBB_56453EA7473F" x="867" y="339"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_3004_48e5_BFBB_56453EA7473F" x="867" y="391"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_3004_48e5_BFBB_56453EA7473F" x="915" y="391"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_3004_48e5_BFBB_56453EA7473F" x="915" y="352"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_3004_48e5_BFBB_56453EA7473F" x="915" y="352"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_AA04_83E4BB664FCB" source="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" target="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" modelElement="EAID_8990AB87_7AAE_4276_AA04_83E4BB664FCB">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_AA04_83E4BB664FCB" text="+cccev:supportsConcept" modelElement="EAID_dst90AB87_7AAE_4276_AA04_83E4BB664FCB">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_AA04_83E4BB664FCB" x="1082" y="562" width="97" height="14"/>
@@ -935,41 +1026,31 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_AA04_83E4BB664FCB" x="1061" y="580"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_AA04_83E4BB664FCB" x="1181" y="580"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_AEDA_E49049545B3B" source="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" target="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" modelElement="EAID_04EC0265_2665_47d4_AEDA_E49049545B3B">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_AEDA_E49049545B3B" x="1124" y="496"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_AEDA_E49049545B3B" x="1124" y="552"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_AEDA_E49049545B3B" x="1061" y="552"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_8C22_10175EEF3A31" source="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B" target="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" modelElement="EAID_CFC6423E_1A9A_47fb_8C22_10175EEF3A31">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_8C22_10175EEF3A31" text="+cccev:providesValueFor" modelElement="EAID_dstC6423E_1A9A_47fb_8C22_10175EEF3A31">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_8C22_10175EEF3A31" x="1219" y="643" width="101" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_B341_A616866CD789" source="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" target="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B" modelElement="EAID_CE6EADDE_0D7D_40a5_B341_A616866CD789">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_B341_A616866CD789" text="+cccev:supportsValue" modelElement="EAID_dst6EADDE_0D7D_40a5_B341_A616866CD789">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_B341_A616866CD789" x="927" y="686" width="88" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_8C22_10175EEF3A31" text="0..*" modelElement="EAID_dstC6423E_1A9A_47fb_8C22_10175EEF3A31">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_8C22_10175EEF3A31" x="1286" y="621" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_B341_A616866CD789" text="0..*" modelElement="EAID_dst6EADDE_0D7D_40a5_B341_A616866CD789">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_B341_A616866CD789" x="983" y="711" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_8C22_10175EEF3A31" x="1055" y="748"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_8C22_10175EEF3A31" x="1274" y="748"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_8C22_10175EEF3A31" x="1274" y="616"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_B341_A616866CD789" x="975" y="617"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_B341_A616866CD789" x="975" y="729"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_857E_2AD843DEF3DE" source="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" target="EAID_30DD6891_71FE_4f87_832B_477790550BBC" modelElement="EAID_5715AB6B_F88D_4b3e_857E_2AD843DEF3DE">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_857E_2AD843DEF3DE" text="+epo-sub:answersQuestion" modelElement="EAID_dst15AB6B_F88D_4b3e_857E_2AD843DEF3DE">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_857E_2AD843DEF3DE" x="616" y="385" width="110" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_8B7E_A25D4A6C9048" source="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_B2FBB3C3_8542_4cd9_8B7E_A25D4A6C9048">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_8B7E_A25D4A6C9048" text="+epo-sub:refersToApplicablePeriod" modelElement="EAID_dstFBB3C3_8542_4cd9_8B7E_A25D4A6C9048">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_8B7E_A25D4A6C9048" x="695" y="518" width="140" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_857E_2AD843DEF3DE" text="0..*" modelElement="EAID_dst15AB6B_F88D_4b3e_857E_2AD843DEF3DE">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_857E_2AD843DEF3DE" x="696" y="353" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_8B7E_A25D4A6C9048" text="0..1" modelElement="EAID_dstFBB3C3_8542_4cd9_8B7E_A25D4A6C9048">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_8B7E_A25D4A6C9048" x="782" y="501" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_857E_2AD843DEF3DE" x="684" y="546"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_857E_2AD843DEF3DE" x="684" y="348"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_8B7E_A25D4A6C9048" x="733" y="554"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_8B7E_A25D4A6C9048" x="770" y="554"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_8B7E_A25D4A6C9048" x="770" y="496"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_A6F8_522396CE72CF" source="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" target="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" modelElement="EAID_93B47F0D_8871_4230_A6F8_522396CE72CF">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_A6F8_522396CE72CF" text="+epo-sub:isReinforcedBy" modelElement="EAID_dstB47F0D_8871_4230_A6F8_522396CE72CF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_A6F8_522396CE72CF" x="789" y="561" width="99" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_A6F8_522396CE72CF" text="0..*" modelElement="EAID_dstB47F0D_8871_4230_A6F8_522396CE72CF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_A6F8_522396CE72CF" x="871" y="586" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_A6F8_522396CE72CF" x="733" y="581"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_A6F8_522396CE72CF" x="890" y="581"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_83C6_69057788A49B" source="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" target="EAID_B7F675EC_18B3_49b1_AAF4_E0FAB88D85EE" modelElement="EAID_49631FAC_5F3D_4939_83C6_69057788A49B">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_83C6_69057788A49B" x="733" y="602"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_83C6_69057788A49B" x="774" y="602"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_83C6_69057788A49B" x="774" y="653"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_B49E_48C56317F5F9" source="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" target="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B" modelElement="EAID_3EE371EF_8DF9_4747_B49E_48C56317F5F9">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_B49E_48C56317F5F9" text="+cccev:supportsValue" modelElement="EAID_dstE371EF_8DF9_4747_B49E_48C56317F5F9">
@@ -982,25 +1063,30 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_B49E_48C56317F5F9" x="687" y="750"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_B49E_48C56317F5F9" x="895" y="750"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_83C6_69057788A49B" source="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" target="EAID_B7F675EC_18B3_49b1_AAF4_E0FAB88D85EE" modelElement="EAID_49631FAC_5F3D_4939_83C6_69057788A49B">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_83C6_69057788A49B" x="733" y="602"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_83C6_69057788A49B" x="774" y="602"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_83C6_69057788A49B" x="774" y="653"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_A6F8_522396CE72CF" source="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" target="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" modelElement="EAID_93B47F0D_8871_4230_A6F8_522396CE72CF">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_A6F8_522396CE72CF" text="+epo-sub:isReinforcedBy" modelElement="EAID_dstB47F0D_8871_4230_A6F8_522396CE72CF">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_A6F8_522396CE72CF" x="789" y="561" width="99" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_A6F8_522396CE72CF" text="0..*" modelElement="EAID_dstB47F0D_8871_4230_A6F8_522396CE72CF">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_A6F8_522396CE72CF" x="871" y="586" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_A6F8_522396CE72CF" x="733" y="581"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_A6F8_522396CE72CF" x="890" y="581"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_8B7E_A25D4A6C9048" source="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_B2FBB3C3_8542_4cd9_8B7E_A25D4A6C9048">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_8B7E_A25D4A6C9048" text="+epo-sub:refersToApplicablePeriod" modelElement="EAID_dstFBB3C3_8542_4cd9_8B7E_A25D4A6C9048">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_8B7E_A25D4A6C9048" x="695" y="518" width="140" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_857E_2AD843DEF3DE" source="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" target="EAID_30DD6891_71FE_4f87_832B_477790550BBC" modelElement="EAID_5715AB6B_F88D_4b3e_857E_2AD843DEF3DE">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_857E_2AD843DEF3DE" text="+epo-sub:answersQuestion" modelElement="EAID_dst15AB6B_F88D_4b3e_857E_2AD843DEF3DE">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_857E_2AD843DEF3DE" x="616" y="385" width="110" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_8B7E_A25D4A6C9048" text="0..1" modelElement="EAID_dstFBB3C3_8542_4cd9_8B7E_A25D4A6C9048">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_8B7E_A25D4A6C9048" x="782" y="501" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_857E_2AD843DEF3DE" text="0..*" modelElement="EAID_dst15AB6B_F88D_4b3e_857E_2AD843DEF3DE">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_857E_2AD843DEF3DE" x="696" y="353" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_8B7E_A25D4A6C9048" x="733" y="554"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_8B7E_A25D4A6C9048" x="770" y="554"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_8B7E_A25D4A6C9048" x="770" y="496"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_857E_2AD843DEF3DE" x="684" y="546"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_857E_2AD843DEF3DE" x="684" y="348"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_9596_5EC3247529A2" source="EAID_30DD6891_71FE_4f87_832B_477790550BBC" target="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" modelElement="EAID_6492D4E3_9631_45d4_9596_5EC3247529A2">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_9596_5EC3247529A2" x="760" y="317"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_9596_5EC3247529A2" x="890" y="317"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_AEDA_E49049545B3B" source="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" target="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" modelElement="EAID_04EC0265_2665_47d4_AEDA_E49049545B3B">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_AEDA_E49049545B3B" x="1124" y="496"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_AEDA_E49049545B3B" x="1124" y="552"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_AEDA_E49049545B3B" x="1061" y="552"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_BB1B_A5C475115AB1" source="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" target="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" modelElement="EAID_4CC3B6CA_493A_4ff6_BB1B_A5C475115AB1">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_BB1B_A5C475115AB1" text="+cccev:hasConcept" modelElement="EAID_dstC3B6CA_493A_4ff6_BB1B_A5C475115AB1">
@@ -1013,58 +1099,8 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_BB1B_A5C475115AB1" x="1270" y="310"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_BB1B_A5C475115AB1" x="1270" y="546"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_BFBB_56453EA7473F" source="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" target="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" modelElement="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_BFBB_56453EA7473F" text="+cccev:hasRequirement 0..*" modelElement="EAID_dst59B897_AEE0_4ae9_BFBB_56453EA7473F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_BFBB_56453EA7473F" x="794" y="357" width="114" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_BFBB_56453EA7473F" text="0..*" modelElement="EAID_dst59B897_AEE0_4ae9_BFBB_56453EA7473F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_BFBB_56453EA7473F" x="927" y="357" width="100" height="10"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_BFBB_56453EA7473F" x="890" y="339"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_BFBB_56453EA7473F" x="890" y="339"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_BFBB_56453EA7473F" x="867" y="339"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_3004_48e5_BFBB_56453EA7473F" x="867" y="391"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_3004_48e5_BFBB_56453EA7473F" x="915" y="391"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_3004_48e5_BFBB_56453EA7473F" x="915" y="352"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_3004_48e5_BFBB_56453EA7473F" x="915" y="352"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_850D_83D60BFADA1F" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_850D_83D60BFADA1F" text="+epo-sub:providesInformationOn" modelElement="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_850D_83D60BFADA1F" x="409" y="629" width="134" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_850D_83D60BFADA1F" text="0..*" modelElement="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_850D_83D60BFADA1F" x="478" y="652" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_850D_83D60BFADA1F" x="470" y="616"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_850D_83D60BFADA1F" x="470" y="670"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_A0FF_14B7A0FB6A6B" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" modelElement="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_A0FF_14B7A0FB6A6B" text="+epo-sub:relatesToESPDRequest" modelElement="EAID_dstBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_A0FF_14B7A0FB6A6B" x="398" y="483" width="131" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_A0FF_14B7A0FB6A6B" text="1" modelElement="EAID_dstBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_A0FF_14B7A0FB6A6B" x="479" y="467" width="6" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_A0FF_14B7A0FB6A6B" x="467" y="546"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_A0FF_14B7A0FB6A6B" x="467" y="462"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_BCCF_3E7847170DBD" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" modelElement="EAID_ACF95470_AB2B_4b7d_BCCF_3E7847170DBD">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3004_48e5_BCCF_3E7847170DBD" text="+epo-sub:specifiesResponse" modelElement="EAID_dstF95470_AB2B_4b7d_BCCF_3E7847170DBD">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3004_48e5_BCCF_3E7847170DBD" x="528" y="563" width="113" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3004_48e5_BCCF_3E7847170DBD" text="1..*" modelElement="EAID_dstF95470_AB2B_4b7d_BCCF_3E7847170DBD">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3004_48e5_BCCF_3E7847170DBD" x="624" y="586" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_BCCF_3E7847170DBD" x="525" y="581"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_BCCF_3E7847170DBD" x="643" y="581"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D71DB35F_3004_48e5_919A_46302D44059E" source="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" target="EAID_B7F675EC_18B3_49b1_AAF4_E0FAB88D85EE" modelElement="EAID_A7C105EE_0251_4249_919A_46302D44059E">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3004_48e5_919A_46302D44059E" x="906" y="617"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3004_48e5_919A_46302D44059E" x="906" y="667"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3004_48e5_919A_46302D44059E" x="823" y="667"/>
-			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_ADDA7381_B80A_426d_9FF6_137732CADDEF" isFrame="false" modelElement="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_ADDA7381_B80A_426d_9FF6_137732CADDEF" isFrame="false" modelElement="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_ADDA7381_B80A_426d_B117_6B8C8C53C370" modelElement="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B80A_426d_B117_6B8C8C53C370" text="epo-sub:ESPD"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B80A_426d_B117_6B8C8C53C370" x="323" y="368" width="124" height="49"/>
@@ -1176,6 +1212,20 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_850D_83D60BFADA1F" x="447" y="394"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_850D_83D60BFADA1F" x="590" y="394"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_A69F_C36E3ABE8273" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" modelElement="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_B80A_426d_A69F_C36E3ABE8273" text="+epo-sub:refersToOtherESPDResponse 0..*" modelElement="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B80A_426d_A69F_C36E3ABE8273" x="300" y="321" width="174" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_B80A_426d_A69F_C36E3ABE8273" text="0..*" modelElement="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B80A_426d_A69F_C36E3ABE8273" x="361" y="363" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B80A_426d_A69F_C36E3ABE8273" x="414" y="368"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B80A_426d_A69F_C36E3ABE8273" x="414" y="368"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_B80A_426d_A69F_C36E3ABE8273" x="414" y="340"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_B80A_426d_A69F_C36E3ABE8273" x="353" y="340"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_B80A_426d_A69F_C36E3ABE8273" x="353" y="368"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_B80A_426d_A69F_C36E3ABE8273" x="353" y="368"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_ADDA7381_B80A_426d_9B8B_96AA208D3134" source="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_7775FD52_1FE1_445c_9B8B_96AA208D3134">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_B80A_426d_9B8B_96AA208D3134" text="+epo:actsOnBehalfOf" modelElement="EAID_dst75FD52_1FE1_445c_9B8B_96AA208D3134">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B80A_426d_9B8B_96AA208D3134" x="1334" y="282" width="87" height="14"/>
@@ -1363,7 +1413,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_B80A_426d_947D_E6C47AAC7527" x="1264" y="209"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_94074245_1A03_44a0_83B7_7B182F8F5B41" isFrame="false" modelElement="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_94074245_1A03_44a0_83B7_7B182F8F5B41" isFrame="false" modelElement="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_94074245_1A03_44a0_B117_6B8C8C53C370" modelElement="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1A03_44a0_B117_6B8C8C53C370" text="epo-sub:ESPD"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1A03_44a0_B117_6B8C8C53C370" x="13" y="181" width="132" height="59"/>
@@ -1422,7 +1472,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1A03_44a0_A0FF_14B7A0FB6A6B" x="79" y="112"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_71E43A2B_6D3D_4d9e_91FD_0F721EA0B021" isFrame="false" modelElement="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_71E43A2B_6D3D_4d9e_91FD_0F721EA0B021" isFrame="false" modelElement="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_71E43A2B_6D3D_4d9e_B117_6B8C8C53C370" modelElement="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6D3D_4d9e_B117_6B8C8C53C370" text="epo-sub:ESPD"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6D3D_4d9e_B117_6B8C8C53C370" x="197" y="388" width="140" height="40"/>
@@ -1542,7 +1592,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6D3D_4d9e_9BA9_5CF8B7A9D5AB" x="493" y="114"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_F3B9C2EE_40B3_4257_AFB2_39EE389FC525" isFrame="false" modelElement="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_F3B9C2EE_40B3_4257_AFB2_39EE389FC525" isFrame="false" modelElement="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F3B9C2EE_40B3_4257_B117_6B8C8C53C370" modelElement="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_40B3_4257_B117_6B8C8C53C370" text="epo-sub:ESPD"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_40B3_4257_B117_6B8C8C53C370" x="417" y="221" width="119" height="84"/>
@@ -1587,36 +1637,85 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_40B3_4257_ADAC_88A2D6017C32" text="epo:Candidate"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_40B3_4257_ADAC_88A2D6017C32" x="9" y="277" width="90" height="35"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_8164_044CE03A05CB" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_40B3_4257_8164_044CE03A05CB" text="+epo:hasTaxIdentifier" modelElement="EAID_dstABB55C_F52F_4373_8164_044CE03A05CB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_40B3_4257_8164_044CE03A05CB" x="1064" y="214" width="88" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_40B3_4257_8164_044CE03A05CB" text="0..*" modelElement="EAID_dstABB55C_F52F_4373_8164_044CE03A05CB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_40B3_4257_8164_044CE03A05CB" x="1121" y="182" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_8164_044CE03A05CB" x="931" y="278"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_8164_044CE03A05CB" x="1109" y="278"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_40B3_4257_8164_044CE03A05CB" x="1109" y="177"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_A69F_C36E3ABE8273" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" modelElement="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_40B3_4257_A69F_C36E3ABE8273" text="+epo-sub:refersToOtherESPDResponse 0..*" modelElement="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_40B3_4257_A69F_C36E3ABE8273" x="317" y="200" width="158" height="27"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_40B3_4257_A69F_C36E3ABE8273" text="0..*" modelElement="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_40B3_4257_A69F_C36E3ABE8273" x="414" y="245" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_A69F_C36E3ABE8273" x="436" y="221"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_A69F_C36E3ABE8273" x="436" y="221"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_40B3_4257_A69F_C36E3ABE8273" x="436" y="194"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_40B3_4257_A69F_C36E3ABE8273" x="376" y="194"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_40B3_4257_A69F_C36E3ABE8273" x="376" y="240"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_40B3_4257_A69F_C36E3ABE8273" x="417" y="240"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_40B3_4257_A69F_C36E3ABE8273" x="417" y="240"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_947D_E6C47AAC7527" source="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" target="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" modelElement="EAID_4657FAEB_1A34_4ef7_947D_E6C47AAC7527">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_947D_E6C47AAC7527" x="247" y="133"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_947D_E6C47AAC7527" x="417" y="133"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_BCE2_05E832F758D6" source="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" target="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" modelElement="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_40B3_4257_BCE2_05E832F758D6" text="+epo:playedBy" modelElement="EAID_dst9200E2_D732_4a5e_BCE2_05E832F758D6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_40B3_4257_BCE2_05E832F758D6" x="659" y="115" width="61" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_40B3_4257_BCE2_05E832F758D6" text="1" modelElement="EAID_dst9200E2_D732_4a5e_BCE2_05E832F758D6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_40B3_4257_BCE2_05E832F758D6" x="714" y="138" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_BCE2_05E832F758D6" x="588" y="133"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_BCE2_05E832F758D6" x="722" y="133"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_B084_12D7110FE9E0" source="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_319F106B_6066_4ba7_B084_12D7110FE9E0">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_40B3_4257_B084_12D7110FE9E0" text="+adms:identifier" modelElement="EAID_dst9F106B_6066_4ba7_B084_12D7110FE9E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_40B3_4257_B084_12D7110FE9E0" x="890" y="115" width="66" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_40B3_4257_B084_12D7110FE9E0" text="0..*" modelElement="EAID_dst9F106B_6066_4ba7_B084_12D7110FE9E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_40B3_4257_B084_12D7110FE9E0" x="939" y="138" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_B084_12D7110FE9E0" x="886" y="133"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_B084_12D7110FE9E0" x="958" y="133"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_A3E1_A997E86942D2" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" modelElement="EAID_19AD8C15_4D9D_48f2_A3E1_A997E86942D2">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_A3E1_A997E86942D2" x="804" y="213"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_A3E1_A997E86942D2" x="804" y="168"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_850D_83D60BFADA1F" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_40B3_4257_850D_83D60BFADA1F" text="+epo-sub:providesInformationOn" modelElement="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_40B3_4257_850D_83D60BFADA1F" x="540" y="244" width="134" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_40B3_4257_850D_83D60BFADA1F" text="0..*" modelElement="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_40B3_4257_850D_83D60BFADA1F" x="659" y="268" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_850D_83D60BFADA1F" x="536" y="263"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_850D_83D60BFADA1F" x="678" y="263"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_AE66_986280A7B2F6" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_40B3_4257_AE66_986280A7B2F6" text="+epo:hasLegalIdentifier" modelElement="EAID_dst57F338_A3A5_457d_AE66_986280A7B2F6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_40B3_4257_AE66_986280A7B2F6" x="979" y="201" width="95" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_40B3_4257_AE66_986280A7B2F6" text="0..*" modelElement="EAID_dst57F338_A3A5_457d_AE66_986280A7B2F6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_40B3_4257_AE66_986280A7B2F6" x="1051" y="182" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_AE66_986280A7B2F6" x="931" y="247"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_AE66_986280A7B2F6" x="1039" y="247"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_40B3_4257_AE66_986280A7B2F6" x="1039" y="177"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_B47E_F671B4F00F63" source="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_28774B07_2278_44a1_B47E_F671B4F00F63">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_B47E_F671B4F00F63" x="69" y="277"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_B47E_F671B4F00F63" x="169" y="168"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_AEF4_9EBDE5851B98" source="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_5729A98B_A925_4816_AEF4_9EBDE5851B98">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_AEF4_9EBDE5851B98" x="335" y="277"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_AEF4_9EBDE5851B98" x="234" y="168"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_A409_64CB2CE61248" source="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_199C3BDF_913A_42e4_A409_64CB2CE61248">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_A409_64CB2CE61248" x="158" y="277"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_A409_64CB2CE61248" x="191" y="168"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_A43E_D33DC6607852" source="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_A27A53B2_A6D1_4fdd_A43E_D33DC6607852">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_A43E_D33DC6607852" x="246" y="277"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_A43E_D33DC6607852" x="212" y="168"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_BB86_A2E25524B058" source="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_881F7772_9A6C_4e5a_BB86_A2E25524B058">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_BB86_A2E25524B058" x="746" y="382"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_BB86_A2E25524B058" x="746" y="314"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_B906_6DB183F74D9F" source="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_0AA8BD10_946A_403c_B906_6DB183F74D9F">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_40B3_4257_B906_6DB183F74D9F" text="+epo:hasMember" modelElement="EAID_dstA8BD10_946A_403c_B906_6DB183F74D9F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_40B3_4257_B906_6DB183F74D9F" x="834" y="338" width="73" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_40B3_4257_B906_6DB183F74D9F" text="1..*" modelElement="EAID_dstA8BD10_946A_403c_B906_6DB183F74D9F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_40B3_4257_B906_6DB183F74D9F" x="879" y="319" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_B906_6DB183F74D9F" x="867" y="382"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_B906_6DB183F74D9F" x="867" y="314"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_A6DF_915A5FB0B3DB" source="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_F3F440DD_AB87_4730_A6DF_915A5FB0B3DB">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_40B3_4257_A6DF_915A5FB0B3DB" text="+epo:leadBy" modelElement="EAID_dstF440DD_AB87_4730_A6DF_915A5FB0B3DB">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_40B3_4257_A6DF_915A5FB0B3DB" x="776" y="351" width="51" height="14"/>
@@ -1627,27 +1726,31 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_A6DF_915A5FB0B3DB" x="802" y="382"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_A6DF_915A5FB0B3DB" x="802" y="314"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_8164_044CE03A05CB" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_40B3_4257_8164_044CE03A05CB" text="+epo:hasTaxIdentifier" modelElement="EAID_dstABB55C_F52F_4373_8164_044CE03A05CB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_40B3_4257_8164_044CE03A05CB" x="1064" y="214" width="88" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_B906_6DB183F74D9F" source="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_0AA8BD10_946A_403c_B906_6DB183F74D9F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_40B3_4257_B906_6DB183F74D9F" text="+epo:hasMember" modelElement="EAID_dstA8BD10_946A_403c_B906_6DB183F74D9F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_40B3_4257_B906_6DB183F74D9F" x="834" y="338" width="73" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_40B3_4257_8164_044CE03A05CB" text="0..*" modelElement="EAID_dstABB55C_F52F_4373_8164_044CE03A05CB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_40B3_4257_8164_044CE03A05CB" x="1121" y="182" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_40B3_4257_B906_6DB183F74D9F" text="1..*" modelElement="EAID_dstA8BD10_946A_403c_B906_6DB183F74D9F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_40B3_4257_B906_6DB183F74D9F" x="879" y="319" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_8164_044CE03A05CB" x="931" y="278"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_8164_044CE03A05CB" x="1109" y="278"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_40B3_4257_8164_044CE03A05CB" x="1109" y="177"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_B906_6DB183F74D9F" x="867" y="382"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_B906_6DB183F74D9F" x="867" y="314"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_AE66_986280A7B2F6" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_40B3_4257_AE66_986280A7B2F6" text="+epo:hasLegalIdentifier" modelElement="EAID_dst57F338_A3A5_457d_AE66_986280A7B2F6">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_40B3_4257_AE66_986280A7B2F6" x="979" y="201" width="95" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_40B3_4257_AE66_986280A7B2F6" text="0..*" modelElement="EAID_dst57F338_A3A5_457d_AE66_986280A7B2F6">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_40B3_4257_AE66_986280A7B2F6" x="1051" y="182" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_AE66_986280A7B2F6" x="931" y="247"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_AE66_986280A7B2F6" x="1039" y="247"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_40B3_4257_AE66_986280A7B2F6" x="1039" y="177"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_BB86_A2E25524B058" source="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_881F7772_9A6C_4e5a_BB86_A2E25524B058">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_BB86_A2E25524B058" x="746" y="382"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_BB86_A2E25524B058" x="746" y="314"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_A43E_D33DC6607852" source="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_A27A53B2_A6D1_4fdd_A43E_D33DC6607852">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_A43E_D33DC6607852" x="246" y="277"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_A43E_D33DC6607852" x="212" y="168"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_A409_64CB2CE61248" source="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_199C3BDF_913A_42e4_A409_64CB2CE61248">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_A409_64CB2CE61248" x="158" y="277"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_A409_64CB2CE61248" x="191" y="168"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_AEF4_9EBDE5851B98" source="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_5729A98B_A925_4816_AEF4_9EBDE5851B98">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_AEF4_9EBDE5851B98" x="335" y="277"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_AEF4_9EBDE5851B98" x="234" y="168"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_B370_202D9A0110E0" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_2FF93267_E672_481d_B370_202D9A0110E0">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_40B3_4257_B370_202D9A0110E0" text="+org:subOrganizationOf 0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
@@ -1663,46 +1766,8 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_40B3_4257_B370_202D9A0110E0" x="719" y="213"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_40B3_4257_B370_202D9A0110E0" x="719" y="213"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_A3E1_A997E86942D2" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" modelElement="EAID_19AD8C15_4D9D_48f2_A3E1_A997E86942D2">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_A3E1_A997E86942D2" x="804" y="213"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_A3E1_A997E86942D2" x="804" y="168"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_B084_12D7110FE9E0" source="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_319F106B_6066_4ba7_B084_12D7110FE9E0">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_40B3_4257_B084_12D7110FE9E0" text="+adms:identifier" modelElement="EAID_dst9F106B_6066_4ba7_B084_12D7110FE9E0">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_40B3_4257_B084_12D7110FE9E0" x="890" y="115" width="66" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_40B3_4257_B084_12D7110FE9E0" text="0..*" modelElement="EAID_dst9F106B_6066_4ba7_B084_12D7110FE9E0">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_40B3_4257_B084_12D7110FE9E0" x="939" y="138" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_B084_12D7110FE9E0" x="886" y="133"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_B084_12D7110FE9E0" x="958" y="133"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_BCE2_05E832F758D6" source="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" target="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" modelElement="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_40B3_4257_BCE2_05E832F758D6" text="+epo:playedBy" modelElement="EAID_dst9200E2_D732_4a5e_BCE2_05E832F758D6">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_40B3_4257_BCE2_05E832F758D6" x="659" y="115" width="61" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_40B3_4257_BCE2_05E832F758D6" text="1" modelElement="EAID_dst9200E2_D732_4a5e_BCE2_05E832F758D6">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_40B3_4257_BCE2_05E832F758D6" x="714" y="138" width="6" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_BCE2_05E832F758D6" x="588" y="133"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_BCE2_05E832F758D6" x="722" y="133"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_947D_E6C47AAC7527" source="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" target="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" modelElement="EAID_4657FAEB_1A34_4ef7_947D_E6C47AAC7527">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_947D_E6C47AAC7527" x="247" y="133"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_947D_E6C47AAC7527" x="417" y="133"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F3B9C2EE_40B3_4257_850D_83D60BFADA1F" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_40B3_4257_850D_83D60BFADA1F" text="+epo-sub:providesInformationOn" modelElement="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_40B3_4257_850D_83D60BFADA1F" x="540" y="244" width="134" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_40B3_4257_850D_83D60BFADA1F" text="0..*" modelElement="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_40B3_4257_850D_83D60BFADA1F" x="659" y="268" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_40B3_4257_850D_83D60BFADA1F" x="536" y="263"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_40B3_4257_850D_83D60BFADA1F" x="678" y="263"/>
-			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_7390C0BE_0F05_4823_ABE3_07757EF6B2CF" isFrame="false" modelElement="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_7390C0BE_0F05_4823_ABE3_07757EF6B2CF" isFrame="false" modelElement="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_7390C0BE_0F05_4823_B117_6B8C8C53C370" modelElement="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0F05_4823_B117_6B8C8C53C370" text="epo-sub:ESPD"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0F05_4823_B117_6B8C8C53C370" x="310" y="297" width="143" height="44"/>
@@ -1733,6 +1798,21 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0F05_4823_AEDA_E49049545B3B" x="501" y="145"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0F05_4823_AEDA_E49049545B3B" x="676" y="145"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_7390C0BE_0F05_4823_A69F_C36E3ABE8273" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" modelElement="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0F05_4823_A69F_C36E3ABE8273" text="+epo-sub:refersToOtherESPDResponse 0..*" modelElement="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0F05_4823_A69F_C36E3ABE8273" x="181" y="278" width="174" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0F05_4823_A69F_C36E3ABE8273" text="0..*" modelElement="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0F05_4823_A69F_C36E3ABE8273" x="307" y="327" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0F05_4823_A69F_C36E3ABE8273" x="323" y="297"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0F05_4823_A69F_C36E3ABE8273" x="323" y="297"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0F05_4823_A69F_C36E3ABE8273" x="323" y="264"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_0F05_4823_A69F_C36E3ABE8273" x="271" y="264"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_0F05_4823_A69F_C36E3ABE8273" x="271" y="322"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_0F05_4823_A69F_C36E3ABE8273" x="310" y="322"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_0F05_4823_A69F_C36E3ABE8273" x="310" y="322"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_7390C0BE_0F05_4823_850D_83D60BFADA1F" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" modelElement="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0F05_4823_850D_83D60BFADA1F" text="+epo-sub:providesInformationOn" modelElement="EAID_dstFF2FFB_41B4_4817_850D_83D60BFADA1F">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0F05_4823_850D_83D60BFADA1F" x="457" y="301" width="134" height="14"/>
@@ -1744,7 +1824,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0F05_4823_850D_83D60BFADA1F" x="593" y="319"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_A6FFBF40_ABD7_4fa9_9509_ADCA4A6A99C0" isFrame="false" modelElement="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_A6FFBF40_ABD7_4fa9_9509_ADCA4A6A99C0" isFrame="false" modelElement="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A6FFBF40_ABD7_4fa9_B117_6B8C8C53C370" modelElement="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_ABD7_4fa9_B117_6B8C8C53C370" text="epo-sub:ESPD"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ABD7_4fa9_B117_6B8C8C53C370" x="151" y="79" width="140" height="44"/>
@@ -1837,7 +1917,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ABD7_4fa9_850D_83D60BFADA1F" x="220" y="181"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_D57C0343_5A78_480c_A411_138E27851C00" isFrame="false" modelElement="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_D57C0343_5A78_480c_A411_138E27851C00" isFrame="false" modelElement="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D57C0343_5A78_480c_B3F6_8FC4EB9806DC" modelElement="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5A78_480c_B3F6_8FC4EB9806DC" text="cccev:Requirement"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5A78_480c_B3F6_8FC4EB9806DC" x="694" y="105" width="171" height="70"/>
@@ -1915,6 +1995,21 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5A78_480c_BCCF_3E7847170DBD" x="209" y="358"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5A78_480c_BCCF_3E7847170DBD" x="209" y="294"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D57C0343_5A78_480c_A69F_C36E3ABE8273" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" modelElement="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5A78_480c_A69F_C36E3ABE8273" text="+epo-sub:refersToOtherESPDResponse 0..*" modelElement="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5A78_480c_A69F_C36E3ABE8273" x="37" y="439" width="158" height="27"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5A78_480c_A69F_C36E3ABE8273" text="0..*" modelElement="EAID_dst159B9F_AFA9_4565_A69F_C36E3ABE8273">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5A78_480c_A69F_C36E3ABE8273" x="167" y="433" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5A78_480c_A69F_C36E3ABE8273" x="151" y="412"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5A78_480c_A69F_C36E3ABE8273" x="151" y="412"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5A78_480c_A69F_C36E3ABE8273" x="105" y="412"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_5A78_480c_A69F_C36E3ABE8273" x="105" y="459"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_5A78_480c_A69F_C36E3ABE8273" x="155" y="459"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_5A78_480c_A69F_C36E3ABE8273" x="155" y="428"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_5A78_480c_A69F_C36E3ABE8273" x="155" y="428"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D57C0343_5A78_480c_A0FF_14B7A0FB6A6B" source="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" target="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" modelElement="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5A78_480c_A0FF_14B7A0FB6A6B" text="+epo-sub:relatesToESPDRequest" modelElement="EAID_dstBCD522_5AC9_4199_A0FF_14B7A0FB6A6B">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5A78_480c_A0FF_14B7A0FB6A6B" x="278" y="370" width="131" height="14"/>
@@ -1985,7 +2080,7 @@
 	<xmi:Extension extender="Enterprise Architect" extenderID="6.5">
 		<elements>
 			<element xmi:idref="EAPK_53638E82_0EE0_4a4c_9560_38B724971FE9">
-				<packageproperties version="1.0" tpos="7"/>
+				<packageproperties version="1.0" tpos="8"/>
 				<paths/>
 				<times created="2024-02-29 00:00:00" modified="2024-02-29 00:00:00"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;"/>
@@ -2004,10 +2099,10 @@
 				<times created="2024-02-29 14:38:13" modified="2024-02-29 14:38:13"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
 			</element>
-			<element xmi:idref="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA" xmi:type="uml:Package" name="diagrams" scope="public">
-				<model package2="EAID_A6963E41_1562_41fc_8AAB_D52C7CFD98EA" package="EAPK_5E7328A3_FB85_43c1_8DA5_AE7A684AE578" tpos="1" ea_localid="258" ea_eleType="package"/>
+			<element xmi:idref="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" xmi:type="uml:Package" name="diagrams" scope="public">
+				<model package2="EAID_8EE934F3_0B94_4baa_9F43_9488B8E902C9" package="EAPK_5E7328A3_FB85_43c1_8DA5_AE7A684AE578" tpos="1" ea_localid="242" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 13:04:32" modified="2024-03-18 13:04:32" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:41:51" modified="2024-07-23 11:41:51" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -2015,39 +2110,13 @@
 				<extendedProperties tagged="0" package_name="submission"/>
 				<packageproperties version="1.0" tpos="1"/>
 				<paths/>
-				<times created="2024-03-18 13:04:32" modified="2024-03-18 13:04:32"/>
+				<times created="2024-07-23 11:41:51" modified="2024-07-23 11:41:51"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
-			<element xmi:idref="EAID_70B4792E_F818_45db_80A4_32F092496FEF" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_9B2D6DCC_5092_48cf_878A_8035A42A43F9">
-				<model package="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA" tpos="0" ea_localid="1932" ea_eleType="element"/>
-				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-06-07 16:21:22" modified="2022-06-07 16:21:22" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
-				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
-				<tags/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="diagrams"/>
-				<links>
-					<Generalization xmi:id="EAID_84F5E9DD_96DE_4ca7_8CA6_9C68826B377B" start="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C" end="EAID_70B4792E_F818_45db_80A4_32F092496FEF"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_D01E7677_5AC2_42b1_AA17_2A8EC003CCFE">
-				<model package="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA" tpos="0" ea_localid="1931" ea_eleType="element"/>
-				<properties isSpecification="false" sType="ProxyConnector" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-06-07 16:21:22" modified="2022-06-07 16:21:22" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
-				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
-				<tags/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="diagrams"/>
-				<links>
-					<Generalization xmi:id="EAID_84F5E9DD_96DE_4ca7_8CA6_9C68826B377B" start="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C" end="EAID_70B4792E_F818_45db_80A4_32F092496FEF"/>
-				</links>
-			</element>
-			<element xmi:idref="EAPK_CA4C7382_A4D6_43c0_AA23_08C9E52AAA0D" xmi:type="uml:Package" name="classes" scope="public">
-				<model package2="EAID_CA4C7382_A4D6_43c0_AA23_08C9E52AAA0D" package="EAPK_5E7328A3_FB85_43c1_8DA5_AE7A684AE578" tpos="2" ea_localid="259" ea_eleType="package"/>
+			<element xmi:idref="EAPK_BF99515E_23A1_4c32_ACF2_57A2EF805C41" xmi:type="uml:Package" name="classes" scope="public">
+				<model package2="EAID_BF99515E_23A1_4c32_ACF2_57A2EF805C41" package="EAPK_5E7328A3_FB85_43c1_8DA5_AE7A684AE578" tpos="2" ea_localid="243" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-03-18 13:04:45" modified="2024-03-18 13:04:45" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-07-23 11:42:06" modified="2024-07-23 11:42:06" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -2055,13 +2124,13 @@
 				<extendedProperties tagged="0" package_name="submission"/>
 				<packageproperties version="1.0" tpos="2"/>
 				<paths/>
-				<times created="2024-03-18 13:04:45" modified="2024-03-18 13:04:45"/>
+				<times created="2024-07-23 11:42:06" modified="2024-07-23 11:42:06"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
 			<element xmi:idref="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B" xmi:type="uml:Class" name="cccev:SupportedValue" scope="public">
-				<model package="EAPK_CA4C7382_A4D6_43c0_AA23_08C9E52AAA0D" tpos="0" ea_localid="3470" ea_eleType="element"/>
+				<model package="EAPK_BF99515E_23A1_4c32_ACF2_57A2EF805C41" tpos="0" ea_localid="3470" ea_eleType="element"/>
 				<properties documentation="Value for an Information Concept that is provided by an Evidence.&#xA;&#xA;Additional Information:&#xA;The notion of Supported Value is closely related to actual data exchange between two parties: (a) the Requirement processor, i.e. the Agent setting out Requirements for an objective and processing the supplied Evidences in the context of the Requirements, and (b) the Evidence provider, i.e. the Agent supplying information to an information request expressed as Requirements. The Requirement processor has expressed its expectations (both business as technical) for the information it wants to recieve as an Information Concept. The Evidence provider is able to supply information for that Information Concept, but its native data representation might not be coherent with the expectations set by the Requirement processor. The Supported Value is bridging both. The Evidence provider can either provide a derived value (fact) from its native data representation that complies with the Information Concept expectations. Or it can provide a query in an agreed language between Evidence provider and Requirement processor that allows the Requirement processor to retrieve the value from the native data representation. Implementers are free to choose their language. It is recommended to document the made agreements well." isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-02-08 16:04:04" modified="2024-03-18 13:04:53" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-02-08 16:04:04" modified="2024-07-23 11:42:15" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -2091,9 +2160,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_02D4B752_188D_46ee_AF52_F2AAFF7E2E77" xmi:type="uml:Class" name="epo-sub:CertificateInformation" scope="public">
-				<model package="EAPK_CA4C7382_A4D6_43c0_AA23_08C9E52AAA0D" tpos="0" ea_localid="3528" ea_eleType="element"/>
+				<model package="EAPK_BF99515E_23A1_4c32_ACF2_57A2EF805C41" tpos="0" ea_localid="3528" ea_eleType="element"/>
 				<properties documentation="Information about a Certificate.&#xA;&#xA;WG approval 12/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-02-20 16:51:30" modified="2024-03-18 13:04:53" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-02-20 16:51:30" modified="2024-07-23 11:42:15" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -2137,9 +2206,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" xmi:type="uml:Class" name="epo-sub:ESPD" scope="public">
-				<model package="EAPK_CA4C7382_A4D6_43c0_AA23_08C9E52AAA0D" tpos="0" ea_localid="1628" ea_eleType="element"/>
+				<model package="EAPK_BF99515E_23A1_4c32_ACF2_57A2EF805C41" tpos="0" ea_localid="1628" ea_eleType="element"/>
 				<properties documentation="A document conveying the fulfilment or not by the economic operator of the Exclusion Grounds and the Selection Criteria set out by the Buyer for a specific Procurement using an European Single Procurement Document (ESPD) Request. &#xA;&#xA;WG Approval 05/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-03-01 17:09:31" modified="2024-07-08 13:15:14" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-03-01 17:09:31" modified="2024-07-23 11:42:15" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -2149,14 +2218,16 @@
 					<Association xmi:id="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B" start="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" end="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB"/>
 					<Association xmi:id="EAID_ACF95470_AB2B_4b7d_BCCF_3E7847170DBD" start="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" end="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC"/>
 					<Generalization xmi:id="EAID_C7D18971_E3AA_4bc3_B35F_CBFE4CDAAA84" start="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Association xmi:id="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273" start="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" end="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370"/>
 					<Association xmi:id="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F" start="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" end="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
+					<Association xmi:id="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273" start="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" end="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370"/>
 					<Association xmi:id="EAID_E453F729_4B4E_44c9_AD20_DD8131AF4BEF" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_7231461B_8CBB_434e_938E_5B67B449DF4D" xmi:type="uml:Class" name="epo-sub:LegalRepresentative" scope="public">
-				<model package="EAPK_CA4C7382_A4D6_43c0_AA23_08C9E52AAA0D" tpos="0" ea_localid="3474" ea_eleType="element"/>
+				<model package="EAPK_BF99515E_23A1_4c32_ACF2_57A2EF805C41" tpos="0" ea_localid="3474" ea_eleType="element"/>
 				<properties documentation="The Role of an Agent that can represent an Organization.&#xA;&#xA;WG approval 05/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-02-13 11:22:37" modified="2024-03-18 13:04:53" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-02-13 11:22:37" modified="2024-07-23 11:42:15" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -2170,9 +2241,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_95FD9F3B_1F77_4e3c_A91D_72310583752E" xmi:type="uml:Class" name="epo-sub:Mandate" scope="public">
-				<model package="EAPK_CA4C7382_A4D6_43c0_AA23_08C9E52AAA0D" tpos="0" ea_localid="3475" ea_eleType="element"/>
+				<model package="EAPK_BF99515E_23A1_4c32_ACF2_57A2EF805C41" tpos="0" ea_localid="3475" ea_eleType="element"/>
 				<properties documentation="An authorization to act as a representative of an Organization.&#xA;&#xA;WG approval 05/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-02-13 12:52:49" modified="2024-03-18 13:04:53" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-02-13 12:52:49" modified="2024-07-23 11:42:15" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -2184,9 +2255,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" xmi:type="uml:Class" name="epo-sub:NationalPreQualificationData" scope="public">
-				<model package="EAPK_CA4C7382_A4D6_43c0_AA23_08C9E52AAA0D" tpos="0" ea_localid="3466" ea_eleType="element"/>
+				<model package="EAPK_BF99515E_23A1_4c32_ACF2_57A2EF805C41" tpos="0" ea_localid="3466" ea_eleType="element"/>
 				<properties documentation="Data that describe the distinctive features or characteristics that qualify an economic operator to take part in a tendering process.&#xA;&#xA;WG approval 05/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-02-06 11:57:51" modified="2024-03-18 13:04:53" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-02-06 11:57:51" modified="2024-07-23 11:42:15" complexity="1" status="Proposed"/>
 				<code product_name="Java" gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -2217,9 +2288,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_DE869DED_87AA_46a5_963D_EAEBF2AA6803" xmi:type="uml:Class" name="epo-sub:PowerOfAttorney" scope="public">
-				<model package="EAPK_CA4C7382_A4D6_43c0_AA23_08C9E52AAA0D" tpos="0" ea_localid="3476" ea_eleType="element"/>
+				<model package="EAPK_BF99515E_23A1_4c32_ACF2_57A2EF805C41" tpos="0" ea_localid="3476" ea_eleType="element"/>
 				<properties documentation="A legal document that grants someone the authority to make decisions on behalf of an Organization.&#xA;&#xA;WG approval 05/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-02-13 12:52:57" modified="2024-03-18 13:04:53" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-02-13 12:52:57" modified="2024-07-23 11:42:15" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -2231,9 +2302,9 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_6FDC515F_9791_4706_8EF1_F83CAA04DDEC" xmi:type="uml:Class" name="epo-sub:Response" scope="public">
-				<model package="EAPK_CA4C7382_A4D6_43c0_AA23_08C9E52AAA0D" tpos="0" ea_localid="3467" ea_eleType="element"/>
+				<model package="EAPK_BF99515E_23A1_4c32_ACF2_57A2EF805C41" tpos="0" ea_localid="3467" ea_eleType="element"/>
 				<properties documentation="An answer given to a question that is part of an ESPD Request.&#xA;&#xA;WG approval 12/03/2024" isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2024-02-06 17:01:10" modified="2024-03-18 13:04:53" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2024-02-06 17:01:10" modified="2024-07-23 11:42:15" complexity="1" status="Proposed"/>
 				<code gentype="Java"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
@@ -2334,39 +2405,6 @@
 			</element>
 		</elements>
 		<connectors>
-			<connector xmi:idref="EAID_84F5E9DD_96DE_4ca7_8CA6_9C68826B377B">
-				<source xmi:idref="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C">
-					<model ea_localid="1931" type="ProxyConnector" name="ProxyConnector"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_70B4792E_F818_45db_80A4_32F092496FEF">
-					<model ea_localid="1932" type="ProxyConnector" name="ProxyConnector"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="3158"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<documentation/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
 			<connector xmi:idref="EAID_CFC6423E_1A9A_47fb_8C22_10175EEF3A31">
 				<source xmi:idref="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B">
 					<model ea_localid="3470" type="Class" name="cccev:SupportedValue"/>
@@ -2645,6 +2683,41 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273">
+				<source xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
+					<model ea_localid="1628" type="Class" name="epo-sub:ESPD"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
+					<model ea_localid="1628" type="Class" name="epo-sub:ESPD"/>
+					<role name="epo-sub:refersToOtherESPDResponse" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="5205"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Reference to other European Single Procurement Document (ESPD) Response.&#xA;&#xA;WG approval 05/03/2024"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo-sub:refersToOtherESPDResponse"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
 			<connector xmi:idref="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F">
 				<source xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
 					<model ea_localid="1628" type="Class" name="epo-sub:ESPD"/>
@@ -3212,21 +3285,21 @@
 		<profiles/>
 		<diagrams>
 			<diagram xmi:id="EAID_EECFED90_0561_419e_ACA0_11A555E18F49">
-				<model package="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA" localID="518" owner="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA" tpos="1"/>
+				<model package="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" localID="518" owner="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" tpos="1"/>
 				<properties name="submission" type="Logical"/>
-				<project author="andreea" version="1.0" created="2024-02-06 11:31:21" modified="2024-07-09 15:40:00"/>
+				<project author="andreea" version="1.0" created="2024-02-06 11:31:21" modified="2024-07-11 13:51:31"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=5302ECD4;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=32C8F1AF;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
 				<elements>
-					<element geometry="Left=154;Top=492;Right=310;Bottom=534;" subject="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" seqno="1" style="DUID=B3BD95E4;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=157;Top=540;Right=305;Bottom=611;" subject="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" seqno="1" style="DUID=DF47CF56;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1599;Top=761;Right=1806;Bottom=849;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="2" style="DUID=F64843FC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1982;Top=709;Right=2249;Bottom=797;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="3" style="DUID=321CED68;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=2044;Top=618;Right=2249;Bottom=688;" subject="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" seqno="4" style="DUID=FC42AE80;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1532;Top=627;Right=1871;Bottom=679;" subject="EAID_4E676B09_47FB_4b23_B4E1_7B69BF54F2E9" seqno="5" style="DUID=5488FD73;NSL=0;"/>
-					<element geometry="Left=688;Top=812;Right=859;Bottom=882;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="6" style="DUID=EA6D7AE2;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=688;Top=812;Right=867;Bottom=882;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="6" style="DUID=EA6D7AE2;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1608;Top=503;Right=1797;Bottom=573;" subject="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" seqno="7" style="DUID=607C57DA;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=330;Top=694;Right=562;Bottom=764;" subject="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" seqno="8" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=AD5DB35A;"/>
 					<element geometry="Left=724;Top=694;Right=823;Bottom=764;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="9" style="DUID=48707437;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
@@ -3247,23 +3320,25 @@
 					<element geometry="Left=1079;Top=400;Right=1298;Bottom=485;" subject="EAID_96B284C4_E759_4bad_9655_04521F703750" seqno="24" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=47F89F85;"/>
 					<element geometry="Left=384;Top=340;Right=508;Bottom=432;" subject="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" seqno="25" style="NSL=0;DUID=4AA5FF13;"/>
 					<element geometry="Left=384;Top=540;Right=508;Bottom=610;" subject="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" seqno="26" style="NSL=0;DUID=8DFC7E16;"/>
-					<element geometry="EX=0;EY=20;SX=107;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=160:CY=27:OX=36:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1808:-733$;" subject="EAID_9BF032E2_6893_45df_95FE_A08E92EA8618" style="Mode=3;EOID=321CED68;SOID=5488FD73;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=6;EX=0;EY=6;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=210:CY=27:OX=90:OY=-24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_23CC2B92_731F_4428_B333_8582A36D1244" style="Mode=3;EOID=F64843FC;SOID=5488FD73;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=3;EX=4;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=64:OY=29:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=450:-844$;" subject="EAID_FC7073E1_3362_472f_B087_27A619B6C819" style="Mode=3;EOID=AD5DB35A;SOID=EA6D7AE2;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-42;SY=-2;EX=-70;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87:CY=14:OX=52:OY=14:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4714A192_0DFA_49f4_AB11_165E12CB38A6" style="Mode=3;EOID=47F89F85;SOID=293DF811;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=5;EX=-3;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1401:-570$;" subject="EAID_657CE8BE_2717_41d1_B80A_3B15D5AAC373" style="Mode=3;EOID=40B8EE7B;SOID=293DF811;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-20;SY=-42;EX=-20;EY=-56;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_46812517_A9DA_432d_A7B8_F5FEC69BBDA5" style="Mode=3;EOID=35C6DD13;SOID=47F89F85;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=57;SY=0;EX=52;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=143:CY=14:OX=96:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_E076346D_AFB2_421a_BBA1_4FFA393BE7FA" style="Mode=3;EOID=293DF811;SOID=47F89F85;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BD5C98D5_43D4_41be_9C21_84470056CF01" style="Mode=3;EOID=40B8EE7B;SOID=47F89F85;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=499;SCTR.TOP=-352;SCTR.RIGHT=542;SCTR.BOTTOM=-308;$LLB=;LLT=;LMT=;LMB=;LRT=CX=158:CY=27:OX=186:OY=-11:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=508:-352$542:-352$542:-308$499:-308$499:-340$;" subject="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273" style="Mode=3;EOID=4AA5FF13;SOID=4AA5FF13;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=75:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B" style="Mode=3;EOID=8DFC7E16;SOID=4AA5FF13;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=27;SY=22;EX=27;EY=29;$LLB=;LLT=;LMT=;LMB=;LRT=CX=134:CY=14:OX=-3:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F" style="Mode=3;EOID=44F1E995;SOID=4AA5FF13;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C7D18971_E3AA_4bc3_B35F_CBFE4CDAAA84" style="Mode=3;EOID=8EB4BEC5;SOID=4AA5FF13;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-48;SY=-4;EX=-48;EY=-4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_881F7772_9A6C_4e5a_BB86_A2E25524B058" style="Mode=3;EOID=44F1E995;SOID=607C57DA;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=73;SY=-2;EX=73;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=73:CY=14:OX=55:OY=16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0AA8BD10_946A_403c_B906_6DB183F74D9F" style="Mode=3;EOID=44F1E995;SOID=607C57DA;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_29996CD1_F979_44e0_95A0_E058E0BD5450" style="Mode=3;EOID=8EB4BEC5;SOID=B3BD95E4;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=6;EX=0;EY=6;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=210:CY=27:OX=90:OY=-24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_23CC2B92_731F_4428_B333_8582A36D1244" style="Mode=3;EOID=F64843FC;SOID=5488FD73;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=189:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-2:OY=5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_28460B26_E1D3_4c16_AB2B_CBE8A5D24AC5" style="Mode=3;EOID=293DF811;SOID=EE50BCFA;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=1;SY=-6;EX=1;EY=-6;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=51:CY=14:OX=37:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F3F440DD_AB87_4730_A6DF_915A5FB0B3DB" style="Mode=3;EOID=44F1E995;SOID=607C57DA;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=139;SY=0;EX=0;EY=-43;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=117:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=913:-485$;" subject="EAID_D01E7677_5AC2_42b1_AA17_2A8EC003CCFE" style="Mode=3;EOID=47F89F85;SOID=EE50BCFA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=0;EY=20;SX=107;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=160:CY=27:OX=36:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1808:-733$;" subject="EAID_9BF032E2_6893_45df_95FE_A08E92EA8618" style="Mode=3;EOID=321CED68;SOID=5488FD73;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=161:CY=27:OX=37:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_87C6E00F_DAEB_4e79_8340_AC2FC83206DA" style="Mode=3;EOID=FC42AE80;SOID=5488FD73;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-115;SY=1;EX=-115;EY=1;EDGE=1;SCME=0;SCTR=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=127:CY=14:OX=70:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B6D90197_EC7F_4a01_8047_2DAC846D9C03" style="Mode=3;EOID=44F1E995;SOID=5488FD73;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=2;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=234:-575$;" subject="EAID_4E94CD77_EB61_4a9e_A6A4_14096262384A" style="Mode=3;EOID=B3BD95E4;SOID=8DFC7E16;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=7;SY=0;EX=45;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4E94CD77_EB61_4a9e_A6A4_14096262384A" style="Mode=3;EOID=DF47CF56;SOID=8DFC7E16;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=-131;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=-5:OY=-5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_E69DD4EA_847D_4a36_96C4_9709B72BA620" style="Mode=3;EOID=EE50BCFA;SOID=8DFC7E16;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=77:OY=-41:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_18CF5F1B_45DD_4b29_9E28_8D741E0840F3" style="Mode=3;EOID=AD5DB35A;SOID=8DFC7E16;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=-1;EX=0;EY=-1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_608CC8C6_3A48_4541_8467_9DDA71E8D534" style="Mode=3;EOID=F64843FC;SOID=EA6D7AE2;Color=-1;LWidth=0;Hidden=1;"/>
@@ -3271,9 +3346,9 @@
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_72A7614C_D179_4558_8F62_2FA41A99DF74" style="Mode=3;EOID=321CED68;SOID=EA6D7AE2;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC" style="Mode=3;EOID=321CED68;SOID=EA6D7AE2;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_55771AD3_C775_4324_AEBA_EA277D05F7E8" style="Mode=3;EOID=F64843FC;SOID=EA6D7AE2;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SX=0;SY=3;EX=4;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=64:OY=29:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=450:-844$;" subject="EAID_FC7073E1_3362_472f_B087_27A619B6C819" style="Mode=3;EOID=AD5DB35A;SOID=EA6D7AE2;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=1;SY=-6;EX=1;EY=-6;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=51:CY=14:OX=37:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F3F440DD_AB87_4730_A6DF_915A5FB0B3DB" style="Mode=3;EOID=44F1E995;SOID=607C57DA;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=1823;SCTR.TOP=-347;SCTR.RIGHT=1872;SCTR.BOTTOM=-316;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=107:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=1829:-347$1872:-347$1872:-316$1823:-316$1823:-336$;" subject="EAID_2FF93267_E672_481d_B370_202D9A0110E0" style="Mode=3;EOID=44F1E995;SOID=44F1E995;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=73;SY=-2;EX=73;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=73:CY=14:OX=55:OY=16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0AA8BD10_946A_403c_B906_6DB183F74D9F" style="Mode=3;EOID=44F1E995;SOID=607C57DA;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=-24;EX=0;EY=16;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=95:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1497:-417$1497:-789$;" subject="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6" style="Mode=3;EOID=F64843FC;SOID=44F1E995;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-3;EX=111;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4" style="Mode=3;EOID=AD5DB35A;SOID=48707437;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=224;SCTR.TOP=-317;SCTR.RIGHT=239;SCTR.BOTTOM=-286;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=239:-316$239:-286$224:-286$224:-316$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=8EB4BEC5;SOID=8EB4BEC5;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=4;SCTR.LEFT=65;SCTR.TOP=-415;SCTR.RIGHT=150;SCTR.BOTTOM=-344;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=134:-344$65:-344$65:-415$134:-415$;" subject="EAID_39F3583F_0D40_4e9f_8018_10297955785C" style="Mode=3;EOID=8EB4BEC5;SOID=8EB4BEC5;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=217;SCTR.TOP=-319;SCTR.RIGHT=260;SCTR.BOTTOM=-295;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=82:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=260:-316$260:-295$217:-295$217:-316$;" subject="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9" style="Mode=3;EOID=8EB4BEC5;SOID=8EB4BEC5;Color=-1;LWidth=0;Hidden=0;"/>
@@ -3284,10 +3359,10 @@
 					<element geometry="SX=0;SY=4;EX=-3;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=56:CY=14:OX=36:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2030:-119$;" subject="EAID_A4228FCF_2B3C_44e6_BD17_379180274988" style="Mode=3;EOID=B047601D;SOID=35C6DD13;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=8;SY=-1;EX=8;EY=-1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=48:OY=-9:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D0F25E0B_E148_41e7_8C52_BAE14F5149F6" style="Mode=3;EOID=4E964F40;SOID=B047601D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-8;SY=-1;EX=-8;EY=-1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=76:CY=14:OX=45:OY=-12:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_626183B8_93AC_4300_B227_85988E5F2016" style="Mode=3;EOID=D858C5F4;SOID=B047601D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EX=0;EY=-15;SX=0;SY=-67;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=65:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2253:-460$2253:-820$;" subject="EAID_C6F7D14A_11BF_430e_ABED_4C9AC22FFF2A" style="Mode=3;EOID=F64843FC;SOID=B047601D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=30;SY=0;EX=0;EY=23;$LLB=;LLT=;LMT=;LMB=;LRT=CX=80:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=804:-419$;" subject="EAID_9B2D6DCC_5092_48cf_878A_8035A42A43F9" style="Mode=3;EOID=47F89F85;SOID=EE50BCFA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=-24;EX=0;EY=16;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=95:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1497:-417$1497:-789$;" subject="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6" style="Mode=3;EOID=F64843FC;SOID=44F1E995;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=189:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-2:OY=5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_28460B26_E1D3_4c16_AB2B_CBE8A5D24AC5" style="Mode=3;EOID=293DF811;SOID=EE50BCFA;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=-3;EX=0;EY=-28;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1479:-396$1479:-833$;" subject="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB" style="Mode=3;EOID=F64843FC;SOID=44F1E995;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_29996CD1_F979_44e0_95A0_E058E0BD5450" style="Mode=3;EOID=8EB4BEC5;SOID=DF47CF56;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=1823;SCTR.TOP=-347;SCTR.RIGHT=1872;SCTR.BOTTOM=-316;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=107:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=1829:-347$1872:-347$1872:-316$1823:-316$1823:-336$;" subject="EAID_2FF93267_E672_481d_B370_202D9A0110E0" style="Mode=3;EOID=44F1E995;SOID=44F1E995;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-2;SY=12;EX=-2;EY=12;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=56:CY=14:OX=-10:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9F23612C_1865_4c8b_82ED_0BAA7D433501" style="Mode=3;EOID=B047601D;SOID=44F1E995;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_19AD8C15_4D9D_48f2_A3E1_A997E86942D2" style="Mode=3;EOID=4C1792D8;SOID=44F1E995;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-2;SY=-28;EX=-2;EY=-28;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_6A50E4FC_E8DA_47c5_AD39_5BA2A66950B9" style="Mode=3;EOID=B047601D;SOID=44F1E995;Color=-1;LWidth=0;Hidden=0;"/>
@@ -3298,16 +3373,15 @@
 					<element geometry="SX=2;SY=0;EX=0;EY=2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=113:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1406:-121$;" subject="EAID_4B6E629B_BECA_4e04_B7C9_925B517BC914" style="Mode=3;EOID=35C6DD13;SOID=56839C81;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_93385F64_990A_44d0_A266_DDF9F55EABCE" style="Mode=3;EOID=56839C81;SOID=40B8EE7B;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=92:OY=-31:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=48707437;SOID=EE50BCFA;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=-3;EX=111;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4" style="Mode=3;EOID=AD5DB35A;SOID=48707437;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=-3;EX=0;EY=-28;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1479:-396$1479:-833$;" subject="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB" style="Mode=3;EOID=F64843FC;SOID=44F1E995;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=0;EY=-15;SX=0;SY=-67;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=65:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2253:-460$2253:-820$;" subject="EAID_C6F7D14A_11BF_430e_ABED_4C9AC22FFF2A" style="Mode=3;EOID=F64843FC;SOID=B047601D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_D71DB35F_3004_48e5_8866_708D88C3BB20">
-				<model package="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA" localID="522" owner="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA" tpos="3"/>
+				<model package="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" localID="522" owner="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" tpos="3"/>
 				<properties name="submission response" type="Logical"/>
-				<project author="andreea" version="1.0" created="2024-02-08 16:07:41" modified="2024-03-12 16:01:24"/>
+				<project author="andreea" version="1.0" created="2024-02-08 16:07:41" modified="2024-07-11 13:48:52"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=5285B4FC;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=AC81D177;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
@@ -3328,7 +3402,7 @@
 					<element geometry="Left=1181;Top=546;Right=1355;Bottom=616;" subject="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" seqno="14" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=28546C02;"/>
 					<element geometry="Left=895;Top=729;Right=1055;Bottom=775;" subject="EAID_567AF975_C0F5_4d4e_898A_2D46C424EB1B" seqno="15" style="DUID=EB41E43B;NSL=0;"/>
 					<element geometry="Left=890;Top=545;Right=1061;Bottom=617;" subject="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" seqno="16" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=6F216BE8;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=47:OY=-25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_CE6EADDE_0D7D_40a5_B341_A616866CD789" style="Mode=3;EOID=EB41E43B;SOID=6F216BE8;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=4;EX=6;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=101:CY=14:OX=53:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1274:-748$;" subject="EAID_CFC6423E_1A9A_47fb_8C22_10175EEF3A31" style="Mode=3;EOID=28546C02;SOID=EB41E43B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=34;SY=-55;EX=34;EY=-35;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D01BEE04_A51F_434f_9F2B_CD75C658FF42" style="Mode=3;EOID=D8C3AB2C;SOID=8A2147CC;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=24;SY=-44;EX=24;EY=-30;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8B71787B_152C_48e6_B55B_A94D38ED4C2F" style="Mode=3;EOID=6F216BE8;SOID=8A2147CC;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_2F19249F_490A_42c9_B131_6D083DB9839A" style="Mode=3;EOID=6F216BE8;SOID=8A2147CC;Color=-1;LWidth=0;Hidden=1;"/>
@@ -3341,26 +3415,28 @@
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C289FCF6_9241_4f06_BF53_F99082792332" style="Mode=3;EOID=6552D208;SOID=BDECA88E;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=116:CY=14:OX=59:OY=44:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_6D204966_4BC2_452d_9B78_BA9B3F1E9FF6" style="Mode=3;EOID=6552D208;SOID=6F216BE8;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=28;EX=41;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=93:CY=14:OX=65:OY=30:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=858:-553$;" subject="EAID_1864913C_FE85_48db_829F_004DFE769A97" style="Mode=3;EOID=3692932E;SOID=6F216BE8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=0;EY=16;SX=-69;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=128:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=906:-667$;" subject="EAID_A7C105EE_0251_4249_919A_46302D44059E" style="Mode=3;EOID=A238C92F;SOID=6F216BE8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=556;SCTR.TOP=-683;SCTR.RIGHT=621;SCTR.BOTTOM=-643;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=131:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=592:-683$621:-683$621:-643$556:-643$556:-670$;" subject="EAID_2FF93267_E672_481d_B370_202D9A0110E0" style="Mode=3;EOID=8A2147CC;SOID=8A2147CC;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6492D4E3_9631_45d4_9596_5EC3247529A2" style="Mode=3;EOID=6552D208;SOID=18AD0FF1;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;EX=-44;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=113:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_ACF95470_AB2B_4b7d_BCCF_3E7847170DBD" style="Mode=3;EOID=1BC92C8C;SOID=91285388;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=377;SCTR.TOP=-558;SCTR.RIGHT=427;SCTR.BOTTOM=-511;$LLB=;LLT=;LMT=;LMB=;LRT=CX=158:CY=27:OX=69:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=427:-546$427:-511$377:-511$377:-558$409:-558$;" subject="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273" style="Mode=3;EOID=91285388;SOID=91285388;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=-1;EX=1;EY=-1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=69:OY=16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B" style="Mode=3;EOID=3EE231B5;SOID=91285388;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;SX=3;SY=2;EX=5;EY=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=134:CY=14:OX=80:OY=-23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F" style="Mode=3;EOID=8A2147CC;SOID=91285388;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=4;SCTR.LEFT=867;SCTR.TOP=-391;SCTR.RIGHT=915;SCTR.BOTTOM=-339;$LLB=;LLT=;LMT=;LMB=;LRT=CX=114:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=890:-339$867:-339$867:-391$915:-391$915:-352$;" subject="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F" style="Mode=3;EOID=6552D208;SOID=6552D208;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=1;EX=-87;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_8990AB87_7AAE_4276_AA04_83E4BB664FCB" style="Mode=3;EOID=28546C02;SOID=6F216BE8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=3;SX=-8;SY=0;EX=0;EY=29;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1124:-552$;" subject="EAID_04EC0265_2665_47d4_AEDA_E49049545B3B" style="Mode=3;EOID=6F216BE8;SOID=D8C3AB2C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=4;EX=6;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=101:CY=14:OX=53:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1274:-748$;" subject="EAID_CFC6423E_1A9A_47fb_8C22_10175EEF3A31" style="Mode=3;EOID=28546C02;SOID=EB41E43B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-4;SY=0;EX=-4;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=110:CY=14:OX=49:OY=32:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_5715AB6B_F88D_4b3e_857E_2AD843DEF3DE" style="Mode=3;EOID=18AD0FF1;SOID=1BC92C8C;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=0:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_93B47F0D_8871_4230_A6F8_522396CE72CF" style="Mode=3;EOID=6F216BE8;SOID=1BC92C8C;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-1;SY=0;EX=0;EY=2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=687:-750$;" subject="EAID_3EE371EF_8DF9_4747_B49E_48C56317F5F9" style="Mode=3;EOID=EB41E43B;SOID=1BC92C8C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=-21;EX=-4;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=128:CY=14:OX=70:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=774:-602$;" subject="EAID_49631FAC_5F3D_4939_83C6_69057788A49B" style="Mode=3;EOID=A238C92F;SOID=1BC92C8C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=6;SY=12;EX=6;EY=12;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_110A81E5_E1CC_45be_BCFD_56F87C51B05A" style="Mode=3;EOID=B4C9BD0C;SOID=18AD0FF1;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=47:OY=-25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_CE6EADDE_0D7D_40a5_B341_A616866CD789" style="Mode=3;EOID=EB41E43B;SOID=6F216BE8;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=27;EX=-47;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=140:CY=14:OX=72:OY=17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=770:-554$;" subject="EAID_B2FBB3C3_8542_4cd9_8B7E_A25D4A6C9048" style="Mode=3;EOID=3692932E;SOID=1BC92C8C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6492D4E3_9631_45d4_9596_5EC3247529A2" style="Mode=3;EOID=6552D208;SOID=18AD0FF1;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=-21;EX=-4;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=128:CY=14:OX=70:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=774:-602$;" subject="EAID_49631FAC_5F3D_4939_83C6_69057788A49B" style="Mode=3;EOID=A238C92F;SOID=1BC92C8C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-1;SY=0;EX=0;EY=2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=687:-750$;" subject="EAID_3EE371EF_8DF9_4747_B49E_48C56317F5F9" style="Mode=3;EOID=EB41E43B;SOID=1BC92C8C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=0:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_93B47F0D_8871_4230_A6F8_522396CE72CF" style="Mode=3;EOID=6F216BE8;SOID=1BC92C8C;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-4;SY=0;EX=-4;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=110:CY=14:OX=49:OY=32:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_5715AB6B_F88D_4b3e_857E_2AD843DEF3DE" style="Mode=3;EOID=18AD0FF1;SOID=1BC92C8C;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;SX=-8;SY=0;EX=0;EY=29;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1124:-552$;" subject="EAID_04EC0265_2665_47d4_AEDA_E49049545B3B" style="Mode=3;EOID=6F216BE8;SOID=D8C3AB2C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=2;EY=0;SX=0;SY=7;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=77:CY=14:OX=47:OY=-22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1270:-310$;" subject="EAID_4CC3B6CA_493A_4ff6_BB1B_A5C475115AB1" style="Mode=3;EOID=28546C02;SOID=6552D208;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=4;SCTR.LEFT=867;SCTR.TOP=-391;SCTR.RIGHT=915;SCTR.BOTTOM=-339;$LLB=;LLT=;LMT=;LMB=;LRT=CX=114:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=890:-339$867:-339$867:-391$915:-391$915:-352$;" subject="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F" style="Mode=3;EOID=6552D208;SOID=6552D208;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=3;SX=3;SY=2;EX=5;EY=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=134:CY=14:OX=80:OY=-23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F" style="Mode=3;EOID=8A2147CC;SOID=91285388;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=-1;EX=1;EY=-1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=69:OY=16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B" style="Mode=3;EOID=3EE231B5;SOID=91285388;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=2;EX=-44;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=113:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_ACF95470_AB2B_4b7d_BCCF_3E7847170DBD" style="Mode=3;EOID=1BC92C8C;SOID=91285388;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EX=0;EY=16;SX=-69;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=128:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=906:-667$;" subject="EAID_A7C105EE_0251_4249_919A_46302D44059E" style="Mode=3;EOID=A238C92F;SOID=6F216BE8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_ADDA7381_B80A_426d_9FF6_137732CADDEF">
-				<model package="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA" localID="523" owner="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA" tpos="4"/>
+				<model package="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" localID="523" owner="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" tpos="4"/>
 				<properties name="submission eo roles" type="Logical"/>
 				<project author="andreea" version="1.0" created="2024-02-13 11:21:44" modified="2024-03-08 12:37:57"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
@@ -3392,6 +3468,7 @@
 					<element geometry="EDGE=1;SX=-5;SY=16;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_5729A98B_A925_4816_AEF4_9EBDE5851B98" style="Mode=3;EOID=C681E638;SOID=1E4B000B;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C7D18971_E3AA_4bc3_B35F_CBFE4CDAAA84" style="Mode=3;EOID=8803E427;SOID=F20F5B52;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=8;SY=-2;EX=8;EY=-2;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=134:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F" style="Mode=3;EOID=1EE9182B;SOID=F20F5B52;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=353;SCTR.TOP=-369;SCTR.RIGHT=414;SCTR.BOTTOM=-340;$LLB=;LLT=;LMT=;LMB=;LRT=CX=174:CY=14:OX=128:OY=-29:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=414:-368$414:-340$353:-340$353:-368$;" subject="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273" style="Mode=3;EOID=F20F5B52;SOID=F20F5B52;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=61;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87:CY=14:OX=-11:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1239:-304$;" subject="EAID_7775FD52_1FE1_445c_9B8B_96AA208D3134" style="Mode=3;EOID=C681E638;SOID=5C7FFE28;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_1982F8A2_ECBE_47d6_9A92_7176519FD4A5" style="Mode=3;EOID=9E550157;SOID=5C7FFE28;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=41;SY=0;EX=0;EY=4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=125:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1219:-764$;" subject="EAID_15E95E36_FC35_4adf_B5AC_F916221BB38E" style="Mode=3;EOID=202280B7;SOID=5C7FFE28;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -3418,7 +3495,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_94074245_1A03_44a0_83B7_7B182F8F5B41">
-				<model package="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA" localID="527" owner="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA" tpos="5"/>
+				<model package="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" localID="527" owner="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" tpos="5"/>
 				<properties name="submission eo sheltered" type="Logical"/>
 				<project author="andreea" version="1.0" created="2024-02-16 06:42:19" modified="2024-03-12 16:08:26"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
@@ -3437,11 +3514,12 @@
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=39:CY=14:OX=27:OY=-18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D84D8FB5_6889_47af_B88A_A418F4281BF1" style="Mode=3;EOID=D17C4820;SOID=B5D46238;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_ACA750D2_84FF_4e07_B735_322F9131A442" style="Mode=3;EOID=B5D46238;SOID=11EEA035;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_E51D25BC_E9FB_423c_BFBF_00E3B99864B4" style="Mode=3;EOID=11EEA035;SOID=AD1BBB21;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=80;SCTR.TOP=-182;SCTR.RIGHT=111;SCTR.BOTTOM=-152;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=111:-181$111:-152$80:-152$80:-181$;" subject="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273" style="Mode=3;EOID=DEED4E7C;SOID=DEED4E7C;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=72:OY=20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B" style="Mode=3;EOID=9EF317AE;SOID=DEED4E7C;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_71E43A2B_6D3D_4d9e_91FD_0F721EA0B021">
-				<model package="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA" localID="528" owner="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA" tpos="7"/>
+				<model package="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" localID="528" owner="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" tpos="7"/>
 				<properties name="submission eo pre-qualification system" type="Logical"/>
 				<project author="andreea" version="1.0" created="2024-02-16 06:42:50" modified="2024-03-12 16:19:16"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
@@ -3468,12 +3546,13 @@
 					<element geometry="SX=4;SY=1;EX=4;EY=-1;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=93:CY=14:OX=19:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1864913C_FE85_48db_829F_004DFE769A97" style="Mode=2;EOID=7414B6BE;SOID=2605C912;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=-2;EX=0;EY=-2;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=-1:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_97176015_1FBF_4d9c_9A77_C246A6F21E71" style="Mode=2;EOID=734CDEDA;SOID=ABE1F8A6;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=-1;EY=-16;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_04EC0265_2665_47d4_AEDA_E49049545B3B" style="Mode=3;EOID=2605C912;SOID=ABE1F8A6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=336;SCTR.TOP=-413;SCTR.RIGHT=367;SCTR.BOTTOM=-398;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=337:-413$367:-413$367:-398$337:-398$;" subject="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273" style="Mode=3;EOID=4410436D;SOID=4410436D;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=134:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F" style="Mode=3;EOID=B3CC1BAD;SOID=4410436D;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=200:CY=14:OX=-7:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_CA57E831_F2FE_4a87_9BA9_5CF8B7A9D5AB" style="Mode=3;EOID=ABE1F8A6;SOID=4B1E4340;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_F3B9C2EE_40B3_4257_AFB2_39EE389FC525">
-				<model package="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA" localID="530" owner="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA" tpos="6"/>
+				<model package="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" localID="530" owner="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" tpos="6"/>
 				<properties name="submission eo group" type="Logical"/>
 				<project author="andreea" version="1.0" created="2024-02-16 07:02:49" modified="2024-03-12 16:09:23"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
@@ -3493,25 +3572,26 @@
 					<element geometry="Left=417;Top=98;Right=588;Bottom=168;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" seqno="9" style="DUID=B2135753;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=157;Top=98;Right=247;Bottom=168;" subject="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" seqno="10" style="DUID=3406B990;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=417;Top=221;Right=536;Bottom=305;" subject="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" seqno="11" style="DUID=54B804E6;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_28774B07_2278_44a1_B47E_F671B4F00F63" style="Mode=3;EOID=3406B990;SOID=2680FDBB;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_5729A98B_A925_4816_AEF4_9EBDE5851B98" style="Mode=3;EOID=3406B990;SOID=062B2D00;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_199C3BDF_913A_42e4_A409_64CB2CE61248" style="Mode=3;EOID=3406B990;SOID=CC54E83B;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A27A53B2_A6D1_4fdd_A43E_D33DC6607852" style="Mode=3;EOID=3406B990;SOID=8BA75646;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-58;SY=-4;EX=-58;EY=-4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_881F7772_9A6C_4e5a_BB86_A2E25524B058" style="Mode=3;EOID=814BA23B;SOID=91BF6BAB;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=63;SY=2;EX=63;EY=2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=73:CY=14:OX=47:OY=19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0AA8BD10_946A_403c_B906_6DB183F74D9F" style="Mode=3;EOID=814BA23B;SOID=91BF6BAB;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-2;SY=0;EX=-2;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=51:CY=14:OX=32:OY=32:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F3F440DD_AB87_4730_A6DF_915A5FB0B3DB" style="Mode=3;EOID=814BA23B;SOID=91BF6BAB;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=-15;EX=48;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=50:OY=32:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1109:-278$;" subject="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB" style="Mode=3;EOID=F20C0509;SOID=814BA23B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=16;EX=-22;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=95:CY=14:OX=42:OY=19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1039:-247$;" subject="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6" style="Mode=3;EOID=F20C0509;SOID=814BA23B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=719;SCTR.TOP=-222;SCTR.RIGHT=756;SCTR.BOTTOM=-190;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=68:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=756:-213$756:-190$719:-190$719:-213$;" subject="EAID_2FF93267_E672_481d_B370_202D9A0110E0" style="Mode=3;EOID=814BA23B;SOID=814BA23B;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_19AD8C15_4D9D_48f2_A3E1_A997E86942D2" style="Mode=3;EOID=B309AF7A;SOID=814BA23B;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_319F106B_6066_4ba7_B084_12D7110FE9E0" style="Mode=3;EOID=F20C0509;SOID=B309AF7A;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=61:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6" style="Mode=3;EOID=B309AF7A;SOID=B2135753;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=376;SCTR.TOP=-240;SCTR.RIGHT=436;SCTR.BOTTOM=-194;$LLB=;LLT=;LMT=;LMB=;LRT=CX=158:CY=27:OX=76:OY=-22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=436:-221$436:-194$376:-194$376:-240$417:-240$;" subject="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273" style="Mode=3;EOID=54B804E6;SOID=54B804E6;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4657FAEB_1A34_4ef7_947D_E6C47AAC7527" style="Mode=3;EOID=B2135753;SOID=3406B990;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=61:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6" style="Mode=3;EOID=B309AF7A;SOID=B2135753;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_319F106B_6066_4ba7_B084_12D7110FE9E0" style="Mode=3;EOID=F20C0509;SOID=B309AF7A;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_19AD8C15_4D9D_48f2_A3E1_A997E86942D2" style="Mode=3;EOID=B309AF7A;SOID=814BA23B;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=4;SY=0;EX=-100;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=134:CY=14:OX=-2:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F" style="Mode=3;EOID=814BA23B;SOID=54B804E6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=16;EX=-22;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=95:CY=14:OX=42:OY=19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1039:-247$;" subject="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6" style="Mode=3;EOID=F20C0509;SOID=814BA23B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_28774B07_2278_44a1_B47E_F671B4F00F63" style="Mode=3;EOID=3406B990;SOID=2680FDBB;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-2;SY=0;EX=-2;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=51:CY=14:OX=32:OY=32:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_F3F440DD_AB87_4730_A6DF_915A5FB0B3DB" style="Mode=3;EOID=814BA23B;SOID=91BF6BAB;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=63;SY=2;EX=63;EY=2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=73:CY=14:OX=47:OY=19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0AA8BD10_946A_403c_B906_6DB183F74D9F" style="Mode=3;EOID=814BA23B;SOID=91BF6BAB;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-58;SY=-4;EX=-58;EY=-4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_881F7772_9A6C_4e5a_BB86_A2E25524B058" style="Mode=3;EOID=814BA23B;SOID=91BF6BAB;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A27A53B2_A6D1_4fdd_A43E_D33DC6607852" style="Mode=3;EOID=3406B990;SOID=8BA75646;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_199C3BDF_913A_42e4_A409_64CB2CE61248" style="Mode=3;EOID=3406B990;SOID=CC54E83B;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_5729A98B_A925_4816_AEF4_9EBDE5851B98" style="Mode=3;EOID=3406B990;SOID=062B2D00;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=719;SCTR.TOP=-222;SCTR.RIGHT=756;SCTR.BOTTOM=-190;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=68:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=756:-213$756:-190$719:-190$719:-213$;" subject="EAID_2FF93267_E672_481d_B370_202D9A0110E0" style="Mode=3;EOID=814BA23B;SOID=814BA23B;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_7390C0BE_0F05_4823_ABE3_07757EF6B2CF">
-				<model package="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA" localID="532" owner="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA" tpos="8"/>
+				<model package="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" localID="532" owner="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" tpos="8"/>
 				<properties name="submission eo reduction" type="Logical"/>
 				<project author="andreea" version="1.0" created="2024-02-20 11:14:07" modified="2024-03-12 16:35:55"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
@@ -3529,11 +3609,12 @@
 					<element geometry="SX=114;SY=-5;EX=61;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D01BEE04_A51F_434f_9F2B_CD75C658FF42" style="Mode=3;EOID=E89FDA2F;SOID=4EA007D2;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=845;SCTR.TOP=-283;SCTR.RIGHT=876;SCTR.BOTTOM=-267;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=846:-283$876:-283$876:-267$846:-267$;" subject="EAID_2FF93267_E672_481d_B370_202D9A0110E0" style="Mode=3;EOID=4EA007D2;SOID=4EA007D2;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_04EC0265_2665_47d4_AEDA_E49049545B3B" style="Mode=3;EOID=7FCD0B5A;SOID=E89FDA2F;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=271;SCTR.TOP=-322;SCTR.RIGHT=323;SCTR.BOTTOM=-264;$LLB=;LLT=;LMT=;LMB=;LRT=CX=174:CY=14:OX=47:OY=-26:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=323:-297$323:-264$271:-264$271:-322$310:-322$;" subject="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273" style="Mode=3;EOID=6D195C80;SOID=6D195C80;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=134:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F" style="Mode=3;EOID=4EA007D2;SOID=6D195C80;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_A6FFBF40_ABD7_4fa9_9509_ADCA4A6A99C0">
-				<model package="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA" localID="533" owner="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA" tpos="9"/>
+				<model package="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" localID="533" owner="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" tpos="9"/>
 				<properties name="submission eo sme" type="Logical"/>
 				<project author="andreea" version="1.0" created="2024-02-20 11:17:19" modified="2024-03-12 16:42:13"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
@@ -3559,15 +3640,16 @@
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB" style="Mode=3;EOID=702C9472;SOID=7E3A61F6;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=1;SY=1;EX=1;EY=1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6" style="Mode=3;EOID=702C9472;SOID=7E3A61F6;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=346;SCTR.TOP=-207;SCTR.RIGHT=377;SCTR.BOTTOM=-191;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=347:-207$377:-207$377:-191$347:-191$;" subject="EAID_2FF93267_E672_481d_B370_202D9A0110E0" style="Mode=3;EOID=7E3A61F6;SOID=7E3A61F6;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=290;SCTR.TOP=-104;SCTR.RIGHT=321;SCTR.BOTTOM=-89;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=291:-104$321:-104$321:-89$291:-89$;" subject="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273" style="Mode=3;EOID=2F978CA9;SOID=2F978CA9;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=134:CY=14:OX=74:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_DEFF2FFB_41B4_4817_850D_83D60BFADA1F" style="Mode=3;EOID=7E3A61F6;SOID=2F978CA9;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_D57C0343_5A78_480c_A411_138E27851C00">
-				<model package="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA" localID="538" owner="EAPK_A6963E41_1562_41fc_8AAB_D52C7CFD98EA" tpos="2"/>
+				<model package="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" localID="538" owner="EAPK_8EE934F3_0B94_4baa_9F43_9488B8E902C9" tpos="2"/>
 				<properties name="submission and access" type="Logical"/>
-				<project author="andreea" version="1.0" created="2024-03-08 13:02:38" modified="2024-07-09 15:51:01"/>
+				<project author="andreea" version="1.0" created="2024-03-08 13:02:38" modified="2024-03-08 13:07:26"/>
 				<style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=1;HighlightForeign=0;PackageContents=1;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=826;DocSize.cy=1169;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AllDockable=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
-				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=152BCA71;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=2C8F2BA1;"/>
 				<swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Carlito,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
@@ -3586,7 +3668,8 @@
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_ACA750D2_84FF_4e07_B735_322F9131A442" style="Mode=3;EOID=4EBB105D;SOID=2D9975B7;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=80:OY=22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_18CF5F1B_45DD_4b29_9E28_8D741E0840F3" style="Mode=3;EOID=2D9975B7;SOID=541CC30B;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=113:CY=14:OX=55:OY=17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_ACF95470_AB2B_4b7d_BCCF_3E7847170DBD" style="Mode=3;EOID=A3C9FB84;SOID=BE5C1562;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=1;SY=-1;EX=2;EY=-1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=1:OY=-5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B" style="Mode=3;EOID=541CC30B;SOID=BE5C1562;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=4;SCTR.LEFT=105;SCTR.TOP=-459;SCTR.RIGHT=155;SCTR.BOTTOM=-412;$LLB=;LLT=;LMT=;LMB=;LRT=CX=158:CY=27:OX=63:OY=6:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=151:-412$105:-412$105:-459$155:-459$155:-428$;" subject="EAID_DA159B9F_AFA9_4565_A69F_C36E3ABE8273" style="Mode=3;EOID=BE5C1562;SOID=BE5C1562;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=-1;EX=1;EY=-1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=1:OY=-5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1EBCD522_5AC9_4199_A0FF_14B7A0FB6A6B" style="Mode=3;EOID=541CC30B;SOID=BE5C1562;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=4;SCTR.LEFT=671;SCTR.TOP=-203;SCTR.RIGHT=717;SCTR.BOTTOM=-162;$LLB=;LLT=;LMT=;LMB=;LRT=CX=114:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=694:-162$671:-162$671:-203$717:-203$717:-175$;" subject="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F" style="Mode=3;EOID=B793487A;SOID=B793487A;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=77:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_4CC3B6CA_493A_4ff6_BB1B_A5C475115AB1" style="Mode=3;EOID=5F65AC6F;SOID=B793487A;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>